diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MapEditor.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MapEditor.java
index 414569d9..2ec36f68 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MapEditor.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MapEditor.java
@@ -253,7 +253,7 @@ public class MapEditor extends Editor<Map, MapEditor.DrawMode> implements EventH
             idx = (idx + 1) % scripts.size();
             gc.beginPath();
             gc.moveTo(xx,yy);
-            gc.setStroke(currentMap.getScriptColor(scripts.get(idx)));
+            currentMap.getScriptColor(scripts.get(idx)).ifPresent(gc::setStroke);
             xx += dashLength;
             gc.lineTo(xx, yy);
             gc.setEffect(new DropShadow(2, Color.BLACK));
@@ -263,7 +263,7 @@ public class MapEditor extends Editor<Map, MapEditor.DrawMode> implements EventH
             idx = (idx + 1) % scripts.size();
             gc.beginPath();
             gc.moveTo(xx,yy);
-            gc.setStroke(currentMap.getScriptColor(scripts.get(idx)));
+            currentMap.getScriptColor(scripts.get(idx)).ifPresent(gc::setStroke);
             yy += dashLength;
             gc.lineTo(xx, yy);
             gc.setEffect(new DropShadow(2, Color.BLACK));
@@ -273,7 +273,7 @@ public class MapEditor extends Editor<Map, MapEditor.DrawMode> implements EventH
             idx = (idx + 1) % scripts.size();
             gc.beginPath();
             gc.moveTo(xx,yy);
-            gc.setStroke(currentMap.getScriptColor(scripts.get(idx)));
+            currentMap.getScriptColor(scripts.get(idx)).ifPresent(gc::setStroke);
             xx -= dashLength;
             gc.lineTo(xx, yy);
             gc.setEffect(new DropShadow(2, Color.BLACK));
@@ -283,7 +283,7 @@ public class MapEditor extends Editor<Map, MapEditor.DrawMode> implements EventH
             idx = (idx + 1) % scripts.size();
             gc.beginPath();
             gc.moveTo(xx,yy);
-            gc.setStroke(currentMap.getScriptColor(scripts.get(idx)));
+            currentMap.getScriptColor(scripts.get(idx)).ifPresent(gc::setStroke);
             yy -= dashLength;
             gc.lineTo(xx, yy);
             gc.setEffect(new DropShadow(2, Color.BLACK));
diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/data/TileMap.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/data/TileMap.java
index 12c3c39d..97b2779e 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/data/TileMap.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/data/TileMap.java
@@ -6,6 +6,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import javafx.scene.image.WritableImage;
 import javafx.scene.paint.Color;
@@ -46,8 +47,8 @@ public class TileMap extends ArrayList<ArrayList<Tile>> implements Serializable
     private final java.util.Map<Integer, List<Script>> locationScripts = new HashMap<>();
     private final java.util.Map<Script, Color> scriptColors = new HashMap<>();
     
-    public Color getScriptColor(Script s) {
-        return scriptColors.get(s);
+    public Optional<Color> getScriptColor(Script s) {
+        return Optional.ofNullable(scriptColors.get(s));
     }
     
     public List<Script> getLocationScripts(int x, int y) {
@@ -79,6 +80,7 @@ public class TileMap extends ArrayList<ArrayList<Tile>> implements Serializable
             locationScripts.put(loc, list);
         }
         list.add(s);
+        Application.getInstance().getController().redrawScripts();
     }
 
     private int getMortonNumber(int x, int y) {
diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/MapEditorTabControllerImpl.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/MapEditorTabControllerImpl.java
index 4f917836..20a108b1 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/MapEditorTabControllerImpl.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/impl/MapEditorTabControllerImpl.java
@@ -306,6 +306,7 @@ public class MapEditorTabControllerImpl extends MapEditorTabController {
                         if (empty || item == null) {
                             setText("");
                         } else {
+                            getCurrentEditor().getCurrentMap().getScriptColor(item).ifPresent(this::setTextFill);
                             setText(item.getName());
                             scriptDragDrop.registerDragSupport(this, item);
                         }