diff --git a/defaults/src/org/netbeans/modules/defaults/BlueTheme-editor.xml b/defaults/src/org/netbeans/modules/defaults/BlueTheme-annotations.xml
copy from defaults/src/org/netbeans/modules/defaults/BlueTheme-editor.xml
copy to defaults/src/org/netbeans/modules/defaults/BlueTheme-annotations.xml
--- a/defaults/src/org/netbeans/modules/defaults/BlueTheme-editor.xml
+++ b/defaults/src/org/netbeans/modules/defaults/BlueTheme-annotations.xml
@@ -46,38 +46,5 @@
 <!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
 
 <fontscolors>
-    <fontcolor name="block-search" foreColor="white" bgColor="ff5d719c"/>
-    <fontcolor name="code-folding" foreColor="white" bgColor="253E5A"/>
-    <fontcolor name="code-folding-bar" foreColor="253E5A"/>
-    <fontcolor name="guarded" bgColor="darkGray"/>
-    <fontcolor name="readonly-files" bgColor="darkGray"/>
-    <fontcolor name="highlight-caret-row" bgColor="ff1b3450"/>
-    <fontcolor name="nbeditor-bracesMatching-match" bgColor="ff386f4c" foreColor="white">
-        <font style="bold" />
-    </fontcolor>
-    <fontcolor name="nbeditor-bracesMatching-mismatch" bgColor="ff6f3757" foreColor="white">
-        <font style="bold" />
-    </fontcolor>
-    <fontcolor name="nbeditor-bracesMatching-match-multichar" bgColor="ff386f4c" foreColor="white">
-        <font style="bold" />
-    </fontcolor>
-    <fontcolor name="nbeditor-bracesMatching-mismatch-multichar" bgColor="ff6f3757" foreColor="white">
-        <font style="bold" />
-    </fontcolor>
-    <fontcolor name="highlight-search" bgColor="38566F"/>
-    <fontcolor name="inc-search" bgColor="38566F"/>
-    <fontcolor name="line-number" foreColor="white" bgColor="121e31"/>
-    <fontcolor name="selection" bgColor="ff685d9c"/>
-    <fontcolor name="status-bar"/>
-    <fontcolor name="status-bar-bold" foreColor="red"/>
-    <fontcolor name="caret-color-insert-mode" foreColor="yellow" />
-    <fontcolor name="caret-color-overwrite-mode" foreColor="yellow" />
-    <fontcolor name="text-limit-line-color" foreColor="253E5A"/>
-    <fontcolor name="hyperlinks" foreColor="a4a4ff" underline="a4a4ff"/>
-    <fontcolor name="synchronized-text-blocks-ext" foreColor="ffcc0099"/>
-    <fontcolor name="synchronized-text-blocks-ext-slave" foreColor="ff996600"/>
-    <fontcolor name="indent-whitespace"/>
-    <fontcolor name="trailing-whitespace"/>
-    <fontcolor name="nbeditor-bracesMatching-sidebar"/>
-    <fontcolor name="indent-guide-lines" foreColor="253e5a"/>
+    <fontcolor bgColor="0000ff" name="Breakpoint"/>
  </fontscolors>
diff --git a/defaults/src/org/netbeans/modules/defaults/mf-layer.xml b/defaults/src/org/netbeans/modules/defaults/mf-layer.xml
--- a/defaults/src/org/netbeans/modules/defaults/mf-layer.xml
+++ b/defaults/src/org/netbeans/modules/defaults/mf-layer.xml
@@ -1174,6 +1174,9 @@
                             <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.defaults.Bundle"/>
                             <attr name="nbeditor-settings-ColoringType" stringvalue="highlight"/>
                         </file>
+                        <file name="org-netbeans-modules-editor-annotations-colorings.xml" url="BlueTheme-annotations.xml">
+                             <attr name="nbeditor-settings-ColoringType" stringvalue="annotation"/>
+                         </file>
                     </folder>
                 </folder>