diff --git a/editor/ui/composer/content/TextEditorAppShell.xul b/editor/ui/composer/content/TextEditorAppShell.xul
index 0cc266275c99..997e9c9376df 100644
--- a/editor/ui/composer/content/TextEditorAppShell.xul
+++ b/editor/ui/composer/content/TextEditorAppShell.xul
@@ -14,25 +14,39 @@
   </html:script>
 
   <keyset id="defaultKeySet">
-    <key id="acmdkey" disabled="false" shift="false" command="true" alt="false" key="a" onkeypress="EditorSelectAll()" />
-    <key id="bcmdkey" disabled="false" shift="false" command="true" alt="false" key="b" onkeypress="EditorApplyStyle('b')"/>
-    <key id="ccmdkey" disabled="false" shift="false" command="true" alt="false" key="c" onkeypress="EditorCopy()" />
-    <key id="fcmdkey" disabled="false" shift="false" command="true" alt="false" key="f" onkeypress="EditorFind()" />
-    <key id="gcmdkey" disabled="false" shift="false" command="true" alt="false" key="g" onkeypress="EditorFindNext()" />
-    <key id="icmdkey" disabled="false" shift="false" command="true" alt="false" key="i" onkeypress="EditorApplyStyle('i')"/>
-    <key id="kcmdkey" disabled="false" shift="false" command="true" alt="false" key="k" onkeypress="CheckSpelling()" />
-    <key id="ncmdkey" disabled="false" shift="false" command="true" alt="false" key="n" onkeypress="EditorNew()" />
-    <key id="ocmdkey" disabled="false" shift="false" command="true" alt="false" key="o" onkeypress="EditorOpen()" />
-    <key id="pcmdkey" disabled="false" shift="false" command="true" alt="false" key="p" onkeypress="EditorPrint()" />
-    <key id="qcmdkey" disabled="false" shift="false" command="true" alt="false" key="q" onkeypress="EditorExit()" />
-    <key id="ucmdkey" disabled="false" shift="false" command="true" alt="false" key="u" onkeypress="EditorApplyStyle('u')"/>
-    <key id="vcmdkey" disabled="false" shift="false" command="true" alt="false" key="v" onkeypress="EditorPaste()" />
-    <key id="wcmdkey" disabled="false" shift="false" command="true" alt="false" key="w" onkeypress="EditorClose()" />
-    <key id="xcmdkey" disabled="false" shift="false" command="true" alt="false" key="x" onkeypress="EditorCut()" />
-    <key id="ycmdkey" disabled="false" shift="false" command="true" alt="false" key="y" onkeypress="EditorRedo()" />
-    <key id="zcmdkey" disabled="false" shift="false" command="true" alt="false" key="z" onkeypress="EditorUndo()" />
+    <key id="selectallkb" disabled="false" shift="false" command="true" alt="false" key="a" onkeypress="EditorSelectAll()" />
+    <key id="boldkb" disabled="false" shift="false" command="true" alt="false" key="b" onkeypress="EditorToggleStyle('bold')"/>
+    <key id="copykb" disabled="false" shift="false" command="true" alt="false" key="c" onkeypress="EditorCopy()" />
+    <key id="findkb" disabled="false" shift="false" command="true" alt="false" key="f" onkeypress="EditorFind()" />
+    <key id="findnextkb" disabled="false" shift="false" command="true" alt="false" key="g" onkeypress="EditorFindNext()" />
+    <key id="italickb" disabled="false" shift="false" command="true" alt="false" key="i" onkeypress="EditorToggleStyle('italic')"/>
+    <key id="checkspellingkb" disabled="false" shift="false" command="true" alt="false" key="k" onkeypress="CheckSpelling()" />
+    <key id="neweditorkb" disabled="false" shift="false" command="true" alt="false" key="n" onkeypress="EditorNew()" />
+    <key id="openeditorkb" disabled="false" shift="false" command="true" alt="false" key="o" onkeypress="EditorOpen()" />
+    <key id="printkb" disabled="false" shift="false" command="true" alt="false" key="p" onkeypress="EditorPrint()" />
+    <key id="quitkb" disabled="false" shift="false" command="true" alt="false" key="q" onkeypress="EditorExit()" />
+    <key id="savekb" disabled="false" shift="false" command="true" alt="false" key="s" onkeypress="EditorSave()"/>
+    <key id="underlinekb" disabled="false" shift="false" command="true" alt="false" key="u" onkeypress="EditorToggleStyle('underline')"/>
+    <key id="pastekb" disabled="false" shift="false" command="true" alt="false" key="v" onkeypress="EditorPaste()" />
+    <key id="closekb" disabled="false" shift="false" command="true" alt="false" key="w" onkeypress="EditorClose()" />
+    <key id="cutkb" disabled="false" shift="false" command="true" alt="false" key="x" onkeypress="EditorCut()" />
+    <key id="redokb" disabled="false" shift="false" command="true" alt="false" key="y" onkeypress="EditorRedo()" />
+    <key id="undokb" disabled="false" shift="false" command="true" alt="false" key="z" onkeypress="EditorUndo()" />
+    <key id="navigatorkb" disabled="false" shift="false" command="true" alt="false" key="1" onkeypress="Navigator()" />
+    <key id="messengerkb" disabled="false" shift="false" command="true" alt="false" key="2" onkeypress="Messenger()" />
+    <key id="composerkb" disabled="false" shift="false" command="true" alt="false" key="3" onkeypress="Composer()" />
+    <key id="calendarkb" disabled="false" shift="false" command="true" alt="false" key="4" onkeypress="Calendar()" />
+    <key id="indentkb" disabled="false" shift="false" command="true" alt="false" key="=" onkeypress="EditorIndent('indent')" />
+    <key id="outdentkb" disabled="false" shift="false" command="true" alt="false" key="-" onkeypress="EditorIndent('outdent')" />
 
-<!-- how to handle return, enter, tab, function keys, arrow keys, others? -->
+    <key id="inserthtmlkb" disabled="false" shift="false" command="true" alt="true" key="i" onkeypress="EditorInsertHTML()"/>
+    <key id="pastequotationkb" disabled="false" shift="false" command="true" alt="true" key="v" onkeypress="EditorPasteAsQuotation()" />
+
+    <key id="removestyleskb" disabled="false" shift="true" command="true" alt="false" key="k" onkeypress="RemoveStyles()" />
+    <key id="decreasefontsizekb" disabled="false" shift="true" command="true" alt="false" key="[" onkeypress="DecreaseFontSize()" />
+    <key id="increasefontsizekb" disabled="false" shift="true" command="true" alt="false" key="]" onkeypress="IncreaseFontSize()" />
+
+<!-- how to handle return, enter, tab, function keys, arrow keys, others? saari working on solution -->
   </keyset>
 
   <broadcaster id="args" value="chrome://editor/content/EditorInitPagePlain.html"/>
@@ -43,6 +57,7 @@
   <observes element="dialog.start" attribute="ready" onchange="EditorStartup('text')"/>
     
   <broadcaster id="Editor:Document:Dirty" dirty="false"/>
+
   <broadcaster id="Editor:Style:IsBold" bold="false"/>
   <broadcaster id="Editor:Style:IsItalic" italic="false"/>
   <broadcaster id="Editor:Style:IsUnderline" underline="false"/>
@@ -52,114 +67,271 @@
 
   <toolbox id="EditorToolbars">
     <menubar>
-    <menu value="&fileMenu.label;">
+    <menu value="&fileMenu.label;" accesskey="&filemenu.accesskey;">
 	  <menupopup>
-      <menuitem value="&newCmd.label;" onaction="EditorNew()"/>
-      <menuitem value="&openCmd.label;" onaction="EditorOpen()"/>
-      <menuitem value="&closeCmd.label;" onaction="EditorClose()"/>
-      <menuseparator />
-      <menuitem value="&saveCmd.label;" onaction="EditorSave()"/>
-      <menuitem value="&saveAsCmd.label;" onaction="EditorSaveAs()"/>
-      <menuseparator />
-      <menuitem value="&printSetupCmd.label;" onaction=""/>
-      <menuitem value="&printPreviewCmd.label;" onaction="EditorPrintPreview()"/>
-      <menuitem value="&printCmd.label;" onaction="EditorPrint()"/>
-      <menuseparator />
-      <menuitem value="&quitCmd.label;" onaction="EditorExit()"/>
+		  <menuitem value="&newCmd.label;" 
+          accesskey="&filenew.accesskey;" key="neweditorkb" 
+		      onaction="EditorNew()"/>
+		  <menuitem value="&openCmd.label;" 
+          accesskey="&fileopen.accesskey;" key="openeditorkb" 
+		      onaction="EditorOpen()"/>
+		  <menuseparator />
+		  <menuitem value="&saveCmd.label;" 
+          accesskey="&filesave.accesskey;" key="savekb" 
+		      onaction="EditorSave()"/>
+		  <menuitem value="&saveAsCmd.label;" 
+          accesskey="&filesaveas.accesskey;" 
+		      onaction="EditorSaveAs()"/>
+		  <menuseparator />
+		  <menuitem value="&printSetupCmd.label;" 
+          accesskey="&fileprintsetup.accesskey;"
+		      onaction=""/>
+		  <menuitem value="&printPreviewCmd.label;" 
+          accesskey="&fileprintpreview.accesskey;" 
+		      onaction="EditorPrintPreview()"/>
+		  <menuitem value="&printCmd.label;" 
+          accesskey="&fileprint.accesskey;" key="printkb" 
+		      onaction="EditorPrint()"/>
+		  <menuseparator />
+		  <menuitem value="&closeCmd.label;" 
+          accesskey="&fileclose.accesskey;" key="closekb" 
+		      onaction="EditorClose()"/>
+		  <menuitem value="&quitCmd.label;" 
+          accesskey="&filequit.accesskey;" key="quitkb" 
+		      onaction="EditorExit()"/>
 	  </menupopup>
     </menu>
 
-    <menu value="&editMenu.label;">
+    <menu value="&editMenu.label;" accesskey="&editmenu.accesskey;">
 	  <menupopup>
-      <menuitem value="&undoCmd.label;" onaction="EditorUndo()"/>
-      <menuitem value="&redoCmd.label;" onaction="EditorRedo()"/>
-      <menuseparator />
-      <menuitem value="&cutCmd.label;" onaction="EditorCut()"/>
-      <menuitem value="&copyCmd.label;" onaction="EditorCopy()"/>
-      <menuitem value="&pasteCmd.label;" onaction="EditorPaste()"/>
-      <menuitem value="&pasteAsQuotationCmd.label;" onaction="EditorPasteAsQuotation()"/>
-      <menuitem value="&clearCmd.label;" onaction=""/>
-      <menuseparator />
-      <menuitem value="&selectAllCmd.label;" onaction="EditorSelectAll()"/>
-      <menuseparator />
-      <menuitem value="&findCmd.label;" onaction="EditorFind()"/>
-      <menuitem value="&findAgainCmd.label;" onaction="EditorFindNext()"/>
+		  <menuitem value="&undoCmd.label;"
+          accesskey="&editundo.accesskey;" key="undokb" 
+		      onaction="EditorUndo()"/>
+		  <menuitem value="&redoCmd.label;"
+          accesskey="&editredo.accesskey;" key="redokb" 
+		      onaction="EditorRedo()"/>
+		  <menuseparator />
+		  <menuitem value="&cutCmd.label;"
+          accesskey="&editcut.accesskey;" key="cutkb" 
+		      onaction="EditorCut()"/>
+		  <menuitem value="&copyCmd.label;"
+          accesskey="&editcopy.accesskey;" key="copykb" 
+		      onaction="EditorCopy()"/>
+		  <menuitem value="&pasteCmd.label;" 
+          accesskey="&editpaste.accesskey;" key="pastekb" 
+		      onaction="EditorPaste()"/>
+		  <menuitem value="&pasteAsQuotationCmd.label;" 
+          accesskey="&editpastequotation.accesskey;" key="pastequotationkb" 
+		      onaction="EditorPasteAsQuotation()"/>
+		  <menuitem value="&clearCmd.label;" 
+          accesskey="&editclear.accesskey;" 
+		      onaction=""/>
+		  <menuseparator />
+		  <menuitem value="&selectAllCmd.label;"
+          accesskey="&editselectall.accesskey;" key="selectallkb" 
+		      onaction="EditorSelectAll()"/>
+		  <menuseparator />
+		  <menuitem value="&findCmd.label;"
+          accesskey="&editfind.accesskey;" key="findkb" 
+		      onaction="EditorFind()"/>
+		  <menuitem value="&findAgainCmd.label;"
+          accesskey="&editfindnext.accesskey;" key="findnextkb" 
+		      onaction="EditorFindNext()"/>
 	  </menupopup>
     </menu>
 
-    <menu value="&viewMenu.label;">
+    <menu value="&viewMenu.label;" accesskey="&viewmenu.accesskey;">
 	  <menupopup>
-      <menuitem value="&hideCompositionToolbarCmd.label;" onaction=""/>
-      <menuitem value="&hideFormattingToolbarCmd.label;" onaction="" />
+		  <menuitem value="&hideCompositionToolbarCmd.label;"
+          accesskey="&viewcompositiontb.accesskey;" 
+		      onaction=""/>
+		  <menuitem value="&hideFormattingToolbarCmd.label;"
+          accesskey="&viewformattingtb.accesskey;" 
+		      onaction="" />
 	  </menupopup>
     </menu>
  
-    <menu value="&insertMenu.label;">
+    <menu value="&insertMenu.label;" accesskey="&insertmenu.accesskey;">
 	  <menupopup>
-      <menuitem value="&insertLinkCmd.label;" onaction="EditorInsertLink()"/>
-      <menuitem value="&insertTargetCmd.label;" onaction=""/>
-      <menuitem value="&insertImageCmd.label;" onaction="EditorInsertImage()"/>
-      <menuitem value="&insertHLineCmd.label;" onaction="EditorInsertHLine()"/>
-      <menuitem value="&insertTableCmd.label;" onaction="EditorInsertTable()"/>
-      <menuitem value="&insertHTMLSourceCmd.label;" onaction="EditorInsertHTML()"/>
-      <menuseparator />
-      <menuitem value="&insertLineBreakCmd.label;" onaction=""/>
-      <menuitem value="&insertBreakBelowImagesCmd.label;" onaction=""/>
+		  <menuitem value="&insertLinkCmd.label;"
+             accesskey="&insertlink.accesskey;"
+				     onaction="EditorInsertLink()"/>
+		  <menuitem value="&insertTargetCmd.label;"
+             accesskey="&inserttarget.accesskey;"
+				     onaction=""/>
+		  <menuitem value="&insertImageCmd.label;"
+             accesskey="&insertimage.accesskey;"
+				     onaction="EditorInsertImage()"/>
+		  <menuitem value="&insertHLineCmd.label;"
+             accesskey="&inserthline.accesskey;"
+				     onaction="EditorInsertHLine()"/>
+		  <menuitem value="&insertTableCmd.label;"
+             accesskey="&inserttable.accesskey;"
+				     onaction="EditorInsertTable()"/>
+		  <menuitem value="&insertHTMLSourceCmd.label;"
+             accesskey="&insertsource.accesskey;"
+				     onaction="EditorInsertHTML()"/>
+		  <menuseparator />
+		  <menuitem value="&insertLineBreakCmd.label;"
+             accesskey="&insertlinebreak.accesskey;"
+				     onaction=""/>
+		  <menuitem value="&insertBreakBelowImagesCmd.label;"
+             accesskey="&insertbreak.accesskey;"
+				     onaction=""/>
 	  </menupopup>
     </menu>
 
-    <menu value="&formatMenu.label;">
+    <menu value="&formatMenu.label;" accesskey="&formatmenu.accesskey;">
 	  <menupopup>
-      <menu value="&fontfaceMenu.label;">
+      <menu value="&fontfaceMenu.label;" accesskey="&formatfontmenu.accesskey;">
 	    <menupopup>
-        <menuitem value="&defaultVariableWidthCmd.label;" onaction="EditorSetFontFace('')"/>
-        <menuitem value="&defaultFixedWidthCmd.label;" onaction="EditorSetFontFace('tt')"/>
-        <menuseparator/>
-        <menuitem value="&arialHelveticaFont.label;" onaction="EditorSetFontFace('Arial, Helvetica, sans-serif')"/>
-        <menuitem value="&timesFont.label;" onaction="EditorSetFontFace('Times New Roman, Times, serif')"/>
-        <menuitem value="&courierFont.label;" onaction="EditorSetFontFace('Courier New, Courier, mono')"/>
+			<menuitem value="&defaultVariableWidthCmd.label;"
+             accesskey="&fontvarwidth.accesskey;"
+				     onaction="EditorSetFontFace('')"/>
+			<menuitem value="&defaultFixedWidthCmd.label;"
+             accesskey="&fontfixedwidth.accesskey;"
+				     onaction="EditorSetFontFace('tt')"/>
+			<menuseparator/>
+			<menuitem value="&arialHelveticaFont.label;"
+             accesskey="&fonthelvetica.accesskey;"
+				     onaction="EditorSetFontFace('Arial, Helvetica, sans-serif')"/>
+			<menuitem value="&timesFont.label;"
+             accesskey="&fonttimes.accesskey;"
+				     onaction="EditorSetFontFace('Times New Roman, Times, serif')"/>
+			<menuitem value="&courierFont.label;"
+             accesskey="&fontcourier.accesskey;"
+				     onaction="EditorSetFontFace('Courier New, Courier, mono')"/>
         </menupopup>
 	  </menu>
-      <menu value="&fontsizeMenu.label;">
+      <menu value="&fontsizeMenu.label;" accesskey="&formatsizemenu.accesskey;">
         <menupopup>
-		<menuitem value="&sizeMinusTwoCmd.label;" onaction="EditorSetFontSize('-2')"/>
-        <menuitem value="&sizeMinusOneCmd.label;" onaction="EditorSetFontSize('-1')"/>
-        <menuitem value="&sizeNormalCmd.label;" onaction="EditorSetFontSize('0')"/>
-        <menuitem value="&sizePlusOneCmd.label;" onaction="EditorSetFontSize('+1')"/>
-        <menuitem value="&sizePlusTwoCmd.label;" onaction="EditorSetFontSize('+2')"/>
-        <menuitem value="&sizePlusThreeCmd.label;" onaction="EditorSetFontSize('+3')"/>
-        <menuitem value="&sizePlusFourCmd.label;" onaction="EditorSetFontSize('+4')"/>
+			<menuitem value="&sizeMinusTwoCmd.label;"
+             accesskey="&sizeminus2.accesskey;"
+				     onaction="EditorSetFontSize('-2')"/>
+			<menuitem value="&sizeMinusOneCmd.label;"
+             accesskey="&sizeminus1.accesskey;"
+				     onaction="EditorSetFontSize('-1')"/>
+			<menuitem value="&sizeNormalCmd.label;"
+             accesskey="&sizenormal.accesskey;"
+				     onaction="EditorSetFontSize('0')"/>
+			<menuitem value="&sizePlusOneCmd.label;"
+             accesskey="&size1.accesskey;"
+				     onaction="EditorSetFontSize('+1')"/>
+			<menuitem value="&sizePlusTwoCmd.label;"
+             accesskey="&size2.accesskey;"
+				     onaction="EditorSetFontSize('+2')"/>
+			<menuitem value="&sizePlusThreeCmd.label;"
+             accesskey="&size3.accesskey;"
+				     onaction="EditorSetFontSize('+3')"/>
+			<menuitem value="&sizePlusFourCmd.label;"
+             accesskey="&size4.accesskey;"
+				     onaction="EditorSetFontSize('+4')"/>
         </menupopup>
 	  </menu>
-      <menu value="&fontStyleMenu.label;">
+      <menu value="&fontStyleMenu.label;" accesskey="&formatstylemenu.accesskey;">
         <menupopup>
-		<menuitem value="&styleBoldCmd.label;" onaction="EditorApplyStyle('b')"/>
-        <menuitem value="&styleItalicCmd.label;" onaction="EditorApplyStyle('i')"/>
-        <menuitem value="&styleUnderlineCmd.label;" onaction="EditorApplyStyle('u')"/>
-        <menuitem value="&styleStrikeThruCmd.label;" onaction="EditorApplyStyle('strike')"/>
-        <menuitem value="&styleSuperscriptCmd.label;" onaction="EditorApplyStyle('sup')"/>
-        <menuitem value="&styleSubscriptCmd.label;" onaction="EditorApplyStyle('sub')"/>
-        <menuitem value="&styleBlinkCmd.label;" onaction="EditorApplyStyle('blink')"/>
-        <menuitem value="&styleNonbreakingCmd.label;" onaction="EditorApplyStyle('nobr')"/>
+			<menuitem value="&styleBoldCmd.label;"
+             accesskey="&stylebold.accesskey;"
+				     onaction="EditorApplyStyle('b')"/>
+			<menuitem value="&styleItalicCmd.label;"
+             accesskey="&styleitalic.accesskey;"
+				     onaction="EditorApplyStyle('i')"/>
+			<menuitem value="&styleUnderlineCmd.label;"
+             accesskey="&styleunderline.accesskey;"
+				     onaction="EditorApplyStyle('u')"/>
+			<menuitem value="&styleStrikeThruCmd.label;"
+             accesskey="&stylestrikethru.accesskey;"
+				     onaction="EditorApplyStyle('strike')"/>
+			<menuitem value="&styleSuperscriptCmd.label;"
+             accesskey="&stylesuperscript.accesskey;"
+				     onaction="EditorApplyStyle('sup')"/>
+			<menuitem value="&styleSubscriptCmd.label;"
+             accesskey="&stylesubscript.accesskey;"
+				     onaction="EditorApplyStyle('sub')"/>
+			<menuitem value="&styleBlinkCmd.label;"
+             accesskey="&styleblink.accesskey;"
+				     onaction="EditorApplyStyle('blink')"/>
+			<menuitem value="&styleNonbreakingCmd.label;"
+             accesskey="&stylenonbreaking.accesskey;"
+				     onaction="EditorApplyStyle('nobr')"/>
         </menupopup>
 	  </menu>
-      <menuitem value="&fontColorMenu.label;" onaction=""/>
-      <menuitem value="&removeAllStylesCmd.label;" onaction="EditorRemoveStyle('all')"/>
+      <menu value="&fontColorMenu.label;" accesskey="&formatcolormenu.accesskey;">
+				<menupopup>
+					<menuitem value="&colorBlackCmd.label;"
+             accesskey="&colorblack.accesskey;"
+				     onaction="EditorSetFontColor('black')"/>
+					<menuitem value="&colorGrayCmd.label;"
+             accesskey="&colorgray.accesskey;"
+				     onaction="EditorSetFontColor('gray')"/>
+					<menuitem value="&colorSilverCmd.label;"
+             accesskey="&colorsilver.accesskey;"
+				     onaction="EditorSetFontColor('silver')"/>
+					<menuitem value="&colorWhiteCmd.label;"
+             accesskey="&colorwhite.accesskey;"
+				     onaction="EditorSetFontColor('white')"/>
+					<menuitem value="&colorRedCmd.label;"
+             accesskey="&colorred.accesskey;"
+				     onaction="EditorSetFontColor('red')"/>
+					<menuitem value="&colorBlueCmd.label;"
+             accesskey="&colorblue.accesskey;"
+				     onaction="EditorSetFontColor('blue')"/>
+					<menuitem value="&colorGreenCmd.label;"
+             accesskey="&colorgreen.accesskey;"
+				     onaction="EditorSetFontColor('green')"/>
+					<menuitem value="&colorCyanCmd.label;"
+             accesskey="&colorcyan.accesskey;"
+				     onaction="EditorSetFontColor('cyan')"/>
+					<menuitem value="&colorYellowCmd.label;"
+             accesskey="&coloryellow.accesskey;"
+				     onaction="EditorSetFontColor('yellow')"/>
+					<menuitem value="&colorMagentaCmd.label;"
+             accesskey="&colormagenta.accesskey;"
+				     onaction="EditorSetFontColor('magenta')"/>
+				</menupopup>
+		  </menu>
+		  <menuitem value="&removeAllStylesCmd.label;"
+             accesskey="&formatremovestyles.accesskey;"
+				     onaction="EditorRemoveStyle('all')"/>
       <menuseparator />
-      <menu value="&paragraphHeadingMenu.label;">
+      <menu value="&paragraphMenu.label;">
         <menupopup>
-		<menuitem value="&paragraphNormalCmd.label;"    onaction="EditorSetParagraphFormat('normal')"/>
-        <menuitem value="&headingOneCmd.label;"         onaction="EditorSetParagraphFormat('h1')"/>
-        <menuitem value="&headingTwoCmd.label;"         onaction="EditorSetParagraphFormat('h2')"/>
-        <menuitem value="&headingThreeCmd.label;"       onaction="EditorSetParagraphFormat('h3')"/>
-        <menuitem value="&headingFourCmd.label;"        onaction="EditorSetParagraphFormat('h4')"/>
-        <menuitem value="&headingFiveCmd.label;"        onaction="EditorSetParagraphFormat('h5')"/>
-        <menuitem value="&headingSixCmd.label;"         onaction="EditorSetParagraphFormat('h6')"/>
-        <menuitem value="&paragraphAddressCmd.label;"   onaction="EditorSetParagraphFormat('address')"/>
-        <menuitem value="&paragraphPreformatCmd.label;" onaction="EditorSetParagraphFormat('pre')"/>
-        <menuitem value="&paragraphListCmd.label;"      onaction="EditorSetParagraphFormat('li')"/>
-        <menuitem value="&paragraphDfnTermCmd.label;"   onaction="EditorSetParagraphFormat('dt')"/>
-        <menuitem value="&paragraphDfnDescCmd.label;"   onaction="EditorSetParagraphFormat('dd')"/>
+			<menuitem value="&paragraphNormalCmd.label;"   
+             accesskey="&headingnone.accesskey;"
+				     onaction="EditorSetParagraphFormat('normal')"/>
+			<menuitem value="&headingOneCmd.label;"
+             accesskey="&heading1.accesskey;"
+				     onaction="EditorSetParagraphFormat('h1')"/>
+			<menuitem value="&headingTwoCmd.label;"
+             accesskey="&heading2.accesskey;"
+				     onaction="EditorSetParagraphFormat('h2')"/>
+			<menuitem value="&headingThreeCmd.label;"
+             accesskey="&heading3.accesskey;"
+				     onaction="EditorSetParagraphFormat('h3')"/>
+			<menuitem value="&headingFourCmd.label;"
+             accesskey="&heading4.accesskey;"
+				     onaction="EditorSetParagraphFormat('h4')"/>
+			<menuitem value="&headingFiveCmd.label;"
+             accesskey="&heading5.accesskey;"
+				     onaction="EditorSetParagraphFormat('h5')"/>
+			<menuitem value="&headingSixCmd.label;"
+             accesskey="&heading6.accesskey;"
+				     onaction="EditorSetParagraphFormat('h6')"/>
+			<menuitem value="&paragraphAddressCmd.label;"    
+             accesskey="&paragraphaddress.accesskey;"
+				     onaction="EditorSetParagraphFormat('address')"/>
+			<menuitem value="&paragraphPreformatCmd.label;"  
+             accesskey="&paragraphpreformat.accesskey;"
+				     onaction="EditorSetParagraphFormat('pre')"/>
+			<menuitem value="&paragraphListCmd.label;"       
+             accesskey="&paragraphlist.accesskey;"
+				     onaction="EditorSetParagraphFormat('li')"/>
+			<menuitem value="&paragraphDfnTermCmd.label;"    
+             accesskey="&paragraphterm.accesskey;"
+				     onaction="EditorSetParagraphFormat('dt')"/>
+			<menuitem value="&paragraphDfnDescCmd.label;"    
+             accesskey="&paragraphdesc.accesskey;"
+				     onaction="EditorSetParagraphFormat('dd')"/>
         </menupopup>
 	  </menu>
      </menupopup>
@@ -175,19 +347,25 @@
     </menu>
     <menu value="&debugMenu.label;">
       <menupopup>
-	  <menuitem value="&outputTextCmd.label;" onaction="EditorGetText()"/>
-      <menuitem value="&outputHTMLCmd.label;" onaction="EditorGetHTML()"/>
+	  <menuitem value="&outputTextCmd.label;"
+				     onaction="EditorGetText()"/>
+      <menuitem value="&outputHTMLCmd.label;"
+				     onaction="EditorGetHTML()"/>
       <menuseparator />
-      <menuitem value="&insertTextCmd.label;" onaction="EditorInsertText('All good things come to those who wait. ')"/>
+      <menuitem value="&insertTextCmd.label;"
+				     onaction="EditorInsertText('All good things come to those who wait. ')"/>
       <menuseparator />
-      <menuitem value="&testSelectionCmd.label;" onaction="EditorTestSelection()"/>
+      <menuitem value="&testSelectionCmd.label;"
+				     onaction="EditorTestSelection()"/>
       <menuitem value="&testDocumentCmd.label;" onaction="EditorTestDocument()"/>
-      <menuitem value="&runUnitTestsCmd.label;" onaction="EditorUnitTests()"/>
+      <menuitem value="&runUnitTestsCmd.label;"
+				     onaction="EditorUnitTests()"/>
 	  </menupopup>
     </menu>
     <menu value="&helpMenu.label;">
       <menupopup>
-	  <menuitem value="&aboutCmd.label;" onaction=""/>
+      <menuitem value="&aboutCmd.label;"
+				     onaction=""/>
 	  </menupopup>
     </menu>
 	<spring flex="100%"/>
@@ -306,19 +484,19 @@
    <window class="popup" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" align="vertical" flex="100%" 
     width="70" height="110">
      <html:div flex="100%">
-     <html:button class="PopupButton" onclick="window.close();">
+     <html:button class="PopupButton" onclick="opener.EditorAlign('left'); window.close();">
        <html:img align="middle" src="chrome://editor/skin/images/ED_Left.gif"/>
        <html:span>&alignLeft.label;</html:span>
      </html:button>
-     <html:button class="PopupButton" onclick="window.close();">
+     <html:button class="PopupButton" onclick="opener.EditorAlign('center'); window.close();">
        <html:img align="middle" src="chrome://editor/skin/images/ED_Center.gif"/>
        <html:span>&alignCenter.label;</html:span>
      </html:button>
-     <html:button class="PopupButton" onclick="window.close();">
+     <html:button class="PopupButton" onclick="opener.EditorAlign('right'); window.close();">
        <html:img align="middle" src="chrome://editor/skin/images/ED_Right.gif"/>
        <html:span>&alignRight.label;</html:span>
      </html:button>
-     <html:button class="PopupButton" onclick="window.close();">
+     <html:button class="PopupButton" onclick="opener.EditorAlign('justify'); window.close();">
        <html:img align="middle" src="chrome://editor/skin/images/ED_Justify.gif"/>
        <html:span>&alignJustify.label;</html:span>
      </html:button>
diff --git a/suite/debugQA/content/debugQATextEditorShell.xul b/suite/debugQA/content/debugQATextEditorShell.xul
index 0cc266275c99..997e9c9376df 100644
--- a/suite/debugQA/content/debugQATextEditorShell.xul
+++ b/suite/debugQA/content/debugQATextEditorShell.xul
@@ -14,25 +14,39 @@
   </html:script>
 
   <keyset id="defaultKeySet">
-    <key id="acmdkey" disabled="false" shift="false" command="true" alt="false" key="a" onkeypress="EditorSelectAll()" />
-    <key id="bcmdkey" disabled="false" shift="false" command="true" alt="false" key="b" onkeypress="EditorApplyStyle('b')"/>
-    <key id="ccmdkey" disabled="false" shift="false" command="true" alt="false" key="c" onkeypress="EditorCopy()" />
-    <key id="fcmdkey" disabled="false" shift="false" command="true" alt="false" key="f" onkeypress="EditorFind()" />
-    <key id="gcmdkey" disabled="false" shift="false" command="true" alt="false" key="g" onkeypress="EditorFindNext()" />
-    <key id="icmdkey" disabled="false" shift="false" command="true" alt="false" key="i" onkeypress="EditorApplyStyle('i')"/>
-    <key id="kcmdkey" disabled="false" shift="false" command="true" alt="false" key="k" onkeypress="CheckSpelling()" />
-    <key id="ncmdkey" disabled="false" shift="false" command="true" alt="false" key="n" onkeypress="EditorNew()" />
-    <key id="ocmdkey" disabled="false" shift="false" command="true" alt="false" key="o" onkeypress="EditorOpen()" />
-    <key id="pcmdkey" disabled="false" shift="false" command="true" alt="false" key="p" onkeypress="EditorPrint()" />
-    <key id="qcmdkey" disabled="false" shift="false" command="true" alt="false" key="q" onkeypress="EditorExit()" />
-    <key id="ucmdkey" disabled="false" shift="false" command="true" alt="false" key="u" onkeypress="EditorApplyStyle('u')"/>
-    <key id="vcmdkey" disabled="false" shift="false" command="true" alt="false" key="v" onkeypress="EditorPaste()" />
-    <key id="wcmdkey" disabled="false" shift="false" command="true" alt="false" key="w" onkeypress="EditorClose()" />
-    <key id="xcmdkey" disabled="false" shift="false" command="true" alt="false" key="x" onkeypress="EditorCut()" />
-    <key id="ycmdkey" disabled="false" shift="false" command="true" alt="false" key="y" onkeypress="EditorRedo()" />
-    <key id="zcmdkey" disabled="false" shift="false" command="true" alt="false" key="z" onkeypress="EditorUndo()" />
+    <key id="selectallkb" disabled="false" shift="false" command="true" alt="false" key="a" onkeypress="EditorSelectAll()" />
+    <key id="boldkb" disabled="false" shift="false" command="true" alt="false" key="b" onkeypress="EditorToggleStyle('bold')"/>
+    <key id="copykb" disabled="false" shift="false" command="true" alt="false" key="c" onkeypress="EditorCopy()" />
+    <key id="findkb" disabled="false" shift="false" command="true" alt="false" key="f" onkeypress="EditorFind()" />
+    <key id="findnextkb" disabled="false" shift="false" command="true" alt="false" key="g" onkeypress="EditorFindNext()" />
+    <key id="italickb" disabled="false" shift="false" command="true" alt="false" key="i" onkeypress="EditorToggleStyle('italic')"/>
+    <key id="checkspellingkb" disabled="false" shift="false" command="true" alt="false" key="k" onkeypress="CheckSpelling()" />
+    <key id="neweditorkb" disabled="false" shift="false" command="true" alt="false" key="n" onkeypress="EditorNew()" />
+    <key id="openeditorkb" disabled="false" shift="false" command="true" alt="false" key="o" onkeypress="EditorOpen()" />
+    <key id="printkb" disabled="false" shift="false" command="true" alt="false" key="p" onkeypress="EditorPrint()" />
+    <key id="quitkb" disabled="false" shift="false" command="true" alt="false" key="q" onkeypress="EditorExit()" />
+    <key id="savekb" disabled="false" shift="false" command="true" alt="false" key="s" onkeypress="EditorSave()"/>
+    <key id="underlinekb" disabled="false" shift="false" command="true" alt="false" key="u" onkeypress="EditorToggleStyle('underline')"/>
+    <key id="pastekb" disabled="false" shift="false" command="true" alt="false" key="v" onkeypress="EditorPaste()" />
+    <key id="closekb" disabled="false" shift="false" command="true" alt="false" key="w" onkeypress="EditorClose()" />
+    <key id="cutkb" disabled="false" shift="false" command="true" alt="false" key="x" onkeypress="EditorCut()" />
+    <key id="redokb" disabled="false" shift="false" command="true" alt="false" key="y" onkeypress="EditorRedo()" />
+    <key id="undokb" disabled="false" shift="false" command="true" alt="false" key="z" onkeypress="EditorUndo()" />
+    <key id="navigatorkb" disabled="false" shift="false" command="true" alt="false" key="1" onkeypress="Navigator()" />
+    <key id="messengerkb" disabled="false" shift="false" command="true" alt="false" key="2" onkeypress="Messenger()" />
+    <key id="composerkb" disabled="false" shift="false" command="true" alt="false" key="3" onkeypress="Composer()" />
+    <key id="calendarkb" disabled="false" shift="false" command="true" alt="false" key="4" onkeypress="Calendar()" />
+    <key id="indentkb" disabled="false" shift="false" command="true" alt="false" key="=" onkeypress="EditorIndent('indent')" />
+    <key id="outdentkb" disabled="false" shift="false" command="true" alt="false" key="-" onkeypress="EditorIndent('outdent')" />
 
-<!-- how to handle return, enter, tab, function keys, arrow keys, others? -->
+    <key id="inserthtmlkb" disabled="false" shift="false" command="true" alt="true" key="i" onkeypress="EditorInsertHTML()"/>
+    <key id="pastequotationkb" disabled="false" shift="false" command="true" alt="true" key="v" onkeypress="EditorPasteAsQuotation()" />
+
+    <key id="removestyleskb" disabled="false" shift="true" command="true" alt="false" key="k" onkeypress="RemoveStyles()" />
+    <key id="decreasefontsizekb" disabled="false" shift="true" command="true" alt="false" key="[" onkeypress="DecreaseFontSize()" />
+    <key id="increasefontsizekb" disabled="false" shift="true" command="true" alt="false" key="]" onkeypress="IncreaseFontSize()" />
+
+<!-- how to handle return, enter, tab, function keys, arrow keys, others? saari working on solution -->
   </keyset>
 
   <broadcaster id="args" value="chrome://editor/content/EditorInitPagePlain.html"/>
@@ -43,6 +57,7 @@
   <observes element="dialog.start" attribute="ready" onchange="EditorStartup('text')"/>
     
   <broadcaster id="Editor:Document:Dirty" dirty="false"/>
+
   <broadcaster id="Editor:Style:IsBold" bold="false"/>
   <broadcaster id="Editor:Style:IsItalic" italic="false"/>
   <broadcaster id="Editor:Style:IsUnderline" underline="false"/>
@@ -52,114 +67,271 @@
 
   <toolbox id="EditorToolbars">
     <menubar>
-    <menu value="&fileMenu.label;">
+    <menu value="&fileMenu.label;" accesskey="&filemenu.accesskey;">
 	  <menupopup>
-      <menuitem value="&newCmd.label;" onaction="EditorNew()"/>
-      <menuitem value="&openCmd.label;" onaction="EditorOpen()"/>
-      <menuitem value="&closeCmd.label;" onaction="EditorClose()"/>
-      <menuseparator />
-      <menuitem value="&saveCmd.label;" onaction="EditorSave()"/>
-      <menuitem value="&saveAsCmd.label;" onaction="EditorSaveAs()"/>
-      <menuseparator />
-      <menuitem value="&printSetupCmd.label;" onaction=""/>
-      <menuitem value="&printPreviewCmd.label;" onaction="EditorPrintPreview()"/>
-      <menuitem value="&printCmd.label;" onaction="EditorPrint()"/>
-      <menuseparator />
-      <menuitem value="&quitCmd.label;" onaction="EditorExit()"/>
+		  <menuitem value="&newCmd.label;" 
+          accesskey="&filenew.accesskey;" key="neweditorkb" 
+		      onaction="EditorNew()"/>
+		  <menuitem value="&openCmd.label;" 
+          accesskey="&fileopen.accesskey;" key="openeditorkb" 
+		      onaction="EditorOpen()"/>
+		  <menuseparator />
+		  <menuitem value="&saveCmd.label;" 
+          accesskey="&filesave.accesskey;" key="savekb" 
+		      onaction="EditorSave()"/>
+		  <menuitem value="&saveAsCmd.label;" 
+          accesskey="&filesaveas.accesskey;" 
+		      onaction="EditorSaveAs()"/>
+		  <menuseparator />
+		  <menuitem value="&printSetupCmd.label;" 
+          accesskey="&fileprintsetup.accesskey;"
+		      onaction=""/>
+		  <menuitem value="&printPreviewCmd.label;" 
+          accesskey="&fileprintpreview.accesskey;" 
+		      onaction="EditorPrintPreview()"/>
+		  <menuitem value="&printCmd.label;" 
+          accesskey="&fileprint.accesskey;" key="printkb" 
+		      onaction="EditorPrint()"/>
+		  <menuseparator />
+		  <menuitem value="&closeCmd.label;" 
+          accesskey="&fileclose.accesskey;" key="closekb" 
+		      onaction="EditorClose()"/>
+		  <menuitem value="&quitCmd.label;" 
+          accesskey="&filequit.accesskey;" key="quitkb" 
+		      onaction="EditorExit()"/>
 	  </menupopup>
     </menu>
 
-    <menu value="&editMenu.label;">
+    <menu value="&editMenu.label;" accesskey="&editmenu.accesskey;">
 	  <menupopup>
-      <menuitem value="&undoCmd.label;" onaction="EditorUndo()"/>
-      <menuitem value="&redoCmd.label;" onaction="EditorRedo()"/>
-      <menuseparator />
-      <menuitem value="&cutCmd.label;" onaction="EditorCut()"/>
-      <menuitem value="&copyCmd.label;" onaction="EditorCopy()"/>
-      <menuitem value="&pasteCmd.label;" onaction="EditorPaste()"/>
-      <menuitem value="&pasteAsQuotationCmd.label;" onaction="EditorPasteAsQuotation()"/>
-      <menuitem value="&clearCmd.label;" onaction=""/>
-      <menuseparator />
-      <menuitem value="&selectAllCmd.label;" onaction="EditorSelectAll()"/>
-      <menuseparator />
-      <menuitem value="&findCmd.label;" onaction="EditorFind()"/>
-      <menuitem value="&findAgainCmd.label;" onaction="EditorFindNext()"/>
+		  <menuitem value="&undoCmd.label;"
+          accesskey="&editundo.accesskey;" key="undokb" 
+		      onaction="EditorUndo()"/>
+		  <menuitem value="&redoCmd.label;"
+          accesskey="&editredo.accesskey;" key="redokb" 
+		      onaction="EditorRedo()"/>
+		  <menuseparator />
+		  <menuitem value="&cutCmd.label;"
+          accesskey="&editcut.accesskey;" key="cutkb" 
+		      onaction="EditorCut()"/>
+		  <menuitem value="&copyCmd.label;"
+          accesskey="&editcopy.accesskey;" key="copykb" 
+		      onaction="EditorCopy()"/>
+		  <menuitem value="&pasteCmd.label;" 
+          accesskey="&editpaste.accesskey;" key="pastekb" 
+		      onaction="EditorPaste()"/>
+		  <menuitem value="&pasteAsQuotationCmd.label;" 
+          accesskey="&editpastequotation.accesskey;" key="pastequotationkb" 
+		      onaction="EditorPasteAsQuotation()"/>
+		  <menuitem value="&clearCmd.label;" 
+          accesskey="&editclear.accesskey;" 
+		      onaction=""/>
+		  <menuseparator />
+		  <menuitem value="&selectAllCmd.label;"
+          accesskey="&editselectall.accesskey;" key="selectallkb" 
+		      onaction="EditorSelectAll()"/>
+		  <menuseparator />
+		  <menuitem value="&findCmd.label;"
+          accesskey="&editfind.accesskey;" key="findkb" 
+		      onaction="EditorFind()"/>
+		  <menuitem value="&findAgainCmd.label;"
+          accesskey="&editfindnext.accesskey;" key="findnextkb" 
+		      onaction="EditorFindNext()"/>
 	  </menupopup>
     </menu>
 
-    <menu value="&viewMenu.label;">
+    <menu value="&viewMenu.label;" accesskey="&viewmenu.accesskey;">
 	  <menupopup>
-      <menuitem value="&hideCompositionToolbarCmd.label;" onaction=""/>
-      <menuitem value="&hideFormattingToolbarCmd.label;" onaction="" />
+		  <menuitem value="&hideCompositionToolbarCmd.label;"
+          accesskey="&viewcompositiontb.accesskey;" 
+		      onaction=""/>
+		  <menuitem value="&hideFormattingToolbarCmd.label;"
+          accesskey="&viewformattingtb.accesskey;" 
+		      onaction="" />
 	  </menupopup>
     </menu>
  
-    <menu value="&insertMenu.label;">
+    <menu value="&insertMenu.label;" accesskey="&insertmenu.accesskey;">
 	  <menupopup>
-      <menuitem value="&insertLinkCmd.label;" onaction="EditorInsertLink()"/>
-      <menuitem value="&insertTargetCmd.label;" onaction=""/>
-      <menuitem value="&insertImageCmd.label;" onaction="EditorInsertImage()"/>
-      <menuitem value="&insertHLineCmd.label;" onaction="EditorInsertHLine()"/>
-      <menuitem value="&insertTableCmd.label;" onaction="EditorInsertTable()"/>
-      <menuitem value="&insertHTMLSourceCmd.label;" onaction="EditorInsertHTML()"/>
-      <menuseparator />
-      <menuitem value="&insertLineBreakCmd.label;" onaction=""/>
-      <menuitem value="&insertBreakBelowImagesCmd.label;" onaction=""/>
+		  <menuitem value="&insertLinkCmd.label;"
+             accesskey="&insertlink.accesskey;"
+				     onaction="EditorInsertLink()"/>
+		  <menuitem value="&insertTargetCmd.label;"
+             accesskey="&inserttarget.accesskey;"
+				     onaction=""/>
+		  <menuitem value="&insertImageCmd.label;"
+             accesskey="&insertimage.accesskey;"
+				     onaction="EditorInsertImage()"/>
+		  <menuitem value="&insertHLineCmd.label;"
+             accesskey="&inserthline.accesskey;"
+				     onaction="EditorInsertHLine()"/>
+		  <menuitem value="&insertTableCmd.label;"
+             accesskey="&inserttable.accesskey;"
+				     onaction="EditorInsertTable()"/>
+		  <menuitem value="&insertHTMLSourceCmd.label;"
+             accesskey="&insertsource.accesskey;"
+				     onaction="EditorInsertHTML()"/>
+		  <menuseparator />
+		  <menuitem value="&insertLineBreakCmd.label;"
+             accesskey="&insertlinebreak.accesskey;"
+				     onaction=""/>
+		  <menuitem value="&insertBreakBelowImagesCmd.label;"
+             accesskey="&insertbreak.accesskey;"
+				     onaction=""/>
 	  </menupopup>
     </menu>
 
-    <menu value="&formatMenu.label;">
+    <menu value="&formatMenu.label;" accesskey="&formatmenu.accesskey;">
 	  <menupopup>
-      <menu value="&fontfaceMenu.label;">
+      <menu value="&fontfaceMenu.label;" accesskey="&formatfontmenu.accesskey;">
 	    <menupopup>
-        <menuitem value="&defaultVariableWidthCmd.label;" onaction="EditorSetFontFace('')"/>
-        <menuitem value="&defaultFixedWidthCmd.label;" onaction="EditorSetFontFace('tt')"/>
-        <menuseparator/>
-        <menuitem value="&arialHelveticaFont.label;" onaction="EditorSetFontFace('Arial, Helvetica, sans-serif')"/>
-        <menuitem value="&timesFont.label;" onaction="EditorSetFontFace('Times New Roman, Times, serif')"/>
-        <menuitem value="&courierFont.label;" onaction="EditorSetFontFace('Courier New, Courier, mono')"/>
+			<menuitem value="&defaultVariableWidthCmd.label;"
+             accesskey="&fontvarwidth.accesskey;"
+				     onaction="EditorSetFontFace('')"/>
+			<menuitem value="&defaultFixedWidthCmd.label;"
+             accesskey="&fontfixedwidth.accesskey;"
+				     onaction="EditorSetFontFace('tt')"/>
+			<menuseparator/>
+			<menuitem value="&arialHelveticaFont.label;"
+             accesskey="&fonthelvetica.accesskey;"
+				     onaction="EditorSetFontFace('Arial, Helvetica, sans-serif')"/>
+			<menuitem value="&timesFont.label;"
+             accesskey="&fonttimes.accesskey;"
+				     onaction="EditorSetFontFace('Times New Roman, Times, serif')"/>
+			<menuitem value="&courierFont.label;"
+             accesskey="&fontcourier.accesskey;"
+				     onaction="EditorSetFontFace('Courier New, Courier, mono')"/>
         </menupopup>
 	  </menu>
-      <menu value="&fontsizeMenu.label;">
+      <menu value="&fontsizeMenu.label;" accesskey="&formatsizemenu.accesskey;">
         <menupopup>
-		<menuitem value="&sizeMinusTwoCmd.label;" onaction="EditorSetFontSize('-2')"/>
-        <menuitem value="&sizeMinusOneCmd.label;" onaction="EditorSetFontSize('-1')"/>
-        <menuitem value="&sizeNormalCmd.label;" onaction="EditorSetFontSize('0')"/>
-        <menuitem value="&sizePlusOneCmd.label;" onaction="EditorSetFontSize('+1')"/>
-        <menuitem value="&sizePlusTwoCmd.label;" onaction="EditorSetFontSize('+2')"/>
-        <menuitem value="&sizePlusThreeCmd.label;" onaction="EditorSetFontSize('+3')"/>
-        <menuitem value="&sizePlusFourCmd.label;" onaction="EditorSetFontSize('+4')"/>
+			<menuitem value="&sizeMinusTwoCmd.label;"
+             accesskey="&sizeminus2.accesskey;"
+				     onaction="EditorSetFontSize('-2')"/>
+			<menuitem value="&sizeMinusOneCmd.label;"
+             accesskey="&sizeminus1.accesskey;"
+				     onaction="EditorSetFontSize('-1')"/>
+			<menuitem value="&sizeNormalCmd.label;"
+             accesskey="&sizenormal.accesskey;"
+				     onaction="EditorSetFontSize('0')"/>
+			<menuitem value="&sizePlusOneCmd.label;"
+             accesskey="&size1.accesskey;"
+				     onaction="EditorSetFontSize('+1')"/>
+			<menuitem value="&sizePlusTwoCmd.label;"
+             accesskey="&size2.accesskey;"
+				     onaction="EditorSetFontSize('+2')"/>
+			<menuitem value="&sizePlusThreeCmd.label;"
+             accesskey="&size3.accesskey;"
+				     onaction="EditorSetFontSize('+3')"/>
+			<menuitem value="&sizePlusFourCmd.label;"
+             accesskey="&size4.accesskey;"
+				     onaction="EditorSetFontSize('+4')"/>
         </menupopup>
 	  </menu>
-      <menu value="&fontStyleMenu.label;">
+      <menu value="&fontStyleMenu.label;" accesskey="&formatstylemenu.accesskey;">
         <menupopup>
-		<menuitem value="&styleBoldCmd.label;" onaction="EditorApplyStyle('b')"/>
-        <menuitem value="&styleItalicCmd.label;" onaction="EditorApplyStyle('i')"/>
-        <menuitem value="&styleUnderlineCmd.label;" onaction="EditorApplyStyle('u')"/>
-        <menuitem value="&styleStrikeThruCmd.label;" onaction="EditorApplyStyle('strike')"/>
-        <menuitem value="&styleSuperscriptCmd.label;" onaction="EditorApplyStyle('sup')"/>
-        <menuitem value="&styleSubscriptCmd.label;" onaction="EditorApplyStyle('sub')"/>
-        <menuitem value="&styleBlinkCmd.label;" onaction="EditorApplyStyle('blink')"/>
-        <menuitem value="&styleNonbreakingCmd.label;" onaction="EditorApplyStyle('nobr')"/>
+			<menuitem value="&styleBoldCmd.label;"
+             accesskey="&stylebold.accesskey;"
+				     onaction="EditorApplyStyle('b')"/>
+			<menuitem value="&styleItalicCmd.label;"
+             accesskey="&styleitalic.accesskey;"
+				     onaction="EditorApplyStyle('i')"/>
+			<menuitem value="&styleUnderlineCmd.label;"
+             accesskey="&styleunderline.accesskey;"
+				     onaction="EditorApplyStyle('u')"/>
+			<menuitem value="&styleStrikeThruCmd.label;"
+             accesskey="&stylestrikethru.accesskey;"
+				     onaction="EditorApplyStyle('strike')"/>
+			<menuitem value="&styleSuperscriptCmd.label;"
+             accesskey="&stylesuperscript.accesskey;"
+				     onaction="EditorApplyStyle('sup')"/>
+			<menuitem value="&styleSubscriptCmd.label;"
+             accesskey="&stylesubscript.accesskey;"
+				     onaction="EditorApplyStyle('sub')"/>
+			<menuitem value="&styleBlinkCmd.label;"
+             accesskey="&styleblink.accesskey;"
+				     onaction="EditorApplyStyle('blink')"/>
+			<menuitem value="&styleNonbreakingCmd.label;"
+             accesskey="&stylenonbreaking.accesskey;"
+				     onaction="EditorApplyStyle('nobr')"/>
         </menupopup>
 	  </menu>
-      <menuitem value="&fontColorMenu.label;" onaction=""/>
-      <menuitem value="&removeAllStylesCmd.label;" onaction="EditorRemoveStyle('all')"/>
+      <menu value="&fontColorMenu.label;" accesskey="&formatcolormenu.accesskey;">
+				<menupopup>
+					<menuitem value="&colorBlackCmd.label;"
+             accesskey="&colorblack.accesskey;"
+				     onaction="EditorSetFontColor('black')"/>
+					<menuitem value="&colorGrayCmd.label;"
+             accesskey="&colorgray.accesskey;"
+				     onaction="EditorSetFontColor('gray')"/>
+					<menuitem value="&colorSilverCmd.label;"
+             accesskey="&colorsilver.accesskey;"
+				     onaction="EditorSetFontColor('silver')"/>
+					<menuitem value="&colorWhiteCmd.label;"
+             accesskey="&colorwhite.accesskey;"
+				     onaction="EditorSetFontColor('white')"/>
+					<menuitem value="&colorRedCmd.label;"
+             accesskey="&colorred.accesskey;"
+				     onaction="EditorSetFontColor('red')"/>
+					<menuitem value="&colorBlueCmd.label;"
+             accesskey="&colorblue.accesskey;"
+				     onaction="EditorSetFontColor('blue')"/>
+					<menuitem value="&colorGreenCmd.label;"
+             accesskey="&colorgreen.accesskey;"
+				     onaction="EditorSetFontColor('green')"/>
+					<menuitem value="&colorCyanCmd.label;"
+             accesskey="&colorcyan.accesskey;"
+				     onaction="EditorSetFontColor('cyan')"/>
+					<menuitem value="&colorYellowCmd.label;"
+             accesskey="&coloryellow.accesskey;"
+				     onaction="EditorSetFontColor('yellow')"/>
+					<menuitem value="&colorMagentaCmd.label;"
+             accesskey="&colormagenta.accesskey;"
+				     onaction="EditorSetFontColor('magenta')"/>
+				</menupopup>
+		  </menu>
+		  <menuitem value="&removeAllStylesCmd.label;"
+             accesskey="&formatremovestyles.accesskey;"
+				     onaction="EditorRemoveStyle('all')"/>
       <menuseparator />
-      <menu value="&paragraphHeadingMenu.label;">
+      <menu value="&paragraphMenu.label;">
         <menupopup>
-		<menuitem value="&paragraphNormalCmd.label;"    onaction="EditorSetParagraphFormat('normal')"/>
-        <menuitem value="&headingOneCmd.label;"         onaction="EditorSetParagraphFormat('h1')"/>
-        <menuitem value="&headingTwoCmd.label;"         onaction="EditorSetParagraphFormat('h2')"/>
-        <menuitem value="&headingThreeCmd.label;"       onaction="EditorSetParagraphFormat('h3')"/>
-        <menuitem value="&headingFourCmd.label;"        onaction="EditorSetParagraphFormat('h4')"/>
-        <menuitem value="&headingFiveCmd.label;"        onaction="EditorSetParagraphFormat('h5')"/>
-        <menuitem value="&headingSixCmd.label;"         onaction="EditorSetParagraphFormat('h6')"/>
-        <menuitem value="&paragraphAddressCmd.label;"   onaction="EditorSetParagraphFormat('address')"/>
-        <menuitem value="&paragraphPreformatCmd.label;" onaction="EditorSetParagraphFormat('pre')"/>
-        <menuitem value="&paragraphListCmd.label;"      onaction="EditorSetParagraphFormat('li')"/>
-        <menuitem value="&paragraphDfnTermCmd.label;"   onaction="EditorSetParagraphFormat('dt')"/>
-        <menuitem value="&paragraphDfnDescCmd.label;"   onaction="EditorSetParagraphFormat('dd')"/>
+			<menuitem value="&paragraphNormalCmd.label;"   
+             accesskey="&headingnone.accesskey;"
+				     onaction="EditorSetParagraphFormat('normal')"/>
+			<menuitem value="&headingOneCmd.label;"
+             accesskey="&heading1.accesskey;"
+				     onaction="EditorSetParagraphFormat('h1')"/>
+			<menuitem value="&headingTwoCmd.label;"
+             accesskey="&heading2.accesskey;"
+				     onaction="EditorSetParagraphFormat('h2')"/>
+			<menuitem value="&headingThreeCmd.label;"
+             accesskey="&heading3.accesskey;"
+				     onaction="EditorSetParagraphFormat('h3')"/>
+			<menuitem value="&headingFourCmd.label;"
+             accesskey="&heading4.accesskey;"
+				     onaction="EditorSetParagraphFormat('h4')"/>
+			<menuitem value="&headingFiveCmd.label;"
+             accesskey="&heading5.accesskey;"
+				     onaction="EditorSetParagraphFormat('h5')"/>
+			<menuitem value="&headingSixCmd.label;"
+             accesskey="&heading6.accesskey;"
+				     onaction="EditorSetParagraphFormat('h6')"/>
+			<menuitem value="&paragraphAddressCmd.label;"    
+             accesskey="&paragraphaddress.accesskey;"
+				     onaction="EditorSetParagraphFormat('address')"/>
+			<menuitem value="&paragraphPreformatCmd.label;"  
+             accesskey="&paragraphpreformat.accesskey;"
+				     onaction="EditorSetParagraphFormat('pre')"/>
+			<menuitem value="&paragraphListCmd.label;"       
+             accesskey="&paragraphlist.accesskey;"
+				     onaction="EditorSetParagraphFormat('li')"/>
+			<menuitem value="&paragraphDfnTermCmd.label;"    
+             accesskey="&paragraphterm.accesskey;"
+				     onaction="EditorSetParagraphFormat('dt')"/>
+			<menuitem value="&paragraphDfnDescCmd.label;"    
+             accesskey="&paragraphdesc.accesskey;"
+				     onaction="EditorSetParagraphFormat('dd')"/>
         </menupopup>
 	  </menu>
      </menupopup>
@@ -175,19 +347,25 @@
     </menu>
     <menu value="&debugMenu.label;">
       <menupopup>
-	  <menuitem value="&outputTextCmd.label;" onaction="EditorGetText()"/>
-      <menuitem value="&outputHTMLCmd.label;" onaction="EditorGetHTML()"/>
+	  <menuitem value="&outputTextCmd.label;"
+				     onaction="EditorGetText()"/>
+      <menuitem value="&outputHTMLCmd.label;"
+				     onaction="EditorGetHTML()"/>
       <menuseparator />
-      <menuitem value="&insertTextCmd.label;" onaction="EditorInsertText('All good things come to those who wait. ')"/>
+      <menuitem value="&insertTextCmd.label;"
+				     onaction="EditorInsertText('All good things come to those who wait. ')"/>
       <menuseparator />
-      <menuitem value="&testSelectionCmd.label;" onaction="EditorTestSelection()"/>
+      <menuitem value="&testSelectionCmd.label;"
+				     onaction="EditorTestSelection()"/>
       <menuitem value="&testDocumentCmd.label;" onaction="EditorTestDocument()"/>
-      <menuitem value="&runUnitTestsCmd.label;" onaction="EditorUnitTests()"/>
+      <menuitem value="&runUnitTestsCmd.label;"
+				     onaction="EditorUnitTests()"/>
 	  </menupopup>
     </menu>
     <menu value="&helpMenu.label;">
       <menupopup>
-	  <menuitem value="&aboutCmd.label;" onaction=""/>
+      <menuitem value="&aboutCmd.label;"
+				     onaction=""/>
 	  </menupopup>
     </menu>
 	<spring flex="100%"/>
@@ -306,19 +484,19 @@
    <window class="popup" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" align="vertical" flex="100%" 
     width="70" height="110">
      <html:div flex="100%">
-     <html:button class="PopupButton" onclick="window.close();">
+     <html:button class="PopupButton" onclick="opener.EditorAlign('left'); window.close();">
        <html:img align="middle" src="chrome://editor/skin/images/ED_Left.gif"/>
        <html:span>&alignLeft.label;</html:span>
      </html:button>
-     <html:button class="PopupButton" onclick="window.close();">
+     <html:button class="PopupButton" onclick="opener.EditorAlign('center'); window.close();">
        <html:img align="middle" src="chrome://editor/skin/images/ED_Center.gif"/>
        <html:span>&alignCenter.label;</html:span>
      </html:button>
-     <html:button class="PopupButton" onclick="window.close();">
+     <html:button class="PopupButton" onclick="opener.EditorAlign('right'); window.close();">
        <html:img align="middle" src="chrome://editor/skin/images/ED_Right.gif"/>
        <html:span>&alignRight.label;</html:span>
      </html:button>
-     <html:button class="PopupButton" onclick="window.close();">
+     <html:button class="PopupButton" onclick="opener.EditorAlign('justify'); window.close();">
        <html:img align="middle" src="chrome://editor/skin/images/ED_Justify.gif"/>
        <html:span>&alignJustify.label;</html:span>
      </html:button>