diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIMessages.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIMessages.java
index 926bb45..db5e57f 100644
--- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIMessages.java
+++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIMessages.java
@@ -119,6 +119,12 @@
 	public static String EOL_Windows_UI;
 	public static String EOL_Unix_UI;
 	public static String EOL_Mac_UI;
+	public static String SyntaxColoringPage_0;
+	public static String SyntaxColoringPage_2;
+	public static String SyntaxColoringPage_3;
+	public static String SyntaxColoringPage_4;
+	public static String SyntaxColoringPage_5;
+	public static String SyntaxColoringPage_6;
 
 	// below are possibly unused strings that may be deleted
 	public static String HTMLFilesPreferencePage_1;
diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIPluginResources.properties b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIPluginResources.properties
index 37092cf..5b73362 100644
--- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIPluginResources.properties
+++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIPluginResources.properties
@@ -94,7 +94,12 @@
 UI_CSS_profile___2=CSS profile:
 WebContentSettingsPropertyPage_0=The properties used that cannot or are not specified in web files.  The project setting is used if you specify "none."
 ProjectWebContentSettingsPropertyPage_0=The properties for J2EE Web projects act as "project" default to be looked up when no properties are specified for a particular web file.
-
+SyntaxColoringPage_0=Syntax Element:
+SyntaxColoringPage_2=Enable
+SyntaxColoringPage_3=B&old
+SyntaxColoringPage_4=&Italic
+SyntaxColoringPage_5=&Strikethrough
+SyntaxColoringPage_6=&Underline
 # below are possibly unused strings that may be deleted
 HTMLFilesPreferencePage_1=Add this suffix (if not specified):
 HTMLFilesPreferencePage_2=Insert DOCTYPE declaration
diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLSyntaxColoringPage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLSyntaxColoringPage.java
index de6fa90..8d2654b 100644
--- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLSyntaxColoringPage.java
+++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLSyntaxColoringPage.java
@@ -243,7 +243,7 @@
 		Composite styleEditor = createComposite(top, 1);
 		((GridLayout) styleEditor.getLayout()).marginRight = 5;
 		((GridLayout) styleEditor.getLayout()).marginLeft = 0;
-		createLabel(styleEditor, "Syntax Element:");
+		createLabel(styleEditor, HTMLUIMessages.SyntaxColoringPage_0);
 		fStylesViewer = createStylesViewer(styleEditor);
 		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
 		gridData.horizontalIndent = 0;
@@ -256,8 +256,8 @@
 
 		Composite editingComposite = createComposite(top, 1);
 		((GridLayout) styleEditor.getLayout()).marginLeft = 5;
-		createLabel(editingComposite, "");
-		Button enabler = createCheckbox(editingComposite, "Enable");
+		createLabel(editingComposite, ""); //$NON-NLS-1$
+		Button enabler = createCheckbox(editingComposite, HTMLUIMessages.SyntaxColoringPage_2);
 		enabler.setEnabled(false);
 		enabler.setSelection(true);
 		Composite editControls = createComposite(editingComposite, 2);
@@ -283,16 +283,16 @@
 		fBackgroundColor.setLayoutData(gd);
 		fBackgroundColorEditor.setEnabled(false);
 
-		fBold = createCheckbox(editControls, "&Bold");
+		fBold = createCheckbox(editControls, HTMLUIMessages.SyntaxColoringPage_3);
 		fBold.setEnabled(false);
 		((GridData) fBold.getLayoutData()).horizontalSpan = 2;
-		fItalic = createCheckbox(editControls, "&Italic");
+		fItalic = createCheckbox(editControls, HTMLUIMessages.SyntaxColoringPage_4);
 		fItalic.setEnabled(false);
 		((GridData) fItalic.getLayoutData()).horizontalSpan = 2;
-		fStrike = createCheckbox(editControls, "&Strikethrough");
+		fStrike = createCheckbox(editControls, HTMLUIMessages.SyntaxColoringPage_5);
 		fStrike.setEnabled(false);
 		((GridData) fStrike.getLayoutData()).horizontalSpan = 2;
-		fUnderline = createCheckbox(editControls, "&Underline");
+		fUnderline = createCheckbox(editControls, HTMLUIMessages.SyntaxColoringPage_6);
 		fUnderline.setEnabled(false);
 		((GridData) fUnderline.getLayoutData()).horizontalSpan = 2;
 		fClearStyle = new Button(editingComposite, SWT.PUSH);
@@ -314,7 +314,7 @@
 		gridData3.horizontalSpan = 2;
 		fText.setLayoutData(gridData3);
 		fText.setEditable(false);
-		fText.setFont(JFaceResources.getFont("org.eclipse.wst.sse.ui.textfont"));
+		fText.setFont(JFaceResources.getFont("org.eclipse.wst.sse.ui.textfont")); //$NON-NLS-1$
 		fText.addKeyListener(getTextKeyListener());
 		fText.addSelectionListener(getTextSelectionListener());
 		fText.addMouseListener(getTextMouseListener());
