diff --git a/gamedir/Data/Editor/ADDROOM.STI b/gamedir/Data/Editor/ADDROOM.STI
new file mode 100644
index 000000000..98a55bec3
Binary files /dev/null and b/gamedir/Data/Editor/ADDROOM.STI differ
diff --git a/gamedir/Data/Editor/ADDTILEROOM.STI b/gamedir/Data/Editor/ADDTILEROOM.STI
new file mode 100644
index 000000000..81d67e84e
Binary files /dev/null and b/gamedir/Data/Editor/ADDTILEROOM.STI differ
diff --git a/gamedir/Data/Editor/ARROWSOFF.STI b/gamedir/Data/Editor/ARROWSOFF.STI
new file mode 100644
index 000000000..d6c17107a
Binary files /dev/null and b/gamedir/Data/Editor/ARROWSOFF.STI differ
diff --git a/gamedir/Data/Editor/ARROWSON.STI b/gamedir/Data/Editor/ARROWSON.STI
new file mode 100644
index 000000000..8e873f634
Binary files /dev/null and b/gamedir/Data/Editor/ARROWSON.STI differ
diff --git a/gamedir/Data/Editor/BANKS.STI b/gamedir/Data/Editor/BANKS.STI
new file mode 100644
index 000000000..35cabad66
Binary files /dev/null and b/gamedir/Data/Editor/BANKS.STI differ
diff --git a/gamedir/Data/Editor/BIGX.STI b/gamedir/Data/Editor/BIGX.STI
new file mode 100644
index 000000000..d6a77a674
Binary files /dev/null and b/gamedir/Data/Editor/BIGX.STI differ
diff --git a/gamedir/Data/Editor/CANCEL.STI b/gamedir/Data/Editor/CANCEL.STI
new file mode 100644
index 000000000..23883d856
Binary files /dev/null and b/gamedir/Data/Editor/CANCEL.STI differ
diff --git a/gamedir/Data/Editor/CAVES.STI b/gamedir/Data/Editor/CAVES.STI
new file mode 100644
index 000000000..d49f96e0d
Binary files /dev/null and b/gamedir/Data/Editor/CAVES.STI differ
diff --git a/gamedir/Data/Editor/CENTER.STI b/gamedir/Data/Editor/CENTER.STI
new file mode 100644
index 000000000..3a1ac08e4
Binary files /dev/null and b/gamedir/Data/Editor/CENTER.STI differ
diff --git a/gamedir/Data/Editor/CHECKBOX.STI b/gamedir/Data/Editor/CHECKBOX.STI
new file mode 100644
index 000000000..82fd86471
Binary files /dev/null and b/gamedir/Data/Editor/CHECKBOX.STI differ
diff --git a/gamedir/Data/Editor/CHECKMARK.STI b/gamedir/Data/Editor/CHECKMARK.STI
new file mode 100644
index 000000000..0c964b423
Binary files /dev/null and b/gamedir/Data/Editor/CHECKMARK.STI differ
diff --git a/gamedir/Data/Editor/COPYROOM.STI b/gamedir/Data/Editor/COPYROOM.STI
new file mode 100644
index 000000000..8bf3cf68b
Binary files /dev/null and b/gamedir/Data/Editor/COPYROOM.STI differ
diff --git a/gamedir/Data/Editor/CRACKWALL.STI b/gamedir/Data/Editor/CRACKWALL.STI
new file mode 100644
index 000000000..0fa1a0110
Binary files /dev/null and b/gamedir/Data/Editor/CRACKWALL.STI differ
diff --git a/gamedir/Data/Editor/DEBRIS.STI b/gamedir/Data/Editor/DEBRIS.STI
new file mode 100644
index 000000000..84c7d6f9f
Binary files /dev/null and b/gamedir/Data/Editor/DEBRIS.STI differ
diff --git a/gamedir/Data/Editor/DECAL.STI b/gamedir/Data/Editor/DECAL.STI
new file mode 100644
index 000000000..8f39188e1
Binary files /dev/null and b/gamedir/Data/Editor/DECAL.STI differ
diff --git a/gamedir/Data/Editor/DECOR.STI b/gamedir/Data/Editor/DECOR.STI
new file mode 100644
index 000000000..0db992bd5
Binary files /dev/null and b/gamedir/Data/Editor/DECOR.STI differ
diff --git a/gamedir/Data/Editor/DELROOM.STI b/gamedir/Data/Editor/DELROOM.STI
new file mode 100644
index 000000000..a9c9753e4
Binary files /dev/null and b/gamedir/Data/Editor/DELROOM.STI differ
diff --git a/gamedir/Data/Editor/DOOR.STI b/gamedir/Data/Editor/DOOR.STI
new file mode 100644
index 000000000..e36eee6cf
Binary files /dev/null and b/gamedir/Data/Editor/DOOR.STI differ
diff --git a/gamedir/Data/Editor/DOWNARROW.STI b/gamedir/Data/Editor/DOWNARROW.STI
new file mode 100644
index 000000000..9c49cc633
Binary files /dev/null and b/gamedir/Data/Editor/DOWNARROW.STI differ
diff --git a/gamedir/Data/Editor/DOWNGRID.STI b/gamedir/Data/Editor/DOWNGRID.STI
new file mode 100644
index 000000000..f9df713e8
Binary files /dev/null and b/gamedir/Data/Editor/DOWNGRID.STI differ
diff --git a/gamedir/Data/Editor/EAST.STI b/gamedir/Data/Editor/EAST.STI
new file mode 100644
index 000000000..c4e84bf8b
Binary files /dev/null and b/gamedir/Data/Editor/EAST.STI differ
diff --git a/gamedir/Data/Editor/EDITMODEBG.STI b/gamedir/Data/Editor/EDITMODEBG.STI
new file mode 100644
index 000000000..41e918cce
Binary files /dev/null and b/gamedir/Data/Editor/EDITMODEBG.STI differ
diff --git a/gamedir/Data/Editor/ERASER.STI b/gamedir/Data/Editor/ERASER.STI
new file mode 100644
index 000000000..eb43d1f5e
Binary files /dev/null and b/gamedir/Data/Editor/ERASER.STI differ
diff --git a/gamedir/Data/Editor/EXCLAMATION.STI b/gamedir/Data/Editor/EXCLAMATION.STI
new file mode 100644
index 000000000..7119ef652
Binary files /dev/null and b/gamedir/Data/Editor/EXCLAMATION.STI differ
diff --git a/gamedir/Data/Editor/EXITGRIDBUT.STI b/gamedir/Data/Editor/EXITGRIDBUT.STI
new file mode 100644
index 000000000..d1a03a0c8
Binary files /dev/null and b/gamedir/Data/Editor/EXITGRIDBUT.STI differ
diff --git a/gamedir/Data/Editor/EXITGRIDQ.STI b/gamedir/Data/Editor/EXITGRIDQ.STI
new file mode 100644
index 000000000..1c83dfc45
Binary files /dev/null and b/gamedir/Data/Editor/EXITGRIDQ.STI differ
diff --git a/gamedir/Data/Editor/EXITGRIDXBUT.STI b/gamedir/Data/Editor/EXITGRIDXBUT.STI
new file mode 100644
index 000000000..7833c4e0a
Binary files /dev/null and b/gamedir/Data/Editor/EXITGRIDXBUT.STI differ
diff --git a/gamedir/Data/Editor/FAKELIGHT.STI b/gamedir/Data/Editor/FAKELIGHT.STI
new file mode 100644
index 000000000..8c8d4e11c
Binary files /dev/null and b/gamedir/Data/Editor/FAKELIGHT.STI differ
diff --git a/gamedir/Data/Editor/FILL.STI b/gamedir/Data/Editor/FILL.STI
new file mode 100644
index 000000000..458f17a30
Binary files /dev/null and b/gamedir/Data/Editor/FILL.STI differ
diff --git a/gamedir/Data/Editor/FLOOR.STI b/gamedir/Data/Editor/FLOOR.STI
new file mode 100644
index 000000000..faa1600e2
Binary files /dev/null and b/gamedir/Data/Editor/FLOOR.STI differ
diff --git a/gamedir/Data/Editor/INVPANEL.STI b/gamedir/Data/Editor/INVPANEL.STI
new file mode 100644
index 000000000..fbe41dc69
Binary files /dev/null and b/gamedir/Data/Editor/INVPANEL.STI differ
diff --git a/gamedir/Data/Editor/ISOLATED.STI b/gamedir/Data/Editor/ISOLATED.STI
new file mode 100644
index 000000000..e98faa68a
Binary files /dev/null and b/gamedir/Data/Editor/ISOLATED.STI differ
diff --git a/gamedir/Data/Editor/KEY.STI b/gamedir/Data/Editor/KEY.STI
new file mode 100644
index 000000000..10322bc1f
Binary files /dev/null and b/gamedir/Data/Editor/KEY.STI differ
diff --git a/gamedir/Data/Editor/KEYIMAGE.STI b/gamedir/Data/Editor/KEYIMAGE.STI
new file mode 100644
index 000000000..35365ca4f
Binary files /dev/null and b/gamedir/Data/Editor/KEYIMAGE.STI differ
diff --git a/gamedir/Data/Editor/KILLTILEROOM.STI b/gamedir/Data/Editor/KILLTILEROOM.STI
new file mode 100644
index 000000000..edd1f564f
Binary files /dev/null and b/gamedir/Data/Editor/KILLTILEROOM.STI differ
diff --git a/gamedir/Data/Editor/LEFTARROW.STI b/gamedir/Data/Editor/LEFTARROW.STI
new file mode 100644
index 000000000..8cec801f6
Binary files /dev/null and b/gamedir/Data/Editor/LEFTARROW.STI differ
diff --git a/gamedir/Data/Editor/LEFTSCROLL.STI b/gamedir/Data/Editor/LEFTSCROLL.STI
new file mode 100644
index 000000000..1301ebaee
Binary files /dev/null and b/gamedir/Data/Editor/LEFTSCROLL.STI differ
diff --git a/gamedir/Data/Editor/LGDOWNARROW.STI b/gamedir/Data/Editor/LGDOWNARROW.STI
new file mode 100644
index 000000000..47f437789
Binary files /dev/null and b/gamedir/Data/Editor/LGDOWNARROW.STI differ
diff --git a/gamedir/Data/Editor/LGUPARROW.STI b/gamedir/Data/Editor/LGUPARROW.STI
new file mode 100644
index 000000000..ca5a14dd3
Binary files /dev/null and b/gamedir/Data/Editor/LGUPARROW.STI differ
diff --git a/gamedir/Data/Editor/LIGHT.STI b/gamedir/Data/Editor/LIGHT.STI
new file mode 100644
index 000000000..bad9b928c
Binary files /dev/null and b/gamedir/Data/Editor/LIGHT.STI differ
diff --git a/gamedir/Data/Editor/LIGHT2.STI b/gamedir/Data/Editor/LIGHT2.STI
new file mode 100644
index 000000000..55550ac00
Binary files /dev/null and b/gamedir/Data/Editor/LIGHT2.STI differ
diff --git a/gamedir/Data/Editor/LOAD.STI b/gamedir/Data/Editor/LOAD.STI
new file mode 100644
index 000000000..bba59dd4f
Binary files /dev/null and b/gamedir/Data/Editor/LOAD.STI differ
diff --git a/gamedir/Data/Editor/MERCAPPEARANCE.STI b/gamedir/Data/Editor/MERCAPPEARANCE.STI
new file mode 100644
index 000000000..286c7030e
Binary files /dev/null and b/gamedir/Data/Editor/MERCAPPEARANCE.STI differ
diff --git a/gamedir/Data/Editor/MERCATTRIBUTES.STI b/gamedir/Data/Editor/MERCATTRIBUTES.STI
new file mode 100644
index 000000000..323d86e59
Binary files /dev/null and b/gamedir/Data/Editor/MERCATTRIBUTES.STI differ
diff --git a/gamedir/Data/Editor/MERCGENERAL.STI b/gamedir/Data/Editor/MERCGENERAL.STI
new file mode 100644
index 000000000..868813152
Binary files /dev/null and b/gamedir/Data/Editor/MERCGENERAL.STI differ
diff --git a/gamedir/Data/Editor/MERCGLOWSCHEDULE.STI b/gamedir/Data/Editor/MERCGLOWSCHEDULE.STI
new file mode 100644
index 000000000..25761bb09
Binary files /dev/null and b/gamedir/Data/Editor/MERCGLOWSCHEDULE.STI differ
diff --git a/gamedir/Data/Editor/MERCINVENTORY.STI b/gamedir/Data/Editor/MERCINVENTORY.STI
new file mode 100644
index 000000000..c516c6def
Binary files /dev/null and b/gamedir/Data/Editor/MERCINVENTORY.STI differ
diff --git a/gamedir/Data/Editor/MERCPROFILE.STI b/gamedir/Data/Editor/MERCPROFILE.STI
new file mode 100644
index 000000000..46eae4792
Binary files /dev/null and b/gamedir/Data/Editor/MERCPROFILE.STI differ
diff --git a/gamedir/Data/Editor/MERCSCHEDULE.STI b/gamedir/Data/Editor/MERCSCHEDULE.STI
new file mode 100644
index 000000000..fd3172707
Binary files /dev/null and b/gamedir/Data/Editor/MERCSCHEDULE.STI differ
diff --git a/gamedir/Data/Editor/MOVEROOM.STI b/gamedir/Data/Editor/MOVEROOM.STI
new file mode 100644
index 000000000..784507dde
Binary files /dev/null and b/gamedir/Data/Editor/MOVEROOM.STI differ
diff --git a/gamedir/Data/Editor/NEW.STI b/gamedir/Data/Editor/NEW.STI
new file mode 100644
index 000000000..dd631c47b
Binary files /dev/null and b/gamedir/Data/Editor/NEW.STI differ
diff --git a/gamedir/Data/Editor/NEWROOF.STI b/gamedir/Data/Editor/NEWROOF.STI
new file mode 100644
index 000000000..4cca952ce
Binary files /dev/null and b/gamedir/Data/Editor/NEWROOF.STI differ
diff --git a/gamedir/Data/Editor/NEWROOM.STI b/gamedir/Data/Editor/NEWROOM.STI
new file mode 100644
index 000000000..02723955c
Binary files /dev/null and b/gamedir/Data/Editor/NEWROOM.STI differ
diff --git a/gamedir/Data/Editor/NORTH.STI b/gamedir/Data/Editor/NORTH.STI
new file mode 100644
index 000000000..57ad556ff
Binary files /dev/null and b/gamedir/Data/Editor/NORTH.STI differ
diff --git a/gamedir/Data/Editor/NUM1.STI b/gamedir/Data/Editor/NUM1.STI
new file mode 100644
index 000000000..738e5a55b
Binary files /dev/null and b/gamedir/Data/Editor/NUM1.STI differ
diff --git a/gamedir/Data/Editor/NUM2.STI b/gamedir/Data/Editor/NUM2.STI
new file mode 100644
index 000000000..5554d5e0f
Binary files /dev/null and b/gamedir/Data/Editor/NUM2.STI differ
diff --git a/gamedir/Data/Editor/NUM3.STI b/gamedir/Data/Editor/NUM3.STI
new file mode 100644
index 000000000..81de6b102
Binary files /dev/null and b/gamedir/Data/Editor/NUM3.STI differ
diff --git a/gamedir/Data/Editor/NUM4.STI b/gamedir/Data/Editor/NUM4.STI
new file mode 100644
index 000000000..15e16b087
Binary files /dev/null and b/gamedir/Data/Editor/NUM4.STI differ
diff --git a/gamedir/Data/Editor/OK.STI b/gamedir/Data/Editor/OK.STI
new file mode 100644
index 000000000..d4ece5f05
Binary files /dev/null and b/gamedir/Data/Editor/OK.STI differ
diff --git a/gamedir/Data/Editor/OMERTA.STI b/gamedir/Data/Editor/OMERTA.STI
new file mode 100644
index 000000000..3177f925a
Binary files /dev/null and b/gamedir/Data/Editor/OMERTA.STI differ
diff --git a/gamedir/Data/Editor/PAINT.STI b/gamedir/Data/Editor/PAINT.STI
new file mode 100644
index 000000000..bc45c2fe4
Binary files /dev/null and b/gamedir/Data/Editor/PAINT.STI differ
diff --git a/gamedir/Data/Editor/RADIOBUTTON.STI b/gamedir/Data/Editor/RADIOBUTTON.STI
new file mode 100644
index 000000000..d415e78e7
Binary files /dev/null and b/gamedir/Data/Editor/RADIOBUTTON.STI differ
diff --git a/gamedir/Data/Editor/RIGHTARROW.STI b/gamedir/Data/Editor/RIGHTARROW.STI
new file mode 100644
index 000000000..86e03677a
Binary files /dev/null and b/gamedir/Data/Editor/RIGHTARROW.STI differ
diff --git a/gamedir/Data/Editor/RIGHTSCROLL.STI b/gamedir/Data/Editor/RIGHTSCROLL.STI
new file mode 100644
index 000000000..2f916b483
Binary files /dev/null and b/gamedir/Data/Editor/RIGHTSCROLL.STI differ
diff --git a/gamedir/Data/Editor/ROAD.STI b/gamedir/Data/Editor/ROAD.STI
new file mode 100644
index 000000000..30204fdc3
Binary files /dev/null and b/gamedir/Data/Editor/ROAD.STI differ
diff --git a/gamedir/Data/Editor/ROOF.STI b/gamedir/Data/Editor/ROOF.STI
new file mode 100644
index 000000000..227674916
Binary files /dev/null and b/gamedir/Data/Editor/ROOF.STI differ
diff --git a/gamedir/Data/Editor/SAVE.STI b/gamedir/Data/Editor/SAVE.STI
new file mode 100644
index 000000000..104d8864b
Binary files /dev/null and b/gamedir/Data/Editor/SAVE.STI differ
diff --git a/gamedir/Data/Editor/SAWROOM.STI b/gamedir/Data/Editor/SAWROOM.STI
new file mode 100644
index 000000000..2ef5d6e41
Binary files /dev/null and b/gamedir/Data/Editor/SAWROOM.STI differ
diff --git a/gamedir/Data/Editor/SMCHECKBOX.STI b/gamedir/Data/Editor/SMCHECKBOX.STI
new file mode 100644
index 000000000..af3432715
Binary files /dev/null and b/gamedir/Data/Editor/SMCHECKBOX.STI differ
diff --git a/gamedir/Data/Editor/SOUTH.STI b/gamedir/Data/Editor/SOUTH.STI
new file mode 100644
index 000000000..654bb845e
Binary files /dev/null and b/gamedir/Data/Editor/SOUTH.STI differ
diff --git a/gamedir/Data/Editor/TILESET.STI b/gamedir/Data/Editor/TILESET.STI
new file mode 100644
index 000000000..061f1b2a0
Binary files /dev/null and b/gamedir/Data/Editor/TILESET.STI differ
diff --git a/gamedir/Data/Editor/TOILET.STI b/gamedir/Data/Editor/TOILET.STI
new file mode 100644
index 000000000..156b51119
Binary files /dev/null and b/gamedir/Data/Editor/TOILET.STI differ
diff --git a/gamedir/Data/Editor/TREE.STI b/gamedir/Data/Editor/TREE.STI
new file mode 100644
index 000000000..ca86af080
Binary files /dev/null and b/gamedir/Data/Editor/TREE.STI differ
diff --git a/gamedir/Data/Editor/UNDO.STI b/gamedir/Data/Editor/UNDO.STI
new file mode 100644
index 000000000..b63a2464d
Binary files /dev/null and b/gamedir/Data/Editor/UNDO.STI differ
diff --git a/gamedir/Data/Editor/UPARROW.STI b/gamedir/Data/Editor/UPARROW.STI
new file mode 100644
index 000000000..6176c02be
Binary files /dev/null and b/gamedir/Data/Editor/UPARROW.STI differ
diff --git a/gamedir/Data/Editor/UPGRID.STI b/gamedir/Data/Editor/UPGRID.STI
new file mode 100644
index 000000000..0c649a8de
Binary files /dev/null and b/gamedir/Data/Editor/UPGRID.STI differ
diff --git a/gamedir/Data/Editor/WALL.STI b/gamedir/Data/Editor/WALL.STI
new file mode 100644
index 000000000..27c324a44
Binary files /dev/null and b/gamedir/Data/Editor/WALL.STI differ
diff --git a/gamedir/Data/Editor/WEST.STI b/gamedir/Data/Editor/WEST.STI
new file mode 100644
index 000000000..0df105c17
Binary files /dev/null and b/gamedir/Data/Editor/WEST.STI differ
diff --git a/gamedir/Data/Editor/WINDOW.STI b/gamedir/Data/Editor/WINDOW.STI
new file mode 100644
index 000000000..d2238ed20
Binary files /dev/null and b/gamedir/Data/Editor/WINDOW.STI differ