45 files changed, 1896 insertions, 1756 deletions

diff --git a/css/ninja.css b/css/ninja.css
index 6a804e99..b619eee1 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -681,7 +681,9 @@ nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul
 
 .subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active { -webkit-transform: scale(0.75); }
 
-.subOption { float: left; margin-top: 5px; margin-left: 10px; margin-right: 10px; }
+.subOption { float: left; margin-top: 0px; margin-left: 1px; margin-right: 0px; }
+
+.subOptionSpacer { margin-right: 16px; }
 
 .toolSeparator { height: 1px; width: 30px; }
 
@@ -857,8 +859,6 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
 
 .FillTool { background-image: url("../images/tools/Tool-Fill.png"); }
 
-.EyedropperTool { background-image: url("../images/tools/Tool-EyeDropper.png"); }
-
 .EraserTool { background-image: url("../images/tools/Tool-Erase.png"); }
 
 .RotateStageTool3D { background-image: url("../images/tools/Tool-3DRotateStage.png"); }
@@ -871,28 +871,6 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
 
 .InkBottleTool { background-image: url("../images/tools/Tool-FillColor.png"); }
 
-.toolsList .colortoolbar { padding-left: 1px; padding-top: 4px; }
-
-.toolsList .colortoolbar button { width: 27px; height: 27px; background: black; border: 1px solid #000; padding: 0; margin: 0px; }
-
-.toolsList .colortoolbar div { width: 27px; height: 27px; margin: 0; margin-top: 3px; }
-
-.toolsList .colortoolbar div.cpe_colortoolbar_container { margin: 0; }
-
-/*.InkBottleToolPressed {*/
-/*background-image: url("../images/tools/inkbottle_down.png");*/
-/*background-repeat: no-repeat;*/
-/*height: 23px;*/
-/*width: 26px;*/
-/*opacity: 1;*/
-/*}*/
-/*.InkBottleToolUnpressed {*/
-/*background-image: url("../images/tools/inkbottle_down.png");*/
-/*background-repeat: no-repeat;*/
-/*height: 23px;*/
-/*width: 26px;*/
-/*opacity: 0.7;*/
-/*}*/
 .topAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -240px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
 
 .rightAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -270px -54px; background-repeat: no-repeat; height: 23px; width: 26px; }
@@ -919,8 +897,6 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
 
 .bucketToolUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -330px 0px; background-repeat: no-repeat; height: 23px; width: 26px; }
 
-.pencilToolUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -270px -27px; background-repeat: no-repeat; height: 23px; width: 26px; }
-
 .blueDiv { background: blue; opacity: 0.2; }
 
 ::-webkit-scrollbar { width: 11px; height: 11px; }
diff --git a/images/tools/Tool-FillColor.png b/images/tools/Tool-FillColor.png
index f0580ef9..87c2ce7c 100644
--- a/images/tools/Tool-FillColor.png
+++ b/images/tools/Tool-FillColor.png
diff --git a/images/tools/inkbottle_down.png b/images/tools/inkbottle_cursor.png
index f07d0d25..f07d0d25 100755..100644
--- a/images/tools/inkbottle_down.png
+++ b/images/tools/inkbottle_cursor.png
diff --git a/images/tools/pencil_down.png b/images/tools/pencil_down.png
deleted file mode 100755
index 55b22eb2..00000000
--- a/images/tools/pencil_down.png
+++ /dev/null
diff --git a/images/tools/pencil_up.png b/images/tools/pencil_up.png
deleted file mode 100755
index f7b44c7c..00000000
--- a/images/tools/pencil_up.png
+++ /dev/null
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index 9aa05e5d..0c51aa9a 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -85,9 +85,6 @@
             "LineTool1": {
                 "prototype": "js/tools/LineTool"
             },
-            "PencilTool1": {
-                "prototype": "js/tools/PencilTool"
-            },
             "BrushTool1": {
                 "prototype": "js/tools/BrushTool"
             },
@@ -97,9 +94,6 @@
             "InkBottleTool1": {
                 "prototype": "js/tools/InkBottleTool"
             },
-            "EyedropperTool1": {
-                "prototype": "js/tools/EyedropperTool"
-            },
             "EraserTool1": {
                 "prototype": "js/tools/EraserTool"
             },
@@ -142,11 +136,9 @@
                     "OvalTool":               {"@": "OvalTool1"},
                     "RectTool":               {"@": "RectTool1"},
                     "LineTool":               {"@": "LineTool1"},
-                    "PencilTool":             {"@": "PencilTool1"},
                     "BrushTool":              {"@": "BrushTool1"},
                     "FillTool":               {"@": "FillTool1"},
                     "InkBottleTool":          {"@": "InkBottleTool1"},
-                    "EyedropperTool":         {"@": "EyedropperTool1"},
                     "EraserTool":             {"@": "EraserTool1"},
                     "RotateStageTool3D":      {"@": "RotateStageTool3D1"},
                     "PanTool":                {"@": "PanTool1"},
@@ -169,8 +161,6 @@
                     <hr />
                 </div>
             </div>
-            <!-- TODO: Remove and add as a component -->
-            <div id="colortoolbar"></div>
             <div data-montage-id="disabledCondition" class="panelDisabled"></div>
         </div>
 
diff --git a/js/components/layout/tools-list.reel/tools-list.js b/js/components/layout/tools-list.reel/tools-list.js
index d68e8a56..ed4ee45f 100755
--- a/js/components/layout/tools-list.reel/tools-list.js
+++ b/js/components/layout/tools-list.reel/tools-list.js
@@ -20,11 +20,9 @@ exports.ToolsList = Montage.create(Component, {
     OvalTool:               { value: null },
     RectTool:               { value: null },
     LineTool:               { value: null },
-    PencilTool:             { value: null },
     BrushTool:              { value: null },
     FillTool:               { value: null },