2 files changed, 45 insertions, 37 deletions

diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 65161b4f..d1dc9f34 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -100,7 +100,7 @@ exports.PiData = Montage.create( Montage, {
             }
         ]
     },
-    imagePi: {
+    imgPi: {
         value: [
             {
                 label: "Image Properties",
@@ -807,8 +807,8 @@ exports.PiData = Montage.create( Montage, {
                     ]
                 ]
             }
-        ] //value: [
-    } //BrushStrokePi: {
+        ]
+    }
 });
 
 
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 4d009530..32eaf24d 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -7,7 +7,48 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage = require("montage/core/core").Montage;
 
 exports.ToolsData = Montage.create(Montage, {
+     selectionToolIndex : {
+        value: 0
+    },
+    rotate3DToolIndex: {
+        value: 1
+    },
+    translate3DToolIndex: {
+        value: 2
+    },
+    tagToolIndex: {
+        value: 3
+    },
+    penToolIndex: {
+        value: 4
+    },
+    textToolIndex: {
+        value: 5
+    },
+   shapeToolIndex: {
+        value: 6
+    },
+    brushToolIndex: {
+        value: 7
+    },
+    fillToolIndex: {
+        value: 8
+    },
+    inkBottleToolIndex: {
+        value: 9
+    },
+    rotateStage3DToolIndex: {
+        value: 10
+    },
+    panToolIndex: {
+        value: 11
+    },
+    zoomToolIndex: {
+        value: 12
+    },
 
+    // NOTE: additions or removal of any tools, or any changes in the order of these entries requires updating the constant index properties above. 
+    //       Code in the keyboard mediator and ninja.js accesses the array below through the index constants above
     defaultToolsData: {
         value: [
             {
@@ -22,17 +63,6 @@ exports.ToolsData = Montage.create(Montage, {
                 "selected":     true
             },
             {
-                "id":           "SubselectionTool",
-                "properties":   "subSelectionProperties",
-                "spriteSheet":  true,
-                "action":       "SubselectionTool",
-                "toolTip":      "Subselect Tool",
-                "cursor":       "auto",
-                "lastInGroup":  true,
-                "container":    false,
-                "selected":     false
-            },
-            {
                 "id":           "RotateTool3D",
                 "properties":   "rotate3DProperties",
                 "spriteSheet":  true,
@@ -125,17 +155,6 @@ exports.ToolsData = Montage.create(Montage, {
                 "selected":     false
             },
             {
-                "id":           "PencilTool",
-                "properties":   "pencilProperties",
-                "spriteSheet":  true,
-                "action":       "PencilTool",
-                "toolTip":      "Pencil Tool",
-                "cursor":       "auto",
-                "lastInGroup":  false,
-                "container":    false,
-                "selected":     false
-            },
-            {
                 "id":           "BrushTool",
                 "properties":   "brushProperties",
                 "spriteSheet":  true,
@@ -163,22 +182,11 @@ exports.ToolsData = Montage.create(Montage, {
                 "spriteSheet":  true,
                 "action":       "InkBottleTool",
                 "toolTip":      "Ink Bottle Tool (K)",
-                "cursor":       "url('images/tools/inkbottle_down.png'), default",
+                "cursor":       "url('images/tools/inkbottle_cursor.png'), default",
                 "lastInGroup":  true,
                 "container":    false,
                 "selected":     false
             },
-            {
-                "id":           "EyedropperTool",
-                "properties":   "eyedropperProperties",
-                "spriteSheet":  true,
-                "action":       "EyedropperTool",
-                "toolTip":      "Eyedropper Tool (I)",
-                "cursor":       "url('images/tools/eyedropper_down.png') 6 20, default",
-                "lastInGroup":  false,
-                "container":    false,
-                "selected":     false
-            },
 //            {
 //                "id":           "EraserTool",
 //                "properties":   "eraserProperties",