diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index e906ab76bf7..5dcea3b02c6 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -69,24 +69,24 @@
             targetID="org.eclipse.debug.ui.DebugPerspective">
          <view
                relative="org.eclipse.debug.ui.VariableView"
-               relationship="stack"
-               id="org.eclipse.cdt.debug.ui.MemoryView">
+               id="org.eclipse.cdt.debug.ui.MemoryView"
+               relationship="stack">
          </view>
          <viewShortcut
                id="org.eclipse.cdt.debug.ui.MemoryView">
          </viewShortcut>
          <view
                relative="org.eclipse.debug.ui.VariableView"
-               relationship="stack"
-               id="org.eclipse.cdt.debug.ui.SharedLibrariesView">
+               id="org.eclipse.cdt.debug.ui.SharedLibrariesView"
+               relationship="stack">
          </view>
          <viewShortcut
                id="org.eclipse.cdt.debug.ui.SharedLibrariesView">
          </viewShortcut>
          <view
                relative="org.eclipse.debug.ui.VariableView"
-               relationship="stack"
-               id="org.eclipse.cdt.debug.ui.SignalsView">
+               id="org.eclipse.cdt.debug.ui.SignalsView"
+               relationship="stack">
          </view>
          <viewShortcut
                id="org.eclipse.cdt.debug.ui.SignalsView">
@@ -113,12 +113,6 @@
             class="org.eclipse.cdt.debug.internal.ui.preferences.MemoryViewPreferencePage"
             id="org.eclipse.cdt.debug.ui.MemoryViewPreferencePage">
       </page>
-      <page
-            name="%RegistersPreferencePage.name"
-            category="org.eclipse.debug.ui.DebugPreferencePage"
-            class="org.eclipse.cdt.debug.internal.ui.preferences.RegistersViewPreferencePage"
-            id="org.eclipse.cdt.debug.ui.RegistersViewPreferencePage">
-      </page>
       <page
             name="%CDebugPreferencePage.name"
             category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
@@ -304,8 +298,8 @@
          </action>
          <action
                label="%ShowFullPathsAction.label"
-               style="toggle"
                icon="icons/full/clcl16/show_paths.gif"
+               style="toggle"
                helpContextId="show_full_paths_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                menubarPath="renderGroup"
@@ -319,8 +313,8 @@
          </action>
          <action
                label="%SwitchToDisassemblyAction.label"
-               style="toggle"
                icon="icons/full/clcl16/disassembly.gif"
+               style="toggle"
                helpContextId="switch_to_disassembly_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.SwitchToDisassemblyActionDelegate"
                menubarPath="renderGroup"
@@ -335,8 +329,8 @@
          </action>
          <action
                label="%ShowDebuggerConsoleAction.label"
-               style="toggle"
                icon="icons/full/clcl16/debugger_console.gif"
+               style="toggle"
                helpContextId="show_debugger_console_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.DebuggerConsoleActionDelegate"
                menubarPath="renderGroup"
@@ -474,8 +468,8 @@
             id="org.eclipse.cdt.debug.ui.breakpointview.popupMenu">
          <action
                label="%ShowFullPathsAction.label"
-               style="toggle"
                icon="icons/full/clcl16/show_paths.gif"
+               style="toggle"
                helpContextId="show_full_paths_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                menubarPath="renderGroup"
@@ -750,8 +744,8 @@
             id="org.eclipse.cdt.debug.ui.SharedLibrariesViewPopupActions">
          <action
                label="%ShowFullPathsAction.label"
-               style="toggle"
                icon="icons/full/clcl16/show_paths.gif"
+               style="toggle"
                helpContextId="show_full_paths_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                menubarPath="renderGroup"
@@ -771,8 +765,8 @@
                label="%LoadSymbolsAction.label"
                icon="icons/full/clcl16/load_symbols_co.gif"
                helpContextId="load_symbols_action_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.LoadSymbolsActionDelegate"
                tooltip="%LoadSymbolsAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.LoadSymbolsActionDelegate"
                menubarPath="sharedLibrariesGroup"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.LoadSymbolsActionDelegate">
@@ -791,8 +785,8 @@
                label="%SignalAction.label"
                icon="icons/full/clcl16/signal_co.gif"
                helpContextId="signal_action_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.SignalActionDelegate"
                tooltip="%SignalAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.SignalActionDelegate"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.SignalActionDelegate">
@@ -829,8 +823,8 @@
          <action
                label="%RestoreDefaultTypeAction.label"
                helpContextId="restore_default_type_action_context"
-               tooltip="%RestoreDefaultTypeAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.RestoreDefaultTypeActionDelegate"
+               tooltip="%RestoreDefaultTypeAction.tooltip"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.RestoreDefaultTypeActionDelegate">
@@ -845,8 +839,8 @@
                label="%CastToTypeAction.label"
                icon="icons/full/clcl16/casttotype_co.gif"
                helpContextId="cast_to_type_action_context"
-               tooltip="%CastToTypeAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.CastToTypeActionDelegate"
+               tooltip="%CastToTypeAction.tooltip"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.CastToTypeActionDelegate">
@@ -861,8 +855,8 @@
                label="%CastToArrayAction.label"
                icon="icons/full/clcl16/showasarray_co.gif"
                helpContextId="cast_to_array_action_context"
-               tooltip="%CastToArrayAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.CastToArrayActionDelegate"
+               tooltip="%CastToArrayAction.tooltip"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.CastToArrayActionDelegate">
@@ -881,8 +875,8 @@
                label="%ManageFunctionBreakpointAction.label"
                icon="icons/full/obj16/funbrkp_obj.gif"
                helpContextId="manage_function_breakpoint_action_context"
-               tooltip="%ManageFunctionBreakpointAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.ManageFunctionBreakpointActionDelegate"
+               tooltip="%ManageFunctionBreakpointAction.tooltip"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.ManageFunctionBreakpointActionDelegate">
@@ -901,8 +895,8 @@
                label="%DisableVariablesAction.label"
                icon="icons/full/clcl16/disabled_co.gif"
                helpContextId="disable_variables_action_context"
-               tooltip="%DisableVariablesAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.DisableVariablesActionDelegate"
+               tooltip="%DisableVariablesAction.tooltip"
                menubarPath="variableGroup"
                enablesFor="2+"
                id="org.eclipse.cdt.debug.internal.ui.actions.DisableVariablesActionDelegate">
@@ -914,8 +908,8 @@
                label="%EnableVariablesAction.label"
                icon="icons/full/clcl16/enabled_co.gif"
                helpContextId="enable_variables_action_context"
-               tooltip="%EnableVariablesAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.EnableVariablesActionDelegate"
+               tooltip="%EnableVariablesAction.tooltip"
                menubarPath="variableGroup"
                enablesFor="2+"
                id="org.eclipse.cdt.debug.internal.ui.actions.EnableVariablesActionDelegate">
@@ -938,8 +932,8 @@
                disabledIcon="icons/full/dlcl16/restart.gif"
                enablesFor="1"
                icon="icons/full/elcl16/restart.gif"
-               helpContextId="restart_action_context"
                label="%RestartAction.label"
+               helpContextId="restart_action_context"
                tooltip="%RestartAction.tooltip">
             <enablement>
                <pluginState
@@ -956,8 +950,8 @@
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                disabledIcon="icons/full/dlcl16/show_paths.gif"
                icon="icons/full/elcl16/show_parents.gif"
-               helpContextId="show_full_paths_action_context"
                label="%ShowFullPathsAction.label"
+               helpContextId="show_full_paths_action_context"
                tooltip="%ShowFullPathsAction.tooltip">
             <enablement>
                <pluginState
@@ -975,8 +969,8 @@
                disabledIcon="icons/full/dlcl16/disassembly.gif"
                enablesFor="1"
                icon="icons/full/elcl16/disassembly.gif"
-               helpContextId="switch_to_disassembly_action_context"
                label="%SwitchToDisassemblyAction.label"
+               helpContextId="switch_to_disassembly_action_context"
                tooltip="%SwitchToDisassemblyAction.tooltip">
             <enablement>
                <pluginState
@@ -994,8 +988,8 @@
                disabledIcon="icons/full/dlcl16/debugger_console.gif"
                enablesFor="1"
                icon="icons/full/elcl16/debugger_console.gif"
-               helpContextId="show_debugger_console_action_context"
                label="%ShowDebuggerConsoleAction.label"
+               helpContextId="show_debugger_console_action_context"
                tooltip="%ShowDebuggerConsoleAction.tooltip">
             <enablement>
                <pluginState
@@ -1016,8 +1010,8 @@
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                disabledIcon="icons/full/dlcl16/show_paths.gif"
                icon="icons/full/elcl16/show_parents.gif"
-               helpContextId="show_full_paths_action_context"
                label="%ShowFullPathsAction.label"
+               helpContextId="show_full_paths_action_context"
                tooltip="%ShowFullPathsAction.tooltip">
             <enablement>
                <pluginState
@@ -1038,8 +1032,8 @@
                disabledIcon="icons/full/dlcl16/watch_globals.gif"
                enablesFor="1"
                icon="icons/full/elcl16/watch_globals.gif"
-               helpContextId="add_globals_action_context"
                label="%AddGlobalsAction.label"
+               helpContextId="add_globals_action_context"
                tooltip="%AddGlobalsAction.tooltip">
             <enablement>
                <pluginState
@@ -1060,8 +1054,8 @@
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                disabledIcon="icons/full/dlcl16/show_paths.gif"
                icon="icons/full/elcl16/show_parents.gif"
-               helpContextId="show_full_paths_action_context"
                label="%ShowFullPathsAction.label"
+               helpContextId="show_full_paths_action_context"
                tooltip="%ShowFullPathsAction.tooltip">
             <enablement>
                <pluginState
@@ -1151,20 +1145,20 @@
    <extension
          point="org.eclipse.debug.core.statusHandlers">
       <statusHandler
-            plugin="org.eclipse.cdt.debug.core"
             code="10000"
+            plugin="org.eclipse.cdt.debug.core"
             class="org.eclipse.cdt.debug.internal.ui.QuestionStatusHandler"
             id="org.eclipse.cdt.debug.internal.ui.QuestionStatusHandler">
       </statusHandler>
       <statusHandler
-            plugin="org.eclipse.cdt.debug.core"
             code="10001"
+            plugin="org.eclipse.cdt.debug.core"
             class="org.eclipse.cdt.debug.internal.ui.InfoStatusHandler"
             id="org.eclipse.cdt.debug.internal.ui.InfoStatusHandler">
       </statusHandler>
       <statusHandler
-            plugin="org.eclipse.cdt.debug.core"
             code="10002"
+            plugin="org.eclipse.cdt.debug.core"
             class="org.eclipse.cdt.debug.internal.ui.ErrorStatusHandler"
             id="org.eclipse.cdt.debug.internal.ui.ErrorStatusHandler">
       </statusHandler>
@@ -1227,16 +1221,16 @@
          point="org.eclipse.ui.editors">
       <editor
             name="%DisassemblyEditor.name"
-            icon="icons/full/obj16/disassembly_obj.gif"
             extensions="dasm"
+            icon="icons/full/obj16/disassembly_obj.gif"
             class="org.eclipse.cdt.debug.internal.ui.editors.DisassemblyEditor"
             id="org.eclipse.cdt.debug.ui.DisassemblyEditor">
       </editor>
       <editor
             name="%CDebugEditor.name"
             icon="icons/full/obj16/filenotfound_obj.gif"
-            contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
             class="org.eclipse.cdt.debug.internal.ui.editors.CDebugEditor"
+            contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
             id="org.eclipse.cdt.debug.ui.editor.CDebugEditor">
       </editor>
    </extension>
@@ -1258,8 +1252,8 @@
       <context
             name="Debugging C/C++"
             description="Debugging C/C++ Programs"
-            parentId="org.eclipse.debug.ui.debugging"
-            id="org.eclipse.cdt.debug.ui.debugging">
+            id="org.eclipse.cdt.debug.ui.debugging"
+            parentId="org.eclipse.debug.ui.debugging">
       </context>
    </extension>
    <extension
@@ -1273,23 +1267,23 @@
          point="org.eclipse.debug.ui.contextViewBindings">
       <contextViewBinding
             viewId="org.eclipse.cdt.debug.ui.MemoryView"
-            contextId="org.eclipse.cdt.debug.ui.debugging"
-            autoClose="false">
+            autoClose="false"
+            contextId="org.eclipse.cdt.debug.ui.debugging">
       </contextViewBinding>
       <contextViewBinding
             viewId="org.eclipse.cdt.debug.ui.SharedLibrariesView"
-            contextId="org.eclipse.cdt.debug.ui.debugging"
-            autoClose="false">
+            autoClose="false"
+            contextId="org.eclipse.cdt.debug.ui.debugging">
       </contextViewBinding>
       <contextViewBinding
             viewId="org.eclipse.cdt.debug.ui.SignalsView"
-            contextId="org.eclipse.cdt.debug.ui.debugging"
-            autoClose="false">
+            autoClose="false"
+            contextId="org.eclipse.cdt.debug.ui.debugging">
       </contextViewBinding>
       <contextViewBinding
             viewId="org.eclipse.debug.ui.RegistersView"
-            contextId="org.eclipse.cdt.debug.ui.debugging"
-            autoClose="false">
+            autoClose="false"
+            contextId="org.eclipse.cdt.debug.ui.debugging">
       </contextViewBinding>
    </extension>
 
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/ICDebugPreferenceConstants.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/ICDebugPreferenceConstants.java
index 9ed966e4d58..f2b03763f80 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/ICDebugPreferenceConstants.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/ICDebugPreferenceConstants.java
@@ -33,11 +33,6 @@ public interface ICDebugPreferenceConstants
 	 */
 	public static final String PREF_SHOW_FULL_PATHS = ICDebugUIConstants.PLUGIN_ID + "cDebug.show_full_paths"; //$NON-NLS-1$
 
-	/**
-	 * The RGB for the color to be used to indicate changed registers
-	 */
-	public static final String CHANGED_REGISTER_RGB = "Changed.Register.RGB"; //$NON-NLS-1$
-	
 	/**
 	 * The default values for the memory view parameters. 
 	 */