diff --git a/Tools/nib2cib/NSCustomResource.j b/Tools/nib2cib/NSCustomResource.j
index 27155fb32..7f4f6d1fc 100644
--- a/Tools/nib2cib/NSCustomResource.j
+++ b/Tools/nib2cib/NSCustomResource.j
@@ -31,10 +31,11 @@
 
 var FILE = require("file"),
     imageSize = require("cappuccino/imagesize").imagesize,
-    supportedTemplateImages = [
-        "NSAddTemplate",
-        "NSRemoveTemplate"
-    ];
+    supportedTemplateImages = {
+        "NSAddTemplate": "CPAddTemplate",
+        "NSRemoveTemplate": "CPRemoveTemplate",
+        "NSToolbarShowColors": "CPImageNameColorPanel"
+    };
 
 @implementation _CPCibCustomResource (NSCoding)
 
@@ -55,10 +56,10 @@ var FILE = require("file"),
             return nil;
         else if (/^NS[A-Z][A-Za-z]+$/.test(_resourceName))
         {
-            if (supportedTemplateImages.indexOf(_resourceName) >= 0)
+            if (supportedTemplateImages[_resourceName])
             {
                 // Defer resolving this path until runtime.
-                _resourceName = _resourceName.replace("NS", "CP");
+                _resourceName = supportedTemplateImages[_resourceName];
             }
             else
                 [CPException raise:Nib2CibException format:@"The built in image “%@” is not supported.", _resourceName];