diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightings.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightings.java
index 0297c5402a0..312589582b7 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightings.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightings.java
@@ -1969,7 +1969,7 @@ public class SemanticHighlightings {
 	 * @param store The preference store
 	 */
 	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferenceConstants.EDITOR_SEMANTIC_HIGHLIGHTING_ENABLED, DEBUG);
+		store.setDefault(PreferenceConstants.EDITOR_SEMANTIC_HIGHLIGHTING_ENABLED, true);
 
 		SemanticHighlighting[] semanticHighlightings= getSemanticHighlightings();
 		for (int i= 0, n= semanticHighlightings.length; i < n; i++) {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java
index 73bd4e0e979..a4147f11613 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java
@@ -829,8 +829,8 @@ class CEditorColoringConfigurationBlock extends AbstractConfigurationBlock {
 			{ createHighlightedRange( 5, 21,  4, SemanticHighlightings.TYPEDEF) },
 			{ createHighlightedRange( 6, 18,  4, SemanticHighlightings.TYPEDEF) },
 			{ createHighlightedRange( 3, 16,  3, SemanticHighlightings.NAMESPACE) },
-			{ createHighlightedRange( 7, 25,  3, SemanticHighlightings.GLOBAL_VARIABLE) },
-			{ createHighlightedRange( 7, 39,  4, SemanticHighlightings.GLOBAL_VARIABLE) },
+			{ createHighlightedRange( 7, 25,  4, SemanticHighlightings.GLOBAL_VARIABLE) },
+			{ createHighlightedRange( 7, 40,  4, SemanticHighlightings.GLOBAL_VARIABLE) },
 			{ createHighlightedRange(18,  0,  5, SemanticHighlightings.LABEL) },
 			{ createHighlightedRange(12, 16,  4, SemanticHighlightings.ENUMERATOR) },
 			{ createHighlightedRange(12, 22,  3, SemanticHighlightings.ENUMERATOR) },
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ColorSettingPreviewCode.txt b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ColorSettingPreviewCode.txt
index 87c1bb354bb..ac0b26ef957 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ColorSettingPreviewCode.txt
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ColorSettingPreviewCode.txt
@@ -5,7 +5,7 @@ using namespace std;
 // This comment may span only this line
 typedef unsigned int uint;
 int static myfunc(uint parameter) {
-  if (parameter == 0) out << "zero" << endl;
+  if (parameter == 0) cout << "zero" << endl;
   return parameter - 1;
 }
 class MyClass {