4 files changed, 7 insertions, 5 deletions

diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 198d7e69..6621d18b 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -226,7 +226,7 @@ exports.LineTool = Montage.create(ShapeTool, {
                 {
                     strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
                 }
-                strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
+                strokeColor = ShapesController.getMaterialColor(strokeMaterial) || strokeColor;
             }
 
             var world = this.getGLWorld(canvas, this.options.use3D);
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index e9dc66bb..917da538 100755
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -53,14 +53,14 @@ exports.OvalTool = Montage.create(ShapeTool, {
                 {
                     strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
                 }
-                strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
+                strokeColor = ShapesController.getMaterialColor(strokeMaterial) || strokeColor;
 
                 var fillM = this.options.fillMaterial;
                 if(fillM)
                 {
                     fillMaterial = Object.create(MaterialsModel.getMaterial(fillM));
                 }
-                fillColor = ShapesController.getMaterialColor(fillM) || fillColor;
+                fillColor = ShapesController.getMaterialColor(fillMaterial) || fillColor;
             }
 
             var world = this.getGLWorld(canvas, this.options.use3D);
diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js
index 0a3c8200..a8c57688 100755
--- a/js/tools/RectTool.js
+++ b/js/tools/RectTool.js
@@ -72,14 +72,14 @@ exports.RectTool = Montage.create(ShapeTool, {
                 {
                     strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
                 }
-                strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
+                strokeColor = ShapesController.getMaterialColor(strokeMaterial) || strokeColor;
 
                 var fillM = this.options.fillMaterial;
                 if(fillM)
                 {
                     fillMaterial = Object.create(MaterialsModel.getMaterial(fillM));
                 }
-                fillColor = ShapesController.getMaterialColor(fillM) || fillColor;
+                fillColor = ShapesController.getMaterialColor(fillMaterial) || fillColor;
             }
 
             var world = this.getGLWorld(canvas, this.options.use3D);
diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js
index 5e9c792b..43a774e1 100755
--- a/js/tools/TagTool.js
+++ b/js/tools/TagTool.js
@@ -82,6 +82,8 @@ exports.TagTool = Montage.create(DrawingTool, {
             // Create the element
             if(this.options.selectedElement === "custom") {
                 element = document.application.njUtils.make(this.options.customName.value, null, this.application.ninja.currentDocument);
+                        if (!NJUtils) NJUtils = require("js/lib/NJUtils").NJUtils;
+
             } else {
                 element = document.application.njUtils.make(this.options.selectedElement, null, this.application.ninja.currentDocument);
             }