diff --git a/tools/MapEdit/BackGfx.ini b/tools/MapEdit/BackGfx.ini
index 5f7b4929b..50e119561 100644
--- a/tools/MapEdit/BackGfx.ini
+++ b/tools/MapEdit/BackGfx.ini
@@ -3,11 +3,21 @@
 ################################################
 
 [bubble]
-[bubblesmall]
+Gfx=..\..\Graphics\levels\backgfx\bubble.bmp
+
 [fishbone]
+Gfx=..\..\Graphics\levels\backgfx\fishbone.bmp
+
 [Flower]
+Gfx=..\..\Graphics\levels\backgfx\Flower.bmp
+
 [Ghost]
+Gfx=..\..\Graphics\levels\backgfx\Ghost.bmp
+
 [pumpkin]
+Gfx=..\..\Graphics\levels\backgfx\pumpkin.bmp
+
 [teddy]
+Gfx=..\..\Graphics\levels\backgfx\teddy.bmp
 
 
diff --git a/tools/MapEdit/Hazard.ini b/tools/MapEdit/Hazard.ini
index 30825e026..07409aaa7 100644
--- a/tools/MapEdit/Hazard.ini
+++ b/tools/MapEdit/Hazard.ini
@@ -18,6 +18,7 @@ TurnRate=0
 Collision=0
 Health=0
 AttackStrength=0
+Respawn=1
 
 [HeartPendulum]
 Gfx=..\..\graphics\hazards\HeartPendulum\HeartPendulum.gin
@@ -27,6 +28,7 @@ TurnRate=0
 Collision=0
 Health=0
 AttackStrength=0
+Respawn=2
 
 [Tugboat]
 Gfx=..\..\graphics\hazards\Tugboat\Tugboat.gin
@@ -36,4 +38,5 @@ TurnRate=0
 Collision=0
 Health=0
 AttackStrength=0
+Respawn=3
 
diff --git a/tools/MapEdit/MapEdit.exe b/tools/MapEdit/MapEdit.exe
index 541420995..03ba0124b 100644
Binary files a/tools/MapEdit/MapEdit.exe and b/tools/MapEdit/MapEdit.exe differ
diff --git a/tools/MapEdit/MapEdit.ini b/tools/MapEdit/MapEdit.ini
index bd97a118a..2ca1813b4 100644
--- a/tools/MapEdit/MapEdit.ini
+++ b/tools/MapEdit/MapEdit.ini
@@ -7,9 +7,10 @@ Collision=collision.bmp
 Iconz=Iconz.bmp
 
 [LayerScript]
+BackGfxScript=BackGfx.ini
 ActorScript=Actor.ini
 ItemScript=Item.ini
 PlatformScript=Platform.ini
 TriggerScript=Trigger.ini
 FXScript=FX.ini
-BackGfxScript=BackGfx.ini
+HazardScript=Hazard.ini
diff --git a/tools/MapEdit/actor.ini b/tools/MapEdit/actor.ini
index d64bdba07..e4d4b8139 100644
--- a/tools/MapEdit/actor.ini
+++ b/tools/MapEdit/actor.ini
@@ -217,7 +217,7 @@ Health=32
 AttackStrength=20
 
 [Flamingskull]
-Gfx=..\..\graphics\characters\flamingskull\render\psx\FlamingSkull_Move0001.bmp
+Gfx=..\..\graphics\characters\flamingskull\render\psx\FlamingSkull_Move0000.bmp
 WayPoints=16
 Speed=3
 TurnRate=128
diff --git a/tools/MapEdit/trigger.ini b/tools/MapEdit/trigger.ini
index 56ba1ed71..cb1f66082 100644
--- a/tools/MapEdit/trigger.ini
+++ b/tools/MapEdit/trigger.ini
@@ -9,5 +9,8 @@
 
 [Restart_Point]
 
+[Teleport]
+HasTarget=1
+