diff --git a/editor.bracesmatching/manifest.mf b/editor.bracesmatching/manifest.mf
--- a/editor.bracesmatching/manifest.mf
+++ b/editor.bracesmatching/manifest.mf
@@ -1,6 +1,5 @@ Manifest-Version: 1.0
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.editor.bracesmatching/0
-OpenIDE-Module-Install: org/netbeans/modules/editor/bracesmatching/Installer.class
 OpenIDE-Module-Layer: org/netbeans/modules/editor/bracesmatching/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/bracesmatching/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.5
diff --git a/editor.bracesmatching/src/org/netbeans/modules/editor/bracesmatching/BracesMatchAction.java b/editor.bracesmatching/src/org/netbeans/modules/editor/bracesmatching/BracesMatchAction.java
--- a/editor.bracesmatching/src/org/netbeans/modules/editor/bracesmatching/BracesMatchAction.java
+++ b/editor.bracesmatching/src/org/netbeans/modules/editor/bracesmatching/BracesMatchAction.java
@@ -42,6 +42,14 @@ public final class BracesMatchAction ext
 
     private final boolean select;
     
+    public static BracesMatchAction createNavigateAction() {
+        return new BracesMatchAction(false);
+    }
+    
+    public static BracesMatchAction createSelectAction() {
+        return new BracesMatchAction(true);
+    }
+    
     public BracesMatchAction() {
         this(false);
     }
diff --git a/editor.bracesmatching/src/org/netbeans/modules/editor/bracesmatching/Installer.java b/editor.bracesmatching/src/org/netbeans/modules/editor/bracesmatching/Installer.java
deleted file mode 100644
--- a/editor.bracesmatching/src/org/netbeans/modules/editor/bracesmatching/Installer.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2007 Sun Microsystems, Inc.
- */
-
-package org.netbeans.modules.editor.bracesmatching;
-
-import org.netbeans.editor.BaseKit;
-import org.netbeans.editor.Settings;
-import org.netbeans.editor.SettingsNames;
-import org.netbeans.editor.SettingsUtil;
-import org.openide.modules.ModuleInstall;
-
-/**
- * Manages a module's lifecycle. Remember that an installer is optional and
- * often not needed at all.
- */
-public class Installer extends ModuleInstall {
-    
-    @Override
-    public void restored() {
-        Settings.addInitializer(new BracesMatcherSettingsInitializer());
-        Settings.reset();
-    }
-
-    @Override
-    public void uninstalled() {
-        die();
-    }
-
-    @Override
-    public void close() {
-        die();
-    }
-    
-    private void die() {
-        Settings.removeInitializer(BracesMatcherSettingsInitializer.NAME);
-        Settings.reset();
-    }
-    
-    private static final class BracesMatcherSettingsInitializer extends Settings.AbstractInitializer {
-        
-        static final String NAME = "bracesmatcher-settings-initializer"; // NOI18N
-        
-        BracesMatcherSettingsInitializer() {
-            super(NAME);
-        }
-
-        public void updateSettingsMap(Class kitClass, java.util.Map settingsMap) {
-            if (kitClass == BaseKit.class) {
-                SettingsUtil.updateListSetting(settingsMap,
-                    SettingsNames.CUSTOM_ACTION_LIST,new Object[] { 
-//                        new ControlPanelAction(),
-                        new BracesMatchAction(false), // an ordinary navigation
-                        new BracesMatchAction(true)   // navigates and selects a block
-                       // navigates and selects a block
-                    }
-                );
-            }
-        }
-        
-    } // End of BracesMatcherSettingsInitializer class
-    
-}
diff --git a/editor.bracesmatching/src/org/netbeans/modules/editor/bracesmatching/layer.xml b/editor.bracesmatching/src/org/netbeans/modules/editor/bracesmatching/layer.xml
--- a/editor.bracesmatching/src/org/netbeans/modules/editor/bracesmatching/layer.xml
+++ b/editor.bracesmatching/src/org/netbeans/modules/editor/bracesmatching/layer.xml
@@ -43,6 +43,18 @@ made subject to such option by the copyr
 <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN" "http://www.netbeans.org/dtds/filesystem-1_1.dtd">
 <filesystem>
     <folder name="Editors">
+        <folder name="Actions">
+            <file name="org-netbeans-modules-editor-bracesmatching-BracesMatchAction-navigate.instance">
+                <attr name="instanceOf" stringvalue="javax.swing.Action"/>
+                <attr name="instanceClass" stringvalue="org.netbeans.modules.editor.bracesmatching.BracesMatchAction"/>
+                <attr name="instanceCreate" methodvalue="org.netbeans.modules.editor.bracesmatching.BracesMatchAction.createNavigateAction"/>
+            </file>
+            <file name="org-netbeans-modules-editor-bracesmatching-BracesMatchAction-select.instance">
+                <attr name="instanceOf" stringvalue="javax.swing.Action"/>
+                <attr name="instanceClass" stringvalue="org.netbeans.modules.editor.bracesmatching.BracesMatchAction"/>
+                <attr name="instanceCreate" methodvalue="org.netbeans.modules.editor.bracesmatching.BracesMatchAction.createSelectAction"/>
+            </file>
+        </folder>
         <folder name="FontsColors">
             <folder name="NetBeans">
                 <folder name="Defaults">