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
@@ -72,6 +72,7 @@
 import javax.swing.text.StyleConstants;
 import org.netbeans.api.editor.settings.EditorStyleConstants;
 import org.netbeans.modules.options.colors.spi.FontsColorsController;
+import org.netbeans.spi.options.OptionsPanelController;
 import org.openide.awt.ColorComboBox;
 import org.openide.awt.Mnemonics;
 import org.openide.util.NbBundle;
@@ -80,6 +81,7 @@
  *
  * @author  Jan Jancura
  */
+@OptionsPanelController.KeywordPanel(keywords = {"annotation stuff", "xaxaxa333"}, location = "FontsAndColors", index = 2, id = "")
 public class AnnotationsPanel extends JPanel implements ActionListener, 
     ItemListener, FontsColorsController {
     
diff --git a/options.editor/src/org/netbeans/modules/options/colors/Bundle.properties b/options.editor/src/org/netbeans/modules/options/colors/Bundle.properties
--- a/options.editor/src/org/netbeans/modules/options/colors/Bundle.properties
+++ b/options.editor/src/org/netbeans/modules/options/colors/Bundle.properties
@@ -54,6 +54,10 @@
 Syntax_coloring_tab=&Syntax
 Annotations_tab=A&nnotations
 
+KW_1=syntax stuff
+KW_2=xaxaxa
+KW_3=xaxaxa222
+
 CTL_Create_New_Profile_Message=Profile &Name:
 CTL_Create_New_Profile_Title=Create New Profile Dialog
 CTL_Duplicate_Profile_Name=Profile with such name already exists.\n Choose different name, please.
diff --git a/options.editor/src/org/netbeans/modules/options/colors/FontAndColorsPanel.form b/options.editor/src/org/netbeans/modules/options/colors/FontAndColorsPanel.form
--- a/options.editor/src/org/netbeans/modules/options/colors/FontAndColorsPanel.form
+++ b/options.editor/src/org/netbeans/modules/options/colors/FontAndColorsPanel.form
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.3" maxVersion="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <AuxValues>
diff --git a/options.editor/src/org/netbeans/modules/options/colors/HighlightingPanel.java b/options.editor/src/org/netbeans/modules/options/colors/HighlightingPanel.java
--- a/options.editor/src/org/netbeans/modules/options/colors/HighlightingPanel.java
+++ b/options.editor/src/org/netbeans/modules/options/colors/HighlightingPanel.java
@@ -71,6 +71,7 @@
 import javax.swing.text.SimpleAttributeSet;
 import javax.swing.text.StyleConstants;
 import org.netbeans.modules.options.colors.spi.FontsColorsController;
+import org.netbeans.spi.options.OptionsPanelController;
 import org.openide.awt.ColorComboBox;
 import org.openide.awt.Mnemonics;
 import org.openide.util.NbBundle;
@@ -79,6 +80,7 @@
  *
  * @author  Jan Jancura
  */
+@OptionsPanelController.KeywordPanel(keywords={"highlighting stuff", "#KW_3"}, location="FontsAndColors", index=1, id="")
 public class HighlightingPanel extends JPanel implements ActionListener, ItemListener, FontsColorsController {
     
     private ColorModel          colorModel = null;
diff --git a/options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.java b/options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.java
--- a/options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.java
+++ b/options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.java
@@ -85,6 +85,7 @@
 import org.netbeans.api.editor.settings.FontColorSettings;
 import org.netbeans.modules.options.colors.ColorModel.Preview;
 import org.netbeans.modules.options.colors.spi.FontsColorsController;
+import org.netbeans.spi.options.OptionsPanelController;
 import org.openide.DialogDescriptor;
 import org.openide.DialogDisplayer;
 import org.openide.awt.ColorComboBox;
@@ -97,6 +98,7 @@
  *
  * @author  Jan Jancura
  */
+@OptionsPanelController.KeywordPanel(keywords={"#KW_1", "xaxaxa"}, location="FontsAndColors", index=0, id="")
 public class SyntaxColoringPanel extends JPanel implements ActionListener, 
     PropertyChangeListener, FontsColorsController, ItemListener {
     
diff --git a/options.editor/src/org/netbeans/modules/options/editor/FolderBasedOptionPanel.java b/options.editor/src/org/netbeans/modules/options/editor/FolderBasedOptionPanel.java
--- a/options.editor/src/org/netbeans/modules/options/editor/FolderBasedOptionPanel.java
+++ b/options.editor/src/org/netbeans/modules/options/editor/FolderBasedOptionPanel.java
@@ -63,10 +63,18 @@
  *
  * @author Dusan Balek
  */
+@OptionsPanelController.KeywordPanels({
+    @OptionsPanelController.KeywordPanel(keywords = {"asas", "xaxaxa444"}, location = "Editor", index = 4, id = "Hints"),
+    @OptionsPanelController.KeywordPanel(keywords = {"MarkOccurrences stuff", "xaxaxa555"}, location = "Editor", index = 5, id = "MarkOccurrences")
+})
 public final class FolderBasedOptionPanel extends JPanel implements ActionListener {
     
     private final FolderBasedController controller;
     
+    private FolderBasedOptionPanel() {
+        controller = null;
+    }
+    
     /** Creates new form FolderBasedOptionPanel */
     FolderBasedOptionPanel(FolderBasedController controller, Document filterDocument, boolean allowFiltering) {
         this.controller = controller;
diff --git a/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.form b/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.form
--- a/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.form
+++ b/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.form
@@ -248,9 +248,6 @@
     </Component>
     <Component class="javax.swing.JLabel" name="lEditorSearchType">
       <Properties>
-        <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
-          <ComponentRef name="default"/>
-        </Property>
         <Property name="text" type="java.lang.String" value="Editor Search Type:"/>
       </Properties>
     </Component>
diff --git a/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.java b/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.java
--- a/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.java
+++ b/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.java
@@ -53,6 +53,7 @@
 import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.ListCellRenderer;
+import org.netbeans.spi.options.OptionsPanelController;
 import org.openide.awt.Mnemonics;
 import org.openide.util.NbBundle;
 
@@ -61,6 +62,7 @@
  *
  * @author Jan Jancura
  */
+@OptionsPanelController.KeywordPanel(keywords={"general editor stuff", "kai"}, location="Editor", index=0, id="General")
 public class GeneralEditorPanel extends JPanel implements ActionListener {
 
     private boolean         changed = false;
diff --git a/options.editor/src/org/netbeans/modules/options/indentation/FormattingPanel.form b/options.editor/src/org/netbeans/modules/options/indentation/FormattingPanel.form
--- a/options.editor/src/org/netbeans/modules/options/indentation/FormattingPanel.form
+++ b/options.editor/src/org/netbeans/modules/options/indentation/FormattingPanel.form
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.4" maxVersion="1.4" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <AuxValues>
@@ -36,7 +36,7 @@
           <Group type="103" groupAlignment="0" attributes="0">
               <Group type="102" alignment="0" attributes="0">
                   <Group type="103" groupAlignment="1" attributes="0">
-                      <Component id="categoryPanel" alignment="0" pref="160" max="32767" attributes="1"/>
+                      <Component id="categoryPanel" alignment="0" max="32767" attributes="1"/>
                       <Group type="102" alignment="0" attributes="0">
                           <Group type="103" groupAlignment="0" attributes="0">
                               <Component id="categoryLabel" alignment="0" min="-2" max="-2" attributes="0"/>
@@ -66,7 +66,7 @@
                       <Component id="categoryCombo" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace type="separate" max="-2" attributes="0"/>
-                  <Component id="categoryPanel" pref="266" max="32767" attributes="0"/>
+                  <Component id="categoryPanel" pref="258" max="32767" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
diff --git a/options.editor/src/org/netbeans/modules/options/indentation/FormattingPanel.java b/options.editor/src/org/netbeans/modules/options/indentation/FormattingPanel.java
--- a/options.editor/src/org/netbeans/modules/options/indentation/FormattingPanel.java
+++ b/options.editor/src/org/netbeans/modules/options/indentation/FormattingPanel.java
@@ -68,6 +68,7 @@
 import org.netbeans.modules.editor.settings.storage.api.EditorSettings;
 import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
 import org.netbeans.modules.options.editor.spi.PreviewProvider;
+import org.netbeans.spi.options.OptionsPanelController;
 import org.openide.util.NbBundle;
 import org.openide.util.WeakListeners;
 
@@ -75,6 +76,7 @@
  *
  * @author Dusan Balek
  */
+@OptionsPanelController.KeywordPanel(keywords={"formatting", "general", "stuff"}, location="Editor", index=1, id="Formating")
 public final class FormattingPanel extends JPanel implements PropertyChangeListener {
     
     /** Creates new form FormattingPanel */
diff --git a/options.editor/src/org/netbeans/modules/options/indentation/IndentationPanel.form b/options.editor/src/org/netbeans/modules/options/indentation/IndentationPanel.form
--- a/options.editor/src/org/netbeans/modules/options/indentation/IndentationPanel.form
+++ b/options.editor/src/org/netbeans/modules/options/indentation/IndentationPanel.form
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.3" maxVersion="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <Properties>
diff --git a/options.editor/src/org/netbeans/modules/options/indentation/IndentationPanel.java b/options.editor/src/org/netbeans/modules/options/indentation/IndentationPanel.java
--- a/options.editor/src/org/netbeans/modules/options/indentation/IndentationPanel.java
+++ b/options.editor/src/org/netbeans/modules/options/indentation/IndentationPanel.java
@@ -83,6 +83,7 @@
 import org.netbeans.modules.editor.indent.api.IndentUtils;
 import org.netbeans.modules.editor.indent.api.Reformat;
 import org.netbeans.modules.options.editor.spi.PreviewProvider;
+import org.netbeans.spi.options.OptionsPanelController;
 import org.openide.awt.Mnemonics;
 import org.openide.filesystems.FileObject;
 import org.openide.text.CloneableEditorSupport;
@@ -96,6 +97,7 @@
  *
  * @author Jan Jancura
  */
+@OptionsPanelController.KeywordPanel(keywords={"indentation", "extra", "stuff"}, location="Editor", index=1, id="Formating")
 public class IndentationPanel extends JPanel implements ChangeListener, ActionListener, PreferenceChangeListener {
 
     private static final Logger LOG = Logger.getLogger(IndentationPanel.class.getName());
@@ -107,6 +109,15 @@
     private final PreviewProvider preview;
     private final boolean showOverrideGlobalOptions;
     
+    private IndentationPanel() {
+        this.mimePath = null;
+        this.prefsFactory = null;
+        this.prefs = null;
+        this.allLangPrefs = null;
+        this.preview = null;
+        this.showOverrideGlobalOptions = false;
+    }
+    
     /** 
      * Creates new form IndentationPanel.
      */