diff -rupN original/hippoecm-extension.xml new/hippoecm-extension.xml
--- original/hippoecm-extension.xml	Sun Jan 15 18:10:33 2012
+++ new/hippoecm-extension.xml	Tue Feb  7 12:00:40 2012
@@ -39,7 +39,7 @@
     </sv:property>
   </sv:node>
 
-  <sv:node sv:name="tagging-replace-navigator">
+  <sv:node sv:name="tagging-append-navigator">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
       <sv:value>hippo:initializeitem</sv:value>
     </sv:property>
@@ -49,11 +49,8 @@
     <sv:property sv:name="hippo:contentresource" sv:type="String">
       <sv:value>navigator.xml</sv:value>
     </sv:property>
-    <sv:property sv:name="hippo:contentdelete" sv:type="String">
-      <sv:value>/hippo:configuration/hippo:frontend/cms/cms-browser/navigator</sv:value>
-    </sv:property>
     <sv:property sv:name="hippo:contentroot" sv:type="String">
-      <sv:value>/hippo:configuration/hippo:frontend/cms/cms-browser</sv:value>
+      <sv:value>/hippo:configuration/hippo:frontend/cms</sv:value>
     </sv:property>
   </sv:node>
 
diff -rupN original/navigator.xml new/navigator.xml
--- original/navigator.xml	Sun Jan 15 18:10:33 2012
+++ new/navigator.xml	Tue Feb  7 11:59:45 2012
@@ -14,60 +14,14 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<sv:node xmlns:sv="http://www.jcp.org/jcr/sv/1.0" sv:name="navigator">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>frontend:plugin</sv:value>
-  </sv:property>
-  <sv:property sv:name="wicket.id" sv:type="String">
-    <sv:value>service.browse.navigator</sv:value>
-  </sv:property>
-  <sv:property sv:name="plugin.class" sv:type="String">
-    <sv:value>org.hippoecm.frontend.plugins.cms.browse.Navigator</sv:value>
-  </sv:property>
-  <sv:property sv:name="wicket.behavior" sv:type="String">
-    <sv:value>service.behavior.navigator</sv:value>
-  </sv:property>
-  <sv:property sv:name="wicket.variant" sv:type="String">
-    <sv:value>yui</sv:value>
-  </sv:property>
-  <sv:property sv:name="sections" sv:type="String">
-    <sv:value>section.content</sv:value>
-    <sv:value>section.images</sv:value>
-    <sv:value>section.files</sv:value>
-    <sv:value>section.tagcloud</sv:value>
-    <sv:value>section.configuration</sv:value>
-  </sv:property>
-  <sv:property sv:name="section.configuration" sv:type="String">
-    <sv:value>service.browse.tree.configuration</sv:value>
-  </sv:property>
-  <sv:property sv:name="section.content" sv:type="String">
-    <sv:value>service.browse.tree.content</sv:value>
-  </sv:property>
-  <sv:property sv:name="section.files" sv:type="String">
-    <sv:value>service.browse.tree.files</sv:value>
-  </sv:property>
-  <sv:property sv:name="section.images" sv:type="String">
-    <sv:value>service.browse.tree.images</sv:value>
-  </sv:property>
-  <sv:property sv:name="section.tagcloud" sv:type="String">
-    <sv:value>service.browse.tree.tagcloud</sv:value>
-  </sv:property>
-  <sv:property sv:name="extension.list" sv:type="String">
-    <sv:value>service.browse.list</sv:value>
-  </sv:property>
-  <sv:property sv:name="model.document" sv:type="String">
-    <sv:value>model.browse.document</sv:value>
-  </sv:property>
-  <sv:property sv:name="model.default.path" sv:type="String">
-    <sv:value>/content/documents</sv:value>
-  </sv:property>
-  <sv:property sv:name="browser.id" sv:type="String">
-    <sv:value>service.browse</sv:value>
-  </sv:property>
-  <sv:property sv:name="browser.viewers" sv:type="String">
-    <sv:value>cms-folder-views</sv:value>
-  </sv:property>
-  <sv:property sv:name="search.viewers" sv:type="String">
-    <sv:value>cms-search-views</sv:value>
-  </sv:property>
-</sv:node>
+<sv:node xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:h="http://www.onehippo.org/jcr/xmlimport" 
+    sv:name="cms-browser" h:merge="combine">
+  <sv:node sv:name="navigator" h:merge="combine">
+    <sv:property sv:name="sections" sv:type="String" h:merge="append">
+      <sv:value>section.tagcloud</sv:value>
+    </sv:property>
+    <sv:property sv:name="section.tagcloud" sv:type="String">
+      <sv:value>service.browse.tree.tagcloud</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>
\ No newline at end of file