diff --git a/editor.settings.storage/apichanges.xml b/editor.settings.storage/apichanges.xml
--- a/editor.settings.storage/apichanges.xml
+++ b/editor.settings.storage/apichanges.xml
@@ -108,6 +108,26 @@
 
     <changes>
         <change>
+            <summary>Implement profiles for annotations coloring</summary>
+            <version major="1" minor="43"/>
+            <date day="17" month="9" year="2013"/>
+            <author login="mkristofic"/>
+            <compatibility addition="yes" binary="compatible" source="compatible" semantic="compatible"  deprecation="no" deletion="no" modification="no" />
+            <description>
+                <p>
+                    <code>EditorSettings</code> is extended to handle saving and loading annotations colorings for any profile.
+                </p>
+                <pre>
+                    Class org.netbeans.modules.editor.settings.storage.api.EditorSettings
+  [sigtest]   "E5.2 - Adding abstract methods" : method public abstract void org.netbeans.modules.editor.settings.storage.api.EditorSettings.setAnnotations(java.lang.String,java.util.Map)
+  [sigtest]   "E5.2 - Adding abstract methods" : method public abstract java.util.Map org.netbeans.modules.editor.settings.storage.api.EditorSettings.getAnnotations(java.lang.String)
+  [sigtest]   "E5.2 - Adding abstract methods" : method public abstract java.util.Map org.netbeans.modules.editor.settings.storage.api.EditorSettings.getAnnotationDefaults(java.lang.String)
+  [sigtest] 
+                </pre>
+            </description>
+            <issue number="231735"/>
+        </change>
+        <change>
             <summary>Detect preferences override and support inheritance</summary>
             <version major="1" minor="38"/>
             <date day="21" month="2" year="2013"/>
diff --git a/editor.settings.storage/manifest.mf b/editor.settings.storage/manifest.mf
--- a/editor.settings.storage/manifest.mf
+++ b/editor.settings.storage/manifest.mf
@@ -2,6 +2,6 @@
 OpenIDE-Module: org.netbeans.modules.editor.settings.storage/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/settings/storage/Bundle.properties
 OpenIDE-Module-Provides: org.netbeans.api.editor.settings.implementation
-OpenIDE-Module-Specification-Version: 1.42
+OpenIDE-Module-Specification-Version: 1.43
 OpenIDE-Module-Layer: org/netbeans/modules/editor/settings/storage/layer.xml
 AutoUpdate-Show-In-Client: false
diff --git a/editor.settings.storage/src/org/netbeans/modules/editor/settings/storage/EditorSettingsImpl.java b/editor.settings.storage/src/org/netbeans/modules/editor/settings/storage/EditorSettingsImpl.java
--- a/editor.settings.storage/src/org/netbeans/modules/editor/settings/storage/EditorSettingsImpl.java
+++ b/editor.settings.storage/src/org/netbeans/modules/editor/settings/storage/EditorSettingsImpl.java
@@ -82,6 +82,9 @@
 
     /** The name of the property change event for 'Highlighting' font and colors. */
     public static final String PROP_HIGHLIGHT_COLORINGS = "editorFontColors"; //NOI18N
+    
+    /** The name of the property change event for 'Annotation' font and colors. */
+    public static final String PROP_ANNOTATION_COLORINGS = "editorAnnotationFontColors"; //NOI18N
 
     /** The name of the property change event for 'Token' font and colors. */
     public static final String PROP_TOKEN_COLORINGS = "fontColors"; //NOI18N
@@ -281,7 +284,7 @@
     }
     
     private final Map<String, Map<String, AttributeSet>> highlightings = new HashMap<String, Map<String, AttributeSet>>();
-    private final StorageImpl<String, AttributeSet> highlightingsStorage = new StorageImpl<String, AttributeSet>(new ColoringStorage(false), null);
+    private final StorageImpl<String, AttributeSet> highlightingsStorage = new StorageImpl<String, AttributeSet>(new ColoringStorage(ColoringStorage.FAV_HIGHLIGHT), null);
     
     /**
      * Returns highlighting properties for given profile or null, if the 
@@ -395,6 +398,105 @@
         pcs.firePropertyChange(PROP_HIGHLIGHT_COLORINGS, MimePath.EMPTY, profile);
     }  
     
+    private final Map<String, Map<String, AttributeSet>> annotations = new HashMap<>();
+    private final StorageImpl<String, AttributeSet> annotationsStorage = new StorageImpl<>(new ColoringStorage(ColoringStorage.FAV_ANNOTATION), null);
+
+    @Override
+    public Map<String, AttributeSet> getAnnotations(String profile) {
+        boolean specialProfile = profile.startsWith("test"); //NOI18N
+        profile = FontColorSettingsImpl.get(MimePath.EMPTY).getInternalFontColorProfile(profile);
+
+        if (!annotations.containsKey(profile)) {
+            Map<String, AttributeSet> profileColorings = null;
+
+            try {
+                profileColorings = annotationsStorage.load(
+                        MimePath.EMPTY,
+                        specialProfile ? DEFAULT_PROFILE : profile,
+                        false
+                );
+            } catch (IOException ioe) {
+                LOG.log(Level.WARNING, null, ioe);
+            }
+
+            Map<String, AttributeSet> defaultProfileColorings = null;
+            if (!specialProfile && !DEFAULT_PROFILE.equals(profile)) {
+                try {
+                    defaultProfileColorings = annotationsStorage.load(
+                            MimePath.EMPTY,
+                            DEFAULT_PROFILE,
+                            false
+                    );
+                } catch (IOException ioe) {
+                    LOG.log(Level.WARNING, null, ioe);
+                }
+            }
+
+            // Add colorings from the default profile that do not exist in
+            // the profileColorings. They are normally the same, but when
+            // imported from previous version some colorings can be missing.
+            // See #119709
+            Map<String, AttributeSet> m = new HashMap<>();
+            if (defaultProfileColorings != null) {
+                m.putAll(defaultProfileColorings);
+            }
+            if (profileColorings != null) {
+                m.putAll(profileColorings);
+            }
+
+            //todo prepare annotations.
+            profileColorings = Collections.unmodifiableMap(m);
+
+            annotations.put(profile, profileColorings);
+        }
+
+        Map<String, AttributeSet> h = annotations.get(profile);
+        return h == null ? Collections.<String, AttributeSet>emptyMap() : h;
+    }
+
+    @Override
+    public Map<String, AttributeSet> getAnnotationDefaults(String profile) {
+        profile = FontColorSettingsImpl.get(MimePath.EMPTY).getInternalFontColorProfile(profile);
+        try {
+            return annotationsStorage.load(MimePath.EMPTY, profile, true);
+        } catch (IOException ioe) {
+            LOG.log(Level.WARNING, null, ioe);
+            return Collections.<String, AttributeSet>emptyMap();
+        }
+    }
+
+    @Override
+    public void setAnnotations(
+            String profile,
+            Map<String, AttributeSet> fontColors
+    ) {
+        boolean specialProfile = profile.startsWith("test"); //NOI18N
+        profile = FontColorSettingsImpl.get(MimePath.EMPTY).getInternalFontColorProfile(profile);
+
+        if (fontColors == null) {
+            try {
+                annotationsStorage.delete(MimePath.EMPTY, profile, false);
+            } catch (IOException ioe) {
+                LOG.log(Level.WARNING, null, ioe);
+            }
+            annotations.remove(profile);
+        } else {
+            Map<String, AttributeSet> m = Utils.immutize(fontColors);
+
+            // 3) save new values to disk
+            if (!specialProfile) {
+                try {
+                    annotationsStorage.save(MimePath.EMPTY, profile, false, m);
+                } catch (IOException ioe) {
+                    LOG.log(Level.WARNING, null, ioe);
+                }
+            }
+
+            annotations.put(profile, m);
+        }
+
+        pcs.firePropertyChange(PROP_ANNOTATION_COLORINGS, MimePath.EMPTY, profile);
+    }
     
     // ------------------------------------------------------
     // Keybindings
diff --git a/editor.settings.storage/src/org/netbeans/modules/editor/settings/storage/api/EditorSettings.java b/editor.settings.storage/src/org/netbeans/modules/editor/settings/storage/api/EditorSettings.java
--- a/editor.settings.storage/src/org/netbeans/modules/editor/settings/storage/api/EditorSettings.java
+++ b/editor.settings.storage/src/org/netbeans/modules/editor/settings/storage/api/EditorSettings.java
@@ -227,6 +227,39 @@
     );
     
     /**
+     * Returns annotations properties for given profile or null, if the 
+     * profile is not known.
+     *
+     * @param profile a profile name
+     * @return annotations properties for given profile or null
+     */
+    public abstract Map<String, AttributeSet> getAnnotations (
+	String profile
+    );
+    
+    /**
+     * Returns defaults for annotation properties for given profile,
+     * or null if the profile is not known.
+     *
+     * @param profile a profile name
+     * @return annotation properties for given profile or null
+     */
+    public abstract Map<String, AttributeSet> getAnnotationDefaults (
+	String profile
+    );
+    
+    /**
+     * Sets annotation properties for given profile.
+     *
+     * @param profile a profile name
+     * @param annotations a annotation properties to be used
+     */
+    public abstract void setAnnotations (
+	String profile,
+	Map<String, AttributeSet> annotations
+    );
+    
+    /**
      * Returns FontColorSettings for given mimetypes.
      *
      * @param mimeTypes The mime path to get the settings for.
diff --git a/editor.settings.storage/src/org/netbeans/modules/editor/settings/storage/fontscolors/ColoringStorage.java b/editor.settings.storage/src/org/netbeans/modules/editor/settings/storage/fontscolors/ColoringStorage.java
--- a/editor.settings.storage/src/org/netbeans/modules/editor/settings/storage/fontscolors/ColoringStorage.java
+++ b/editor.settings.storage/src/org/netbeans/modules/editor/settings/storage/fontscolors/ColoringStorage.java
@@ -87,8 +87,8 @@
     public static final String ID = "FontsColors"; //NOI18N
     /* test */ static final String MIME_TYPE = "text/x-nbeditor-fontcolorsettings"; //NOI18N
 
-    public ColoringStorage(boolean tokenColoringStorage) {
-        this.tokenColoringStorage = tokenColoringStorage;
+    public ColoringStorage(String type) {
+        this.type = type;
     }
     
     // ---------------------------------------------------------
@@ -96,7 +96,7 @@
     // ---------------------------------------------------------
 
     public ColoringStorage() {
-        this(true);
+        this(FAV_TOKEN);
     }
     
     public String getId() {
@@ -168,8 +168,7 @@
             boolean legacyFile = ((Boolean) info[4]).booleanValue();
 
             // Skip files with wrong type of colorings
-            boolean isTokenColoringFile = isTokenColoringFile(settingFile);
-            if (isTokenColoringFile != tokenColoringStorage) {
+            if (!type.equals(getColoringFileType(settingFile))) {
                 continue;
             }
             
@@ -180,11 +179,15 @@
             
             // Process loaded colorings
             for(SimpleAttributeSet as : sets.values()) {
+                if (FAV_ANNOTATION.equals(type)) {
+                    fontsColorsMap.put((String) as.getAttribute(StyleConstants.NameAttribute), as);
+                    continue;
+                }
                 String name = (String) as.getAttribute(StyleConstants.NameAttribute);
                 String translatedName = null;
                 SimpleAttributeSet previous = fontsColorsMap.get(name);
 
-                if (previous == null && !modulesFile && tokenColoringStorage) {
+                if (previous == null && !modulesFile && FAV_TOKEN.equals(type)) {
                     // User files normally don't define extra colorings unless
                     // for example loading a settings file from an older version
                     // of Netbeans (or in a completely new profile!!). In this case
@@ -269,14 +272,14 @@
         final String settingFileName = SettingsType.getLocator(this).getWritableFileName(
                 mimePath.getPath(), 
                 profile, 
-                tokenColoringStorage ? "-tokenColorings" : "-highlights", //NOI18N
+                FAV_TOKEN.equals(type) ? "-tokenColorings" : FAV_HIGHLIGHT.equals(type) ? "-highlights" : "-annotations", //NOI18N
                 defaults);
 
         FileUtil.runAtomicAction(new FileSystem.AtomicAction() {
             public void run() throws IOException {
                 FileObject baseFolder = FileUtil.getConfigFile("Editors"); //NOI18N
                 FileObject f = FileUtil.createData(baseFolder, settingFileName);
-                f.setAttribute(FA_TYPE, tokenColoringStorage ? FAV_TOKEN : FAV_HIGHLIGHT);
+                f.setAttribute(FA_TYPE, type);
                 
                 Map<String, AttributeSet> added = new HashMap<String, AttributeSet>();
                 Map<String, AttributeSet> removed = new HashMap<String, AttributeSet>();
@@ -311,8 +314,7 @@
                         FileObject settingFile = (FileObject) info[1];
 
                         // Skip files with wrong type of colorings
-                        boolean isTokenColoringFile = isTokenColoringFile(settingFile);
-                        if (isTokenColoringFile != tokenColoringStorage) {
+                        if (!type.equals(getColoringFileType(settingFile))) {
                             continue;
                         }
 
@@ -350,12 +352,13 @@
     private static final String SYSTEM_ID = "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd"; //NOI18N
 
     private static final String FA_TYPE = "nbeditor-settings-ColoringType"; //NOI18N
-    private static final String FAV_TOKEN = "token"; //NOI18N
-    private static final String FAV_HIGHLIGHT = "highlight"; //NOI18N
+    public static final String FAV_TOKEN = "token"; //NOI18N
+    public static final String FAV_HIGHLIGHT = "highlight"; //NOI18N
+    public static final String FAV_ANNOTATION = "annotation"; //NOI18N
     
     private static final Object ATTR_MODULE_SUPPLIED = new Object();
     
-    private final boolean tokenColoringStorage;
+    private final String type;
     
     private static String findDisplayName(String name, FileObject settingFile, List<Object []> filesForLocalization) {
         // Try the settingFile first
@@ -584,13 +587,17 @@
             return doc;
         }
     } // End of ColoringsWriter class
-
-    private static boolean isTokenColoringFile(FileObject f) {
+    
+    private static String getColoringFileType(FileObject f) {
         Object typeValue = f.getAttribute(FA_TYPE);
         if (typeValue instanceof String) {
-            return typeValue.equals(FAV_TOKEN);
+            return (String)typeValue;
         } else {
-            return !f.getNameExt().equals(HIGHLIGHTING_FILE_NAME);
+            if (f.getNameExt().equals(HIGHLIGHTING_FILE_NAME)) {
+                return FAV_HIGHLIGHT;
+            } else {
+                return FAV_TOKEN;
+            }
         }
     }
     
diff --git a/editor.settings.storage/test/unit/src/org/netbeans/modules/editor/settings/storage/fontscolors/ColoringStorageTest.java b/editor.settings.storage/test/unit/src/org/netbeans/modules/editor/settings/storage/fontscolors/ColoringStorageTest.java
--- a/editor.settings.storage/test/unit/src/org/netbeans/modules/editor/settings/storage/fontscolors/ColoringStorageTest.java
+++ b/editor.settings.storage/test/unit/src/org/netbeans/modules/editor/settings/storage/fontscolors/ColoringStorageTest.java
@@ -118,7 +118,7 @@
     }
     
     public void testAllLanguagesHighlights() {
-        ColoringStorage cs = new ColoringStorage(false);
+        ColoringStorage cs = new ColoringStorage(ColoringStorage.FAV_HIGHLIGHT);
         Map<String, AttributeSet> colorings = cs.load(MimePath.EMPTY, "MyProfileXyz", true); //NOI18N
         assertNotNull("Colorings map should not be null", colorings);
         assertEquals("Wrong number of colorings", 1, colorings.size());
@@ -129,7 +129,7 @@
     }
     
     public void testAllLanguagesHighlights2() {
-        ColoringStorage cs = new ColoringStorage(false);
+        ColoringStorage cs = new ColoringStorage(ColoringStorage.FAV_HIGHLIGHT);
         Map<String, AttributeSet> colorings = cs.load(MimePath.EMPTY, "MyProfileXyz", false); //NOI18N
         assertNotNull("Colorings map should not be null", colorings);
         assertEquals("Wrong number of colorings", 1, colorings.size());
@@ -218,7 +218,7 @@
     }
     
     public void testLegacyFilesWithNoDTD_Issue113137() {
-        ColoringStorage cs = new ColoringStorage(true);
+        ColoringStorage cs = new ColoringStorage(ColoringStorage.FAV_TOKEN);
         Map<String, AttributeSet> colorings = cs.load(MimePath.parse("text/x-legacy"), "NetBeans", false); //NOI18N
         assertNotNull("Colorings map should not be null", colorings);
         assertEquals("Wrong number of colorings", 2, colorings.size());
diff --git a/editor/nbproject/project.properties b/editor/nbproject/project.properties
--- a/editor/nbproject/project.properties
+++ b/editor/nbproject/project.properties
@@ -42,7 +42,7 @@
 
 javac.compilerargs=-Xlint:unchecked
 javac.source=1.7
-spec.version.base=1.76.0
+spec.version.base=1.77.0
 is.autoload=true
 
 javadoc.arch=${basedir}/arch.xml
diff --git a/editor/src/org/netbeans/modules/editor/resources/NetBeans-editor.xml b/editor/src/org/netbeans/modules/editor/resources/NetBeans-annotations.xml
copy from editor/src/org/netbeans/modules/editor/resources/NetBeans-editor.xml
copy to editor/src/org/netbeans/modules/editor/resources/NetBeans-annotations.xml
--- a/editor/src/org/netbeans/modules/editor/resources/NetBeans-editor.xml
+++ b/editor/src/org/netbeans/modules/editor/resources/NetBeans-annotations.xml
@@ -46,25 +46,101 @@
 <!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="black" bgColor="ffe0e8f1"/>
-    <fontcolor name="code-folding" foreColor="ff666666"/>
-    <fontcolor name="code-folding-bar" foreColor="ff666666"/>
-    <fontcolor name="guarded" bgColor="ffDFDFDF"/>
-    <fontcolor name="readonly-files" bgColor="ffDFDFDF"/>
-    <fontcolor name="highlight-caret-row" bgColor="ffE9EFF8"/>
-    <fontcolor name="highlight-search" foreColor="black" bgColor="ffFFB442"/>
-    <fontcolor name="inc-search" foreColor="black" bgColor="ffFFB442"/> <!-- ffff9900 -->
-    <fontcolor name="line-number" foreColor="black" bgColor="ffe9e8e2"/>
-    <fontcolor name="selection" bgColor="ffB0C5E3"/>
-    <fontcolor name="status-bar"/>
-    <fontcolor name="status-bar-bold" foreColor="red"/>
-    <fontcolor name="caret-color-insert-mode" foreColor="black"/>
-    <fontcolor name="caret-color-overwrite-mode" foreColor="black"/>
-    <fontcolor name="text-limit-line-color" foreColor="ffffa8a8"/>
-    <fontcolor name="hyperlinks" foreColor="blue" underline="blue"/>
-<!--    <fontcolor name="synchronized-text-blocks" bgColor="ff8AC0EC"/> -->
-    <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 bgColor="ffdcdcd8" name="OtherThreads_DBP"/>
+    <fontcolor bgColor="fffc9d9f" name="Breakpoint"/>
+    <fontcolor name="FieldBreakpoint_stroke"/>
+    <fontcolor bgColor="ffdcdcd8" name="DisabledBreakpoint"/>
+    <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_err_fixable"/>
+    <fontcolor bgColor="ffbde6aa" name="CurrentPCLinePart"/>
+    <fontcolor name="org-netbeans-modules-editor-annotations-implements-has-implementations-combined"/>
+    <fontcolor bgColor="ffe9ffe6" name="CurrentExpressionLine_DBP"/>
+    <fontcolor name="org-netbeans-modules-git-Annotation"/>
+    <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_err"/>
+    <fontcolor bgColor="ffdcdcd8" name="debugger-multi_DBPCBP"/>
+    <fontcolor bgColor="ffdcdcd8" name="Breakpoint_broken"/>
+    <fontcolor name="DisabledMethodBreakpoint"/>
+    <fontcolor bgColor="ffbde6aa" name="debugger-PC_mixedBP"/>
+    <fontcolor bgColor="ffbde6aa" name="OtherThreads_PC_BP"/>
+    <fontcolor bgColor="ffbde6aa" name="CurrentPC2"/>
+    <fontcolor bgColor="ffbde6aa" name="OtherThreads_BP_broken"/>
+    <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_warn"/>
+    <fontcolor name="ClassBreakpoint"/>
+    <fontcolor bgColor="ffbde6aa" name="debugger-PC_BP_stroke"/>
+    <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_todo"/>
+    <fontcolor bgColor="ffdcdcd8" name="DisabledBreakpoint_stroke"/>
+    <fontcolor bgColor="ffb4e4fc" name="loadgenProfilingPoint"/>
+    <fontcolor bgColor="fffc9d9f" name="debugger-mixed_BP"/>
+    <fontcolor name="DisabledMethodBreakpoint_stroke"/>
+    <fontcolor bgColor="ffbde6aa" name="debugger-PC_DCBP"/>
+    <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_warn_fixable"/>
+    <fontcolor bgColor="ffe7e1ef" name="CallSite"/>
+    <fontcolor bgColor="ffbde6aa" name="OtherThread_PC"/>
+    <fontcolor bgColor="ffbde6aa" name="CurrentPC"/>
+    <fontcolor bgColor="ffbde6aa" name="debugger-PC_multi_BPCBP"/>
+    <fontcolor bgColor="ffbde6aa" name="debugger-PC_CBP"/>
+    <fontcolor name="DisabledFieldBreakpoint_stroke"/>
+    <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_verifier"/>
+    <fontcolor bgColor="ffbde6aa" name="debugger-PC_DBP_stroke"/>
+    <fontcolor bgColor="ffbde6aa" name="debugger-PC_multi_DBPCBP"/>
+    <fontcolor name="org-netbeans-modules-editor-annotations-override-is-overridden-combined"/>
+    <fontcolor bgColor="ffbde6aa" name="debugger-PC_multi_BPCBP_broken"/>
+    <fontcolor bgColor="ffdcdcd8" name="CondBreakpoint_broken"/>
+    <fontcolor bgColor="ffb4e4fc" name="resetResultsProfilingPoint"/>
+    <fontcolor bgColor="ffdcdcd8" name="Breakpoint_stroke"/>
+    <fontcolor bgColor="ffe9ffe6" name="CurrentExpressionLine_BP"/>
+    <fontcolor bgColor="ffdcdcd8" name="debugger-mixed_BP_broken"/>
+    <fontcolor bgColor="ffdcdcd8" name="CondBreakpoint_stroke"/>
+    <fontcolor name="DisabledClassBreakpoint_stroke"/>
+    <fontcolor bgColor="fffc9d9f" name="OtherThreads_BP"/>
+    <fontcolor name="org-netbeans-modules-subversion-Annotation"/>
+    <fontcolor name="OtherThread"/>
+    <fontcolor bgColor="ffe9ffe6" name="CurrentExpressionLine_DCBP"/>
+    <fontcolor name="editor-bookmark"/>
+    <fontcolor bgColor="ffbde6aa" name="debugger-PC_BP_broken"/>
+    <fontcolor bgColor="ffdcdcd8" name="DisabledCondBreakpoint"/>
+    <fontcolor bgColor="ffb4e4fc" name="stopwatchProfilingPoint"/>
+    <fontcolor name="ClassBreakpoint_stroke"/>
+    <fontcolor bgColor="ffe9ffe6" name="CurrentExpressionLine_CBP"/>
+    <fontcolor bgColor="ffbde6aa" name="debugger-PC_mixedBP_broken"/>
+    <fontcolor name="DisabledFieldBreakpoint"/>
+    <fontcolor bgColor="ffdcdcd8" name="loadgenProfilingPointD"/>
+    <fontcolor bgColor="ffdcdcd8" name="debugger-multi_BPCBP_broken"/>
+    <fontcolor bgColor="fffc9d9f" name="debugger-multi_BPCBP"/>
+    <fontcolor bgColor="ffbde6aa" name="debugger-PC_BP"/>
+    <fontcolor bgColor="ffdcdcd8" name="DisabledCondBreakpoint_stroke"/>
+    <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_hint_fixable"/>
+    <fontcolor bgColor="ffdcdcd8" name="OtherThread_DBP"/>
+    <fontcolor name="FieldBreakpoint"/>
+    <fontcolor name="org-netbeans-modules-editor-annotations-implements-is-overridden-combined"/>
+    <fontcolor bgColor="ffb4e4fc" name="takeSnapshotProfilingPoint"/>
+    <fontcolor bgColor="ffbde6aa" name="debugger-PC_DCBP_stroke"/>
+    <fontcolor name="DisabledClassBreakpoint"/>
+    <fontcolor bgColor="ffbde6aa" name="OtherThread_BP_broken"/>
+    <fontcolor name="org-netbeans-modules-editor-annotations-is_overridden"/>
+    <fontcolor name="org-netbeans-modules-editor-annotations-overrides"/>
+    <fontcolor bgColor="ffe9ffe6" name="CurrentExpressionLine"/>
+    <fontcolor bgColor="ffdcdcd8" name="CurrentPC2_DBP"/>
+    <fontcolor bgColor="ffdcdcd8" name="resetResultsProfilingPointD"/>
+    <fontcolor name="MethodBreakpoint_stroke"/>
+    <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_verifier_fixable"/>
+    <fontcolor bgColor="ffbde6aa" name="debugger-PC_CBP_stroke"/>
+    <fontcolor name="org-netbeans-modules-mercurial-Annotation"/>
+    <fontcolor bgColor="ffbde6aa" name="CurrentPC2LinePart"/>
+    <fontcolor bgColor="ffdcdcd8" name="takeSnapshotProfilingPointD"/>
+    <fontcolor bgColor="fffc9d9f" name="OtherThread_BP"/>
+    <fontcolor name="org-netbeans-modules-versioning-annotate-Annotation"/>
+    <fontcolor bgColor="ffbde6aa" name="debugger-PC_CBP_broken"/>
+    <fontcolor bgColor="ffdcdcd8" name="stopwatchProfilingPointD"/>
+    <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_hint"/>
+    <fontcolor name="MethodBreakpoint"/>
+    <fontcolor bgColor="ffbde6aa" name="debugger-PC_DBP"/>
+    <fontcolor bgColor="fffc9d9f" name="CondBreakpoint"/>
+    <fontcolor bgColor="fffc9d9f" name="CurrentPC2_BP"/>
+    <fontcolor name="org-netbeans-modules-editor-annotations-has_implementations"/>
+    <fontcolor bgColor="ffbde6aa" name="OtherThread_PC_BP"/>
+    <fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_todo_fixable"/>
+    <fontcolor bgColor="ffffa0a0" name="org-netbeans-modules-xml-error"/>
+    <fontcolor name="OtherThreads"/>
+    <fontcolor name="org-netbeans-modules-editor-annotations-implements"/>
+    <fontcolor bgColor="ffd1ffbc" name="CurrentExpression"/>
 </fontscolors>
diff --git a/editor/src/org/netbeans/modules/editor/resources/layer.xml b/editor/src/org/netbeans/modules/editor/resources/layer.xml
--- a/editor/src/org/netbeans/modules/editor/resources/layer.xml
+++ b/editor/src/org/netbeans/modules/editor/resources/layer.xml
@@ -303,6 +303,9 @@
                         <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.editor.Bundle"/>
                         <attr name="nbeditor-settings-ColoringType" stringvalue="highlight"/>
                     </file>
+                    <file name="org-netbeans-modules-editor-annotations-colorings.xml" url="NetBeans-annotations.xml">
+                        <attr name="nbeditor-settings-ColoringType" stringvalue="annotation"/>
+                    </file>
                     <file name="org-netbeans-modules-editor-url-coloring.xml" url="urlFontsColors.xml">
                         <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.editor.url.Bundle"/>
                     </file>
diff --git a/options.editor/manifest.mf b/options.editor/manifest.mf
--- a/options.editor/manifest.mf
+++ b/options.editor/manifest.mf
@@ -2,6 +2,6 @@
 OpenIDE-Module: org.netbeans.modules.options.editor/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/options/editor/Bundle.properties
 OpenIDE-Module-Layer: org/netbeans/modules/options/editor/mf-layer.xml
-OpenIDE-Module-Specification-Version: 1.46
+OpenIDE-Module-Specification-Version: 1.47
 AutoUpdate-Show-In-Client: false
 
diff --git a/options.editor/nbproject/project.xml b/options.editor/nbproject/project.xml
--- a/options.editor/nbproject/project.xml
+++ b/options.editor/nbproject/project.xml
@@ -109,7 +109,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.12</specification-version>
+                        <specification-version>1.42</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/options.editor/src/org/netbeans/modules/options/colors/AnnotationsPanel.java b/options.editor/src/org/netbeans/modules/options/colors/AnnotationsPanel.java
--- a/options.editor/src/org/netbeans/modules/options/colors/AnnotationsPanel.java
+++ b/options.editor/src/org/netbeans/modules/options/colors/AnnotationsPanel.java
@@ -89,7 +89,7 @@
     private ColorModel          colorModel;
     private boolean		listen = false;
     private String              currentScheme;
-    private Map<String, Vector<AttributeSet>> schemes = new HashMap<String, Vector<AttributeSet>>();
+    private Map<String, List<AttributeSet>> schemes = new HashMap<String, List<AttributeSet>>();
     private Set<String> toBeSaved = new HashSet<String>();
     private boolean             changed = false;
     
@@ -263,7 +263,7 @@
         this.colorModel = colorModel;
         listen = false;
         currentScheme = colorModel.getCurrentProfile ();
-        lCategories.setListData (getAnnotations (currentScheme));
+        lCategories.setListData (getAnnotations (currentScheme).toArray(new AttributeSet[]{}));
         if (lCategories.getModel ().getSize () > 0)
             lCategories.setSelectedIndex (0);
         refreshUI ();
@@ -273,7 +273,7 @@
     
     public void cancel () {
         toBeSaved = new HashSet<String>();
-        schemes = new HashMap<String, Vector<AttributeSet>>();
+        schemes = new HashMap<String, List<AttributeSet>>();
         changed = false;
     }
     
@@ -283,7 +283,7 @@
             colorModel.setAnnotations(scheme, getAnnotations(scheme));
         }
         toBeSaved = new HashSet<String>();
-        schemes = new HashMap<String, Vector<AttributeSet>>();
+        schemes = new HashMap<String, List<AttributeSet>>();
     }
     
     public boolean isChanged () {
@@ -293,7 +293,7 @@
     public void setCurrentProfile (String currentScheme) {
         String oldScheme = this.currentScheme;
         this.currentScheme = currentScheme;
-        Vector<AttributeSet> v = getAnnotations(currentScheme);
+        List<AttributeSet> v = getAnnotations(currentScheme);
         if (v == null) {
             // clone scheme
             v = getAnnotations (oldScheme);
@@ -301,13 +301,23 @@
             toBeSaved.add (currentScheme);
             v = getAnnotations (currentScheme);
         }
-        lCategories.setListData (v);
+        lCategories.setListData (v.toArray(new AttributeSet[]{}));
         if (lCategories.getModel ().getSize () > 0)
             lCategories.setSelectedIndex (0);
         refreshUI ();
     }
     
     public void deleteProfile (String scheme) {
+        if (colorModel.isCustomProfile (scheme))
+            schemes.remove (scheme);
+        else {
+            schemes.put (scheme, getDefaults (scheme));
+            lCategories.setListData (getAnnotations(scheme).toArray(new AttributeSet[]{}));
+            lCategories.repaint();
+            lCategories.setSelectedIndex (0);   
+            refreshUI ();
+        }
+        toBeSaved.add (scheme);
     }
 
     public JComponent getComponent() {
@@ -334,8 +344,9 @@
     }
 
     private void updateData () {
-        Vector<AttributeSet> annotations = getAnnotations(currentScheme);
-        SimpleAttributeSet c = (SimpleAttributeSet) annotations.get(lCategories.getSelectedIndex());
+        List<AttributeSet> annotations = getAnnotations(currentScheme);
+        int index = lCategories.getSelectedIndex();
+        SimpleAttributeSet c = new SimpleAttributeSet(annotations.get(index));
         
         Color color = ColorComboBoxSupport.getSelectedColor( (ColorComboBox)cbBackground );
         if (color != null) {
@@ -360,6 +371,8 @@
             c.removeAttribute(EditorStyleConstants.WaveUnderlineColor);
         }
         
+        annotations.set(index, c);
+        
         toBeSaved.add(currentScheme);
         changed = true;
     }
@@ -396,7 +409,7 @@
         }
 
         // set values
-        Vector<AttributeSet> annotations = getAnnotations (currentScheme);
+        List<AttributeSet> annotations = getAnnotations (currentScheme);
         AttributeSet c = annotations.get (index);
         ColorComboBoxSupport.setSelectedColor( (ColorComboBox)cbForeground, (Color) c.getAttribute (StyleConstants.Foreground));
         ColorComboBoxSupport.setSelectedColor( (ColorComboBox)cbBackground, (Color) c.getAttribute (StyleConstants.Background));
@@ -426,14 +439,27 @@
         return null;
     }
     
-    private Vector<AttributeSet> getAnnotations(String scheme) {
+    private List<AttributeSet> getAnnotations(String scheme) {
         if (!schemes.containsKey(scheme)) {
             Collection<AttributeSet> c = colorModel.getAnnotations(currentScheme);
             if (c == null) return null;
             List<AttributeSet> l = new ArrayList<AttributeSet>(c);
             Collections.sort(l, new CategoryComparator());
-            schemes.put(scheme, new Vector<AttributeSet>(l));
+            schemes.put(scheme, new ArrayList<AttributeSet>(l));
         }
         return schemes.get(scheme);
     }
+    /** cache Map (String (profile name) > List (AttributeSet)). */
+    private Map<String, List<AttributeSet>> profileToDefaults = new HashMap<String, List<AttributeSet>>();
+    
+    private List<AttributeSet> getDefaults(String profile) {
+        if (!profileToDefaults.containsKey(profile)) {
+            Collection<AttributeSet> c = colorModel.getAnnotationsDefaults(profile);
+            List<AttributeSet> l = new ArrayList<AttributeSet>(c);
+            Collections.sort(l, new CategoryComparator());
+            profileToDefaults.put(profile, l);
+        }
+        List<AttributeSet> defaultprofile = profileToDefaults.get(profile);
+        return new ArrayList<AttributeSet>(defaultprofile);
+    }
 }
diff --git a/options.editor/src/org/netbeans/modules/options/colors/ColorModel.java b/options.editor/src/org/netbeans/modules/options/colors/ColorModel.java
--- a/options.editor/src/org/netbeans/modules/options/colors/ColorModel.java
+++ b/options.editor/src/org/netbeans/modules/options/colors/ColorModel.java
@@ -128,6 +128,18 @@
     // annotations .............................................................
     
     public Collection<AttributeSet> getAnnotations(String profile) {
+        Map<String, AttributeSet> annos = EditorSettings.getDefault().getAnnotations(profile);
+        List<AttributeSet> annotations = processAnnotations(annos, false);
+        return annotations;
+    }
+
+    public Collection<AttributeSet> getAnnotationsDefaults(String profile) {
+        Map<String, AttributeSet> annos = EditorSettings.getDefault().getAnnotationDefaults(profile);
+        List<AttributeSet> annotations = processAnnotations(annos, true);
+        return annotations;
+    }
+
+    private List<AttributeSet> processAnnotations(Map<String, AttributeSet> annos, boolean isdefault) {
         List<AttributeSet> annotations = new ArrayList<AttributeSet>();
         for(Iterator it = AnnotationTypes.getTypes().getAnnotationTypeNames(); it.hasNext(); ) {
             String name = (String) it.next ();
@@ -141,10 +153,10 @@
             if (description == null) {
                 continue;
             }
-
+            
             SimpleAttributeSet category = new SimpleAttributeSet();
             category.addAttribute(EditorStyleConstants.DisplayName, description);
-            category.addAttribute(StyleConstants.NameAttribute, description);
+            category.addAttribute(StyleConstants.NameAttribute, annotationType.getName());
             
             URL iconURL = annotationType.getGlyph ();
             Image image = null;
@@ -173,26 +185,40 @@
             }
             
             category.addAttribute("annotationType", annotationType); //NOI18N
+            if (annos.containsKey(name)) {
+                if (isdefault) {
+                    category.removeAttribute(StyleConstants.Background);
+                    category.removeAttribute(StyleConstants.Foreground);
+                    category.removeAttribute(EditorStyleConstants.WaveUnderlineColor);
+                }
+                AttributeSet as = annos.get(name);
+                category.addAttributes(as);
+                
+            }
+
             annotations.add(category);
-	}
-        
-	return annotations;
+        }
+        return annotations;
     }
     
     public void setAnnotations (
 	String profile, 
 	Collection<AttributeSet> annotations
     ) {
-	//S ystem.out.println("ColorModelImpl.setAnnotations ");
+	//S ystem.out.println("ColorModelImpl.setAnnotations ");      
+        Collection<AttributeSet> annos = new ArrayList<AttributeSet>();
 	for(AttributeSet category : annotations) {
 	    AnnotationType annotationType = (AnnotationType) 
 		category.getAttribute ("annotationType");
             
+            SimpleAttributeSet c = new SimpleAttributeSet();
+            c.addAttribute(StyleConstants.NameAttribute, category.getAttribute(StyleConstants.NameAttribute));
 	    if (category.isDefined (StyleConstants.Background)) {
 		annotationType.setUseHighlightColor (true);
 		annotationType.setHighlight (
                     (Color) category.getAttribute (StyleConstants.Background)
                 );
+                c.addAttribute(StyleConstants.Background, category.getAttribute(StyleConstants.Background));
             } else
 		annotationType.setUseHighlightColor (false);
 	    if (category.isDefined (StyleConstants.Foreground)) {
@@ -200,6 +226,7 @@
 		annotationType.setForegroundColor (
                     (Color) category.getAttribute (StyleConstants.Foreground)
                 );
+                c.addAttribute(StyleConstants.Foreground, category.getAttribute(StyleConstants.Foreground));
             } else
 		annotationType.setInheritForegroundColor (true);
 	    if (category.isDefined (EditorStyleConstants.WaveUnderlineColor)) {
@@ -207,13 +234,15 @@
                 annotationType.setWaveUnderlineColor (
                     (Color) category.getAttribute (EditorStyleConstants.WaveUnderlineColor)
                 );
+                c.addAttribute((EditorStyleConstants.WaveUnderlineColor), category.getAttribute (EditorStyleConstants.WaveUnderlineColor));
             } else
                 annotationType.setUseWaveUnderlineColor (false);
 	    //S ystem.out.println("  " + category.getDisplayName () + " : " + annotationType + " : " + annotationType.getHighlight() + " : " + annotationType.isUseHighlightColor());
+            annos.add(c);
 	}
+        
+        EditorSettings.getDefault().setAnnotations(profile, toMap(annos));
     }
-    
-    
     // editor categories .......................................................
     
     /**