diff --git a/editor/ui/composer/content/editorOverlay.xul b/editor/ui/composer/content/editorOverlay.xul
index 49c4c9875c7f..077018c25e76 100644
--- a/editor/ui/composer/content/editorOverlay.xul
+++ b/editor/ui/composer/content/editorOverlay.xul
@@ -699,10 +699,10 @@
     <observes element="cmd_fontColor"       attribute="state" onbroadcast="onFontColorChange()"/>
     <observes element="cmd_backgroundColor" attribute="state" onbroadcast="onBackgroundColorChange()"/>
     <text class="color-button" id="BackgroundColorButton"
-          oncommand="EditorSelectColor('');"
+          onclick="EditorSelectColor('');"
           tooltip="aTooltip"   tooltiptext="&BackgroundColorButton.tooltip;"/>
     <text class="color-button" id="TextColorButton"
-          oncommand="EditorSelectColor('Text');"
+          onclick="EditorSelectColor('Text');"
           tooltip="aTooltip"   tooltiptext="&TextColorButton.tooltip;"/>
   </stack>
 
diff --git a/editor/ui/composer/content/pref-editing.xul b/editor/ui/composer/content/pref-editing.xul
index a1f15caf4a52..f3d5fad6158c 100644
--- a/editor/ui/composer/content/pref-editing.xul
+++ b/editor/ui/composer/content/pref-editing.xul
@@ -35,7 +35,7 @@
 
   <script lanugage="JavaScript">
   <![CDATA[
-    _elementIDs = ["editorAuthor", "useCustomColors", "textData", "linkData", "aLinkData", "fLinkData", "backgroundColorData", "backgroundImageData"];
+   var _elementIDs = ["editorAuthor", "useCustomColors", "textData", "linkData", "aLinkData", "fLinkData", "backgroundColorData", "backgroundImageData"];
   ]]>
   </script>
 
@@ -79,7 +79,7 @@
               <row valign="middle" autostretch="never">
                 <text class="label" id="Text" value="&normalText.label;&colon.character;" />
                 <stack>
-                  <button id="TextButton" class="dialog color-button" oncommand="GetColorAndUpdate('textCW');"/>
+                  <button id="TextButton" class="dialog color-button" onclick="GetColorAndUpdate('textCW');"/>
     	            <box autostretch="never" valign="middle" mousethrough="always">
                     <spring class="smallspacer"/>
                     <spring id="textCW" class="color-well"/>
@@ -90,7 +90,7 @@
               <row valign="middle" autostretch="never">
                 <text class="label" id="Link" value="&linkText.label;&colon.character;" />
                 <stack>
-                  <button id="LinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('linkCW');"/>
+                  <button id="LinkButton" class="dialog color-button" onclick="GetColorAndUpdate('linkCW');"/>
     	            <box autostretch="never" valign="middle" mousethrough="always">
                     <spring class="smallspacer"/>
                     <spring id="linkCW" class="color-well"/>
@@ -101,7 +101,7 @@
               <row valign="middle" autostretch="never">
                 <text class="label" id="Active" value="&activeLinkText.label;&colon.character;" />
                 <stack>
-                  <button id="ActiveLinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('activeCW');"/>
+                  <button id="ActiveLinkButton" class="dialog color-button" onclick="GetColorAndUpdate('activeCW');"/>
     	            <box autostretch="never" valign="middle" mousethrough="always">
                     <spring class="smallspacer"/>
                     <spring id="activeCW" class="color-well"/>
@@ -112,7 +112,7 @@
               <row valign="middle" autostretch="never">
                 <text class="label" id="Visited" value ="&visitedLinkText.label;&colon.character;" />
                 <stack>
-                  <button id="VisitedLinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('visitedCW');"/>
+                  <button id="VisitedLinkButton" class="dialog color-button" onclick="GetColorAndUpdate('visitedCW');"/>
     	            <box autostretch="never" valign="middle" mousethrough="always">
                     <spring class="smallspacer"/>
                     <spring id="visitedCW" class="color-well"/>
@@ -123,7 +123,7 @@
               <row valign="middle" autostretch="never">
                 <text class="label" id="Background" value="&background.label;" />
                 <stack>
-                  <button id="BackgroundButton" class="dialog color-button" oncommand="GetColorAndUpdate('backgroundCW');"/>
+                  <button id="BackgroundButton" class="dialog color-button" onclick="GetColorAndUpdate('backgroundCW');"/>
     	            <box autostretch="never" valign="middle" mousethrough="always">
                     <spring class="smallspacer"/>
                     <spring id="backgroundCW" class="color-well"/>
diff --git a/editor/ui/dialogs/content/EdColorPicker.xul b/editor/ui/dialogs/content/EdColorPicker.xul
index 310ccc7aedde..9196643f7c4a 100644
--- a/editor/ui/dialogs/content/EdColorPicker.xul
+++ b/editor/ui/dialogs/content/EdColorPicker.xul
@@ -54,7 +54,7 @@
   <!-- </radiogroup> -->
   <colorpicker id="ColorPicker" palettename="standard" 
     persist="palettename"
-    oncommand="SelectColor();"/>
+    onclick="SelectColor();"/>
 <!-- Web palette is not implemented???
   <box valign="middle" autostretch="never">
     <text class="label" value="&palette.label;"/>
@@ -67,7 +67,7 @@
     <stack valign="middle" autostretch="never">
       <button id="LastPickedButton" class="dialog" value="&lastPickedColor.label;" 
         style="margin-left:0px; margin-right: 0px;"
-        oncommand="SelectLastPickedColor();"/>
+        onclick="SelectLastPickedColor();"/>
       <box style="margin-left: 5px"  mousethrough="always">
         <box orient="vertical" autostretch="never">
           <spring flex="1"/>