Index: projects/repository/source/java/org/alfresco/repo/forms/processor/filter/RootCategoryFilter.java
===================================================================
--- projects/repository/source/java/org/alfresco/repo/forms/processor/filter/RootCategoryFilter.java	(revision 0)
+++ projects/repository/source/java/org/alfresco/repo/forms/processor/filter/RootCategoryFilter.java	(revision 0)
@@ -0,0 +1,154 @@
+/**
+ * 
+ */
+package org.alfresco.repo.forms.processor.filter;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.forms.Form;
+import org.alfresco.repo.forms.FormData;
+import org.alfresco.repo.forms.FormData.FieldData;
+import org.alfresco.repo.forms.processor.AbstractFilter;
+import org.alfresco.repo.forms.processor.AbstractFormProcessor;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.CategoryService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * This filter supports form-based creation of complex root categories by
+ * transparently handling the resolution of the classification root
+ * {@link NodeRef}.
+ * 
+ * @author Axel Faust, <a href="http://www.prodyna.com">PRODYNA AG</a>
+ * 
+ */
+public class RootCategoryFilter extends AbstractFilter<TypeDefinition, NodeRef> {
+
+	private static final String ALFRESCO_CATEGORY_ROOT = "alfresco://category/root";
+	private static final String FIELD_ASPECT = "aspect";
+
+	protected NamespaceService namespaceService;
+	protected DictionaryService dictionaryService;
+	protected CategoryService categoryService;
+	protected NodeService nodeService;
+
+	@Override
+	public void beforeGenerate(TypeDefinition item, List<String> fields,
+			List<String> forcedFields, Form form, Map<String, Object> context) {
+		// NO-OP
+	}
+
+	@Override
+	public void afterGenerate(TypeDefinition item, List<String> fields,
+			List<String> forcedFields, Form form, Map<String, Object> context) {
+		// NO-OP
+	}
+
+	@Override
+	public void beforePersist(final TypeDefinition item, final FormData data) {
+		final QName name = item.getName();
+
+		if (this.dictionaryService.isSubClass(name, ContentModel.TYPE_CATEGORY)) {
+
+			final FieldData aspect = data.getFieldData(FIELD_ASPECT);
+			final FieldData destination = data
+					.getFieldData(AbstractFormProcessor.DESTINATION);
+
+			if (destination != null && aspect != null) {
+
+				final String destinationRef = (String) destination.getValue();
+				if (ALFRESCO_CATEGORY_ROOT.equalsIgnoreCase(destinationRef)) {
+					// resolve the virtual NodeRef to the appropriate
+					// classification node
+
+					final String aspectName = (String) aspect.getValue();
+					final QName aspectQName = QName.createQName(aspectName,
+							this.namespaceService);
+
+					final NodeRef classificationNode;
+					
+					// this is currently hard-wired to the "common" store
+					// TODO: Support multi-store category management
+					final Collection<ChildAssociationRef> rootCategories = this.categoryService
+							.getRootCategories(
+									StoreRef.STORE_REF_WORKSPACE_SPACESSTORE,
+									aspectQName);
+					if (!rootCategories.isEmpty()) {
+						classificationNode = rootCategories.iterator().next()
+								.getParentRef();
+					} else {
+						// determine classificationNode by creating a temporary
+						// root category
+						final NodeRef tempRootCategory = this.categoryService
+								.createRootCategory(
+										StoreRef.STORE_REF_WORKSPACE_SPACESSTORE,
+										aspectQName, "##temp##");
+						this.nodeService.addAspect(tempRootCategory,
+								ContentModel.ASPECT_TEMPORARY,
+								Collections.<QName, Serializable> emptyMap());
+
+						classificationNode = this.nodeService.getPrimaryParent(
+								tempRootCategory).getParentRef();
+
+						// delete the temporary root category
+						this.categoryService.deleteCategory(tempRootCategory);
+					}
+
+					// update the destination to refer to the classificationNode
+					data.addFieldData(AbstractFormProcessor.DESTINATION,
+							classificationNode.toString(), true);
+				}
+			}
+		}
+	}
+
+	@Override
+	public void afterPersist(TypeDefinition item, FormData data,
+			NodeRef persistedObject) {
+		// NO-OP
+	}
+
+	/**
+	 * @param namespaceService
+	 *            the namespaceService to set
+	 */
+	public void setNamespaceService(NamespaceService namespaceService) {
+		this.namespaceService = namespaceService;
+	}
+
+	/**
+	 * @param dictionaryService
+	 *            the dictionaryService to set
+	 */
+	public void setDictionaryService(DictionaryService dictionaryService) {
+		this.dictionaryService = dictionaryService;
+	}
+
+	/**
+	 * @param categoryService
+	 *            the categoryService to set
+	 */
+	public void setCategoryService(CategoryService categoryService) {
+		this.categoryService = categoryService;
+	}
+
+	/**
+	 * @param nodeService
+	 *            the nodeService to set
+	 */
+	public void setNodeService(NodeService nodeService) {
+		this.nodeService = nodeService;
+	}
+
+}
Index: projects/repository/source/java/org/alfresco/repo/forms/processor/node/TypeFormProcessor.java
===================================================================
--- projects/repository/source/java/org/alfresco/repo/forms/processor/node/TypeFormProcessor.java	(revision 32329)
+++ projects/repository/source/java/org/alfresco/repo/forms/processor/node/TypeFormProcessor.java	(working copy)
@@ -186,9 +186,13 @@
             // always be retrieved by looking up the created node's parent
             data.removeFieldData(DESTINATION);
 
-            // TODO: determine what association to use when creating the node in
-            // the destination,
-            // defaults to ContentModel.ASSOC_CONTAINS
+            QName assoc = ContentModel.ASSOC_CONTAINS;
+            FieldData destinationAssoc = data.getFieldData(DESTINATION_ASSOC);
+            if (destinationAssoc != null) 
+            { 
+                 assoc = QName.createQName((String)destinationAssoc.getValue(), this.namespaceService);
+                 data.removeFieldData(DESTINATION_ASSOC);
+            }
 
             // if a name property is present in the form data use it as the node
             // name,
@@ -213,7 +217,7 @@
             nodeProps.put(ContentModel.PROP_NAME, nodeName);
             nodeRef = this.nodeService.createNode(
                         parentRef,
-                        ContentModel.ASSOC_CONTAINS,
+                        assoc,
                         QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, 
                         QName.createValidLocalName(nodeName)), typeDef.getName(), nodeProps).getChildRef();
         }
Index: projects/repository/source/java/org/alfresco/repo/forms/processor/AbstractFormProcessor.java
===================================================================
--- projects/repository/source/java/org/alfresco/repo/forms/processor/AbstractFormProcessor.java	(revision 32329)
+++ projects/repository/source/java/org/alfresco/repo/forms/processor/AbstractFormProcessor.java	(working copy)
@@ -37,6 +37,8 @@
 {
     public static final String DESTINATION = "alf_destination";
     
+    public static final String DESTINATION_ASSOC = "alf_destinationAssoc";
+    
     private static final Log logger = LogFactory.getLog(AbstractFormProcessor.class);
 
     protected FormProcessorRegistry processorRegistry;
Index: projects/repository/config/alfresco/form-services-context.xml
===================================================================
--- projects/repository/config/alfresco/form-services-context.xml	(revision 32329)
+++ projects/repository/config/alfresco/form-services-context.xml	(working copy)
@@ -109,6 +109,16 @@
         ref="nodeFilterRegistry" /> </bean>
     -->
 
+	<bean id="rootCategoryFormFilter"
+		class="org.alfresco.repo.forms.processor.filter.RootCategoryFilter"
+		parent="baseFormFilter">
+		<property name="filterRegistry" ref="typeFilterRegistry" />
+		<property name="nodeService" ref="NodeService" />
+		<property name="dictionaryService" ref="DictionaryService" />
+		<property name="namespaceService" ref="NamespaceService" />
+		<property name="categoryService" ref="CategoryService" />
+	</bean>
+
     <bean id="formServiceScript" parent="baseJavaScriptExtension"
         class="org.alfresco.repo.forms.script.ScriptFormService">
         <property name="extensionName">
Index: projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/console/category-manager.get.properties
===================================================================
--- projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/console/category-manager.get.properties	(revision 32329)
+++ projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/console/category-manager.get.properties	(working copy)
@@ -1,4 +1,6 @@
 ## Top-level Root Node
 node.root=Category Root
 
-title.category-manager=Category Manager
\ No newline at end of file
+title.category-manager=Category Manager
+create-category.title=Create Category
+edit-category.title=Edit Category
\ No newline at end of file
Index: projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/console/category-manager-dialog.ftl
===================================================================
--- projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/console/category-manager-dialog.ftl	(revision 0)
+++ projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/console/category-manager-dialog.ftl	(revision 0)
@@ -0,0 +1,48 @@
+<#if formUI == "true">
+   <@formLib.renderFormsRuntime formId=formId />
+</#if>
+
+<div id="${args.htmlid}-dialog">
+   <div id="${args.htmlid}-dialogTitle" class="hd"></div>
+   <div class="bd">
+
+      <div id="${formId}-container" class="form-container">
+
+         <#if form.showCaption?exists && form.showCaption>
+            <div id="${formId}-caption" class="caption"><span class="mandatory-indicator">*</span>${msg("form.required.fields")}</div>
+         </#if>
+      
+         <form id="${formId}" method="${form.method}" accept-charset="utf-8" enctype="${form.enctype}" action="${form.submissionUrl}">
+         
+         	<#if form.mode == "create" && form.destination?? && form.destination?length &gt; 0>
+				<input id="${formId}-destination" name="alf_destination" type="hidden" value="${form.destination?html}" />
+			</#if>
+      
+			<#if form.mode == "create" && form.destinationAssoc?? && form.destinationAssoc?length &gt; 0>
+				<input id="${formId}-destinationAssoc" name="alf_destinationAssoc" type="hidden" value="${form.destinationAssoc?html}" />
+			</#if>
+
+			<#if args.aspect??>			
+				<input id="${formId}-aspect" name="aspect" type="hidden" value="${args.aspect?html}" />
+			</#if>
+   
+            <div id="${formId}-fields" class="form-fields">
+               <#list form.structure as item>
+                  <#if item.kind == "set">
+                     <@formLib.renderSet set=item />
+                  <#else>
+                     <@formLib.renderField field=form.fields[item.id] />
+                  </#if>
+               </#list>
+            </div>
+
+            <div class="bdft">
+               <input id="${formId}-submit" type="submit" value="${msg("form.button.submit.label")}" />
+               &nbsp;<input id="${formId}-cancel" type="button" value="${msg("form.button.cancel.label")}" />
+            </div>
+      
+         </form>
+
+      </div>
+   </div>
+</div>
\ No newline at end of file
Index: projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/console/category-manager.get_de.properties
===================================================================
--- projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/console/category-manager.get_de.properties	(revision 32329)
+++ projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/console/category-manager.get_de.properties	(working copy)
@@ -1,4 +1,6 @@
 ## Top-level Root Node
 node.root=Kategorie Root
 
-title.category-manager=Kategorie-Manager
\ No newline at end of file
+title.category-manager=Kategorie-Manager
+create-category.title=Kategorie anlegen
+edit-category.title=Kategorie bearbeiten
\ No newline at end of file
Index: projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/console/category-manager.get.html.ftl
===================================================================
--- projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/console/category-manager.get.html.ftl	(revision 32329)
+++ projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/console/category-manager.get.html.ftl	(working copy)
@@ -2,7 +2,17 @@
 <script type="text/javascript">//<![CDATA[
    new Alfresco.CategoryManager("${args.htmlid?js_string}").setOptions(
    {
-      nodeRef: "alfresco://category/root"
+      nodeRef: "alfresco://category/root",
+      suppressedCategoryAspects: {
+      	<#list config.scoped['CategoryManager']['suppressed-aspects'].getChildren('aspect') as aspect>
+      		"${aspect.value}": true<#if aspect_has_next>,</#if>
+  		</#list>
+  	  },
+  	  formCategories: {
+  	  	<#list config.scoped['CategoryManager']['form-categories'].getChildren('category-aspect') as aspect>
+  	  		"${aspect.value}": "${aspect.attributes['type']!"cm:category"}"<#if aspect_has_next>,</#if>
+  	  	</#list>
+  	  }
    }).setMessages(
       ${messages}
    );
Index: projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/console/category-manager.get.head.ftl
===================================================================
--- projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/console/category-manager.get.head.ftl	(revision 32329)
+++ projects/slingshot/config/alfresco/site-webscripts/org/alfresco/components/console/category-manager.get.head.ftl	(working copy)
@@ -1,5 +1,9 @@
-<#include "../../../alfresco/components/component.head.inc">
+<#-- Include form header to include necessary dependencies -->
+<#include "/org/alfresco/components/form/form.get.head.ftl">
 <!-- Category Manager -->
 <@script type="text/javascript" src="${page.url.context}/res/components/console/consoletool.js"></@script>
 <@script type="text/javascript" src="${page.url.context}/res/components/console/category-manager.js"></@script>
-<@link rel="stylesheet" type="text/css" href="${page.url.context}/res/components/console/category-manager.css" />
\ No newline at end of file
+<@link rel="stylesheet" type="text/css" href="${page.url.context}/res/components/console/category-manager.css" />
+
+<!-- Simple Dialog -->
+<@script type="text/javascript" src="${page.url.context}/res/modules/simple-dialog.js"></@script>
\ No newline at end of file
Index: projects/slingshot/config/alfresco/share-form-config.xml
===================================================================
--- projects/slingshot/config/alfresco/share-form-config.xml	(revision 32329)
+++ projects/slingshot/config/alfresco/share-form-config.xml	(working copy)
@@ -479,6 +479,27 @@
       </forms>
    </config>
 
+	<config evaluator="model-type" condition="cm:category">
+		<forms>
+			<form id="category-manager-simple-add">
+				<field-visibility>
+					<show id="cm:name" />
+				</field-visibility>
+				<create-form template="/org/alfresco/components/console/category-manager-dialog.ftl" />
+			</form>
+		</forms>
+	</config>
+
+	<config evaluator="node-type" condition="cm:category">
+		<forms>
+			<form id="category-manager-simple-metadata">
+				<field-visibility>
+					<show id="cm:name" />
+				</field-visibility>
+				<edit-form template="/org/alfresco/components/console/category-manager-dialog.ftl" />
+			</form>
+		</forms>
+	</config>
 
    <!-- Publishing Channels Form Config -->
 
Index: projects/slingshot/config/alfresco/share-config.xml
===================================================================
--- projects/slingshot/config/alfresco/share-config.xml	(revision 32329)
+++ projects/slingshot/config/alfresco/share-config.xml	(working copy)
@@ -237,6 +237,16 @@
          <task type="wcmwf:*"/>
       </hidden-tasks>
    </config>
+
+	<config evaluator="string-compare" condition="CategoryManager">
+		<suppressed-aspects>
+			<aspect>cm:taggable</aspect>
+			<aspect>cm:classifiable</aspect>
+		</suppressed-aspects>
+		<form-categories>
+			<!-- <category-aspect type="cm:category">cm:generalclassifiable</category-aspect> -->
+		</form-categories>
+	</config>
    
    <!-- Remote section - use Surf RequestCachingConnector to improve remoting performance -->
    <config evaluator="string-compare" condition="Remote">
Index: projects/slingshot/source/web/components/console/category-manager.css
===================================================================
--- projects/slingshot/source/web/components/console/category-manager.css	(revision 32329)
+++ projects/slingshot/source/web/components/console/category-manager.css	(working copy)
@@ -125,3 +125,10 @@
    visibility: hidden;
    width: 16px;
 }
+
+/* Forms */
+
+.form-container .form-fields {
+	padding: 1em 1em 0;
+}
+}
\ No newline at end of file
Index: projects/slingshot/source/web/components/console/category-manager.js
===================================================================
--- projects/slingshot/source/web/components/console/category-manager.js	(revision 32329)
+++ projects/slingshot/source/web/components/console/category-manager.js	(working copy)
@@ -36,8 +36,7 @@
     /**
      * Alfresco Slingshot aliases
      */
-    var $html = Alfresco.util.encodeHTML,
-       $combine = Alfresco.util.combinePaths;
+    var $html = Alfresco.util.encodeHTML;
 
    /**
     * CategoryManager constructor.
@@ -101,11 +100,11 @@
           */
          this.fnLoadNodeData = function DLT_oR_fnLoadNodeData(node, fnLoadComplete)
          {
-            // Get the path this node refers to
-            var nodePath = node.data.path;
+            var nodeRef = node.data.nodeRef;
+            var aspect = node.data.aspect;
 
             // Prepare URI for XHR data request
-            var uri = me._buildTreeNodeUrl.call(me, nodePath);
+            var uri = me._buildTreeNodeUrl.call(me, nodeRef, aspect);
 
             // Prepare the XHR callback object
             var callback =
@@ -114,26 +113,41 @@
                {
                   var results = YAHOO.lang.JSON.parse(oResponse.responseText), item, treeNode;
                   
-                  // Update parent node's nodeRef if we didn't have it before
-                  if (results.parent && node.data.nodeRef.length === 0)
-                  {
-                     node.data.nodeRef = results.parent.nodeRef;
-                  }
-
-                  if (results.items)
+                  if (results.data && results.data.items)
                   {
-                     for (var i = 0, j = results.items.length; i < j; i++)
+                     for (var i = 0, j = results.data.items.length; i < j; i++)
                      {
-                        item = results.items[i];
-                        item.path = $combine(nodePath, item.name);
-                        treeNode = this._buildTreeNode(item, node, false);
-
-                        if (!item.hasChildren)
-                        {
-                           treeNode.isLeaf = true;
-                        }
+                        item = results.data.items[i];
+                        item.aspect = node.data.aspect;
+                        this._buildTreeNode(item, node, false);
                      }
                   }
+                  else if (results.aspects)
+            	  {
+                	  var scope = this;
+                	  var sort = function (a, b)
+                	  {
+                		  var aLabel = scope.msg("aspect." + a.replace(":", "_"));
+                		  var bLabel = scope.msg("aspect." + b.replace(":", "_"));
+                		  return YAHOO.util.Sort.compare(aLabel, bLabel, false);
+                	  };
+                	  
+                	  results.aspects.sort(sort);
+                	  for (var i = 0, j = results.aspects.length; i < j; i++)
+            		  {
+                		  if (!this.options.suppressedCategoryAspects[results.aspects[i]])
+            			  {
+	                		  item = {
+	                				  aspect : results.aspects[i],
+	                				  nodeRef : "alfresco://category/root",
+	                				  name : this.msg("aspect." + results.aspects[i].replace(":", "_")),
+	                				  description : ""
+	                		  };
+	                		  
+	                		  this._buildTreeNode(item, node, false);
+            			  }
+            		  }
+            	  }
                   
                   if (results.resultsTrimmed)
                   {
@@ -262,8 +276,8 @@
          this._buildTreeNode(
          {
             name: Alfresco.util.message("node.root", this.name),
-            path: "/",
-            nodeRef: ""
+            nodeRef: "alfresco://category/root",
+            aspect: null
          }, root, true);
 
          // Register tree-level listeners
@@ -292,11 +306,11 @@
             return;
          }
          
-         // Get the path this node refers to
-         var nodePath = node.data.path;
+         var nodeRef = node.data.nodeRef;
+         var aspect = node.data.aspect;
 
          // Prepare URI for XHR data request
-         var uri = this._buildTreeNodeUrl(nodePath);
+         var uri = this._buildTreeNodeUrl(nodeRef, aspect);
 
          // Prepare the XHR callback object
          var callback =
@@ -305,10 +319,10 @@
             {
                var results = YAHOO.lang.JSON.parse(oResponse.responseText);
 
-               if (results.items)
+               if (results.data && results.data.items)
                {
                   var kids = oResponse.argument.node.children;
-                  var items = results.items;
+                  var items = results.data.items;
                   for (var i = 0, j = items.length; i < j; i++)
                   {
                      if ((kids.length <= i) || (kids[i].data.nodeRef != items[i].nodeRef))
@@ -331,13 +345,8 @@
                         if (!kidFound)
                         {
                            var item = items[i];
-                           item.path = $combine(oResponse.argument.node.data.path, item.name);
+                           item.aspect = aspect;
                            var tempNode = this._buildTreeNode(item);
-
-                           if (!item.hasChildren)
-                           {
-                              tempNode.isLeaf = true;
-                           }
                            
                            if (kids.length === 0)
                            {
@@ -398,10 +407,12 @@
        */
       _buildTreeNode: function DLT__buildTreeNode(p_oData, p_oParent, p_expanded)
       {
+    	 var label = p_oData.title !== undefined && p_oData.title !== "" ? p_oData.title : p_oData.name;
          var textNode = new YAHOO.widget.TextNode(
          {
-            label: $html(p_oData.name),
-            path: p_oData.path,
+        	// standard categories do not have a title, but complex ones may 
+            label: $html(label),
+            aspect: p_oData.aspect,
             nodeRef: p_oData.nodeRef,
             description: p_oData.description,
             editable : false
@@ -411,14 +422,14 @@
          var filenameId = textNode.labelElId;
          var fnInsituCallback = function insitu_callback(response, asset)
          {
-            asset.data.path = asset.data.path.replace(asset.label, response.json.name);
             asset.setUpLabel(response.json.name);
             asset.parent.toggle();
             asset.refresh();
             asset.parent.toggle();
             return true;
          };
-         if (p_oData.nodeRef !== null)
+         
+         if (p_oData.aspect !== null)
          {
             // Insitu editors
             scope.insituEditors.push(
@@ -430,6 +441,9 @@
                   component: this,
                   type: "textBoxCategory",
                   nodeRef: p_oData.nodeRef,
+                  aspect: p_oData.aspect,
+                  useForm: this.options.formCategories.hasOwnProperty(p_oData.aspect),
+                  modelType: this.options.formCategories.hasOwnProperty(p_oData.aspect) ? this.options.formCategories[p_oData.aspect] : "cm:category",
                   name: "name",
                   value: p_oData.name,
                   validations: [
@@ -459,22 +473,33 @@
                }
             });
          }
+         // TODO: handler for aspect root category creation
          
          return textNode;
       },
       
       /**
-       * Build URI parameter string for treenode JSON data webscript
+       * Build URI parameter string for JSON data webscript
        *
        * @method _buildTreeNodeUrl
-       * @param path {string} Path to query
+       * @param parentNodeRef {string} Parent node to query
+       * @param aspect {string} aspect to query
        */
-      _buildTreeNodeUrl: function DLT__buildTreeNodeUrl(path)
+      _buildTreeNodeUrl: function DLT__buildTreeNodeUrl(parentNodeRef, aspect)
       {
-         var nodeRef = new Alfresco.util.NodeRef(this.options.nodeRef),
-         uriTemplate ="slingshot/doclib/categorynode/node/" + $combine(encodeURI(nodeRef.uri), Alfresco.util.encodeURIPath(path));
+         var nodeRef = new Alfresco.util.NodeRef(parentNodeRef),
+         uriTemplate;
+         
+         if (aspect !== null)
+    	 {
+        	 uriTemplate = "api/forms/picker/category/" + nodeRef.uri + "/children?aspect=" + encodeURI(aspect);
+    	 }
+         else
+    	 {
+        	 uriTemplate = "api/categoryAspects";
+    	 }
          
-         return  Alfresco.constants.PROXY_URI + uriTemplate + "?perms=false&children=true";
+         return  Alfresco.constants.PROXY_URI + uriTemplate;
       }
    });
 
@@ -528,7 +553,7 @@
       this.addIcon = new Alfresco.widget.InsituEditorIconAdd(this, p_params);
       
       // Create Edit and Delete icon for all except category root
-      if (this.params.nodeRef !== "")
+      if (this.params.nodeRef !== "alfresco://category/root")
       {
          this.editorIcon = new Alfresco.widget.InsituEditorIconEdit(this, p_params);
          this.deleteIcon = new Alfresco.widget.InsituEditorIconDelete(this, p_params);
@@ -716,7 +741,97 @@
       Event.on(this.editIcon, "mouseout", this.onContextMouseOut, this);
    };
    
-   YAHOO.extend(Alfresco.widget.InsituEditorIconEdit, Alfresco.widget.InsituEditorIcon, {});
+   YAHOO.extend(Alfresco.widget.InsituEditorIconEdit, Alfresco.widget.InsituEditorIcon, {
+	   /**
+        * The default event handler fired when the user clicks the icon element.
+        *
+        * @method onIconClick
+        * @param {DOMEvent} e The current DOM event
+        * @param {Object} obj The object argument
+        */
+	    onIconClick: function InsituEditorIcon_onIconClick(e, obj)
+		{
+	    	if (obj.disabled)
+	    	{
+	    		return;
+	    	}
+	    	
+	    	// only use insitu text editor if we shouldn't use a form
+	    	if (obj.params.useForm)
+	    	{
+	    		Event.stopEvent(e);
+	    		
+	    		var fnSuccess = function()
+	            {
+	    			var treeNode = this.params.treeNode;
+	    			var parentNode = treeNode.parent;
+	    			
+	    			// remove the updated node
+	    			parentNode.tree.removeNode(treeNode);
+	    			
+	    			// refresh the parent
+	    			this.params.component._sortNodeChildren(parentNode);
+	    			
+	    			parentNode.toggle();
+	    			parentNode.refresh();
+	    			parentNode.toggle();
+	            };
+	            var fnFailure = function()
+	            {
+	            	Alfresco.util.PopupManager.displayMessage(
+        			{
+        				text: Alfresco.util.message("tool.category-manager.edit-category.failure")
+        			});
+	            };
+	    		
+	    		var scope = obj.params.callback.scope;
+	    		// Intercept before dialog show
+	    		var doBeforeDialogShow = function (p_form, p_dialog)
+	    		{
+	    			Alfresco.util.populateHTML(
+    					[ p_dialog.id + "-dialogTitle", scope.msg("edit-category.title") ]
+	    			);
+	    		};
+	    		var templateUrl = YAHOO.lang.substitute(Alfresco.constants.URL_SERVICECONTEXT + "components/form?itemKind={itemKind}&itemId={itemId}&mode={mode}&submitType={submitType}&formId={formId}&showCancelButton=true",
+				{
+	    			itemKind: "node",
+	                itemId: obj.params.nodeRef,
+	                mode: "edit",
+	                submitType: "json",
+	                formId: "category-manager-simple-metadata"
+	            });
+	            
+	            // Using Forms Service, so always create new instance
+	            var editCategory = new Alfresco.module.SimpleDialog(scope.id + "-editCategory-" + Alfresco.util.generateDomId());
+	            editCategory.setOptions(
+	            {
+	                width: "40em",
+	                templateUrl: templateUrl,
+	                actionUrl: null,
+	                destroyOnHide: true,
+	                doBeforeDialogShow:
+	                {
+	                	fn: doBeforeDialogShow,
+	                	scope: obj
+	                },
+	                onSuccess:
+	            	{
+	                	fn: fnSuccess,
+	                	scope: obj
+	            	},
+	            	onFailure:
+	        		{
+	            		fn: fnFailure,
+	            		scope: obj
+	        		}
+	            }).show();
+	    	}
+	    	else
+    		{
+	    		Alfresco.widget.InsituEditorIconEdit.superclass.onIconClick.call(this, e, obj);
+    		}
+		}
+   });
    
    Alfresco.widget.InsituEditorIconAdd = function(p_editor, p_params)
    {
@@ -726,11 +841,11 @@
       
       this.editIcon = document.createElement("span");
       this.editIcon.title = Alfresco.util.encodeHTML(p_params.titleAdd);
-      if (p_editor.params.nodeRef === "")
+      if (p_editor.params.nodeRef === "alfresco://category/root" && p_editor.params.aspect !== null)
       {
          Dom.addClass(this.editIcon, "insitu-add-root-category");  
       }
-      else
+      else if(p_editor.params.nodeRef !== "alfresco://category/root")
       {
          Dom.addClass(this.editIcon, "insitu-add-category");
       }
@@ -764,71 +879,70 @@
             Alfresco.logger.debug("onIconClick", e);
          }
          
-         Alfresco.util.PopupManager.getUserInput(
+         var fnSuccess = function()
          {
-            title: Alfresco.util.message("tool.category-manager.add-category"),
-            text: Alfresco.util.message("tool.category-manager.label.category-name"),
-            input: "text",
-            callback:
-            {
-               fn: function promptCallback (newNodeName, obj)
-               {
-                  url = this._buildAddNodeUrl(this.params.nodeRef);
-                  
-                  var config =
-                  {
-                     method: "POST",
-                     url: url,
-                     successCallback:
-                     {
-                        fn: function (response, obj)
-                        {
-                           var treeNode = this.params.treeNode;
-                           this.params.component._sortNodeChildren(treeNode);
-                           treeNode.toggle();
-                           treeNode.refresh();
-                           treeNode.toggle();
-                        },
-                        scope: this
-                     },
-                     failureCallback:
-                     {
-                        fn: function (response, obj)
-                        {
-                           Alfresco.util.PopupManager.displayMessage(
-                           {
-                              text: Alfresco.util.message("tool.category-manager.add-category.failure")
-                          });
-                        },
-                        scope: this
-                     },
-                     dataObj:
-                     {
-                        name : newNodeName
-                     }
-                  };
-                  
-                  Alfresco.util.Ajax.jsonRequest(config);
-               },
-               obj: {},
-               scope: obj
-            }
+        	 var treeNode = this.params.treeNode;
+        	 if (treeNode.expanded)
+        	 {
+        		 this.params.component._sortNodeChildren(treeNode);
+        	 }
+        	 treeNode.toggle();
+        	 treeNode.refresh();
+        	 treeNode.toggle();
+         };
+         var fnFailure = function()
+         {
+        	 Alfresco.util.PopupManager.displayMessage(
+			 {
+				 text: Alfresco.util.message("tool.category-manager.add-category.failure")
+			 });
+         };
+         
+    	 var scope = obj.params.callback.scope;
+    	 // Intercept before dialog show
+         var doBeforeDialogShow = function (p_form, p_dialog)
+         {
+            Alfresco.util.populateHTML(
+               [ p_dialog.id + "-dialogTitle", scope.msg("create-category.title") ]
+            );
+         };
+         var templateUrl = YAHOO.lang.substitute(Alfresco.constants.URL_SERVICECONTEXT + "components/form?itemKind={itemKind}&itemId={itemId}&destination={destination}&destinationAssoc={destinationAssoc}&aspect={aspect}&mode={mode}&submitType={submitType}&formId={formId}&showCancelButton=true",
+         {
+            itemKind: "type",
+            itemId: obj.params.modelType,
+            mode: "create",
+            submitType: "json",
+            destination: obj.params.nodeRef,
+            destinationAssoc: "cm:subcategories",
+            aspect: obj.params.aspect,
+            formId: "category-manager-simple-add"
          });
-      },
-      
-      /**
-       * Build URI parameter string for treenode JSON data webscript
-       *
-       * @method _buildTreeNodeUrl
-       * @param path {string} Path to query
-       */
-       _buildAddNodeUrl: function _buildAddNodeUrl(nodeRef)
-       {
-          var nodeRef = new Alfresco.util.NodeRef(nodeRef),
-            uriTemplate = "api/category/" + encodeURI(nodeRef.uri);
-
-          return  Alfresco.constants.PROXY_URI + uriTemplate;
-       }
+         
+         // Using Forms Service, so always create new instance
+         var createCategory = new Alfresco.module.SimpleDialog(scope.id + "-createCategory-" + Alfresco.util.generateDomId());
+         createCategory.setOptions(
+         {
+            width: "40em",
+            templateUrl: templateUrl,
+            actionUrl: null,
+            destroyOnHide: true,
+            doBeforeDialogShow:
+            {
+            	fn: doBeforeDialogShow,
+            	scope: obj
+            },
+            onSuccess:
+        	{
+            	fn: fnSuccess,
+            	scope: obj
+        	},
+        	onFailure:
+    		{
+        		fn: fnFailure,
+        		scope: obj
+    		}
+         }).show();
+      }
    });
 
    Alfresco.widget.InsituEditorIconDelete = function(p_editor, p_params)
@@ -928,15 +1042,15 @@
       },
       
       /**
-       * Build URI parameter string for treenode JSON data webscript
+       * Build URI parameter string for category deletion webscript
        *
-       * @method _buildTreeNodeUrl
-       * @param path {string} Path to query
+       * @method _buildDeleteNodeUrl
+       * @param nodeRef {string} Node to delete
        */
       _buildDeleteNodeUrl: function _buildDeleteNodeUrl(nodeRef)
       {
          var nodeRef = new Alfresco.util.NodeRef(nodeRef),
-         uriTemplate ="api/category/" + encodeURI(nodeRef.uri);
+         uriTemplate ="api/category/" + nodeRef.uri;
          
          return  Alfresco.constants.PROXY_URI + uriTemplate;
       }
Index: projects/web-framework-commons/config/alfresco/site-webscripts/org/alfresco/components/form/form.lib.ftl
===================================================================
--- projects/web-framework-commons/config/alfresco/site-webscripts/org/alfresco/components/form/form.lib.ftl	(revision 32329)
+++ projects/web-framework-commons/config/alfresco/site-webscripts/org/alfresco/components/form/form.lib.ftl	(working copy)
@@ -55,6 +55,10 @@
          <input id="${formId}-destination" name="alf_destination" type="hidden" value="${form.destination?html}" />
       </#if>
       
+      <#if form.mode == "create" && form.destinationAssoc?? && form.destinationAssoc?length &gt; 0>
+         <input id="${formId}-destinationAssoc" name="alf_destinationAssoc" type="hidden" value="${form.destinationAssoc?html}" />
+      </#if>
+      
       <#if form.mode != "view" && form.redirect?? && form.redirect?length &gt; 0>
          <input id="${formId}-redirect" name="alf_redirect" type="hidden" value="${form.redirect?html}" />
       </#if>
Index: projects/web-framework-commons/source/java/org/alfresco/web/scripts/forms/FormUIGet.java
===================================================================
--- projects/web-framework-commons/source/java/org/alfresco/web/scripts/forms/FormUIGet.java	(revision 32329)
+++ projects/web-framework-commons/source/java/org/alfresco/web/scripts/forms/FormUIGet.java	(working copy)
@@ -161,6 +161,7 @@
     protected static final String MODEL_SHOW_SUBMIT_BUTTON = "showSubmitButton";
     protected static final String MODEL_SHOW_CAPTION = "showCaption";
     protected static final String MODEL_DESTINATION = "destination";
+    protected static final String MODEL_DESTINATION_ASSOC = "destinationAssoc";
     protected static final String MODEL_REDIRECT = "redirect";
     protected static final String MODEL_ARGUMENTS = "arguments";
     protected static final String MODEL_STRUCTURE = "structure";
@@ -634,6 +635,12 @@
             formUIModel.put(MODEL_DESTINATION, destination);
         }
         
+        String destinationAssoc = getParameter(context.getRequest(), MODEL_DESTINATION_ASSOC);
+        if (destinationAssoc != null && destinationAssoc.length() > 0)
+        {
+            formUIModel.put(MODEL_DESTINATION_ASSOC, destinationAssoc);
+        }
+        
         String redirect = getParameter(context.getRequest(), MODEL_REDIRECT);
         if (redirect != null && redirect.length() > 0)
         {
Index: projects/web-framework-commons/source/web/components/object-finder/object-finder.js
===================================================================
--- projects/web-framework-commons/source/web/components/object-finder/object-finder.js	(revision 32329)
+++ projects/web-framework-commons/source/web/components/object-finder/object-finder.js	(working copy)
@@ -2488,7 +2488,7 @@
             }
 
             if (oRecord.getData("isContainer") ||
-                (!oRecord.getData("isContainer") && (scope.options.allowNavigationToContentChildren || oRecord.getData("type") == "cm:category")))
+                (!oRecord.getData("isContainer") && (scope.options.allowNavigationToContentChildren || oRecord.getData("isCategory"))))
             {
                template += '<h3 class="item-name"><a href="#" class="theme-color-1 parent-' + scope.eventGroup + '">{name}</a></h3>';
             }
Index: projects/remote-api/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerresults.lib.js
===================================================================
--- projects/remote-api/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerresults.lib.js	(revision 32329)
+++ projects/remote-api/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerresults.lib.js	(working copy)
@@ -11,6 +11,7 @@
    {
       typeShort: node.typeShort,
       isContainer: false,
+      isCategory: false,
       properties: {},
       displayPath: node.displayPath,
       nodeRef: "" + node.nodeRef
@@ -39,6 +40,7 @@
    {
       typeShort: node.typeShort,
       isContainer: false,
+      isCategory: false,
       properties: {},
       displayPath: node.displayPath,
       nodeRef: "" + node.nodeRef
Index: projects/remote-api/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerresults.lib.ftl
===================================================================
--- projects/remote-api/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerresults.lib.ftl	(revision 32329)
+++ projects/remote-api/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerresults.lib.ftl	(working copy)
@@ -7,6 +7,7 @@
 	</#if>
 		${indent}"type": "${node.typeShort}",
 		${indent}"isContainer": ${node.isContainer?string},
+		${indent}"isCategory": ${node.isCategory?string},
 		${indent}"name": "${node.properties.name!""}",
 		${indent}"title": "${node.properties.title!""}",
 		${indent}"description": "${node.properties.description!""}",
@@ -32,6 +33,7 @@
 			{
 				"type": "${row.item.typeShort}",
 				"isContainer": ${row.item.isContainer?string},
+				"isCategory": ${row.item.isCategory?string},
 				"name": "${row.item.properties.name!""}",
 				"title": "${row.item.properties.title!""}",
 				"description": "${row.item.properties.description!""}",
Index: projects/remote-api/config/alfresco/templates/webscripts/org/alfresco/repository/category/categoryAspects.get.desc.xml
===================================================================
--- projects/remote-api/config/alfresco/templates/webscripts/org/alfresco/repository/category/categoryAspects.get.desc.xml	(revision 0)
+++ projects/remote-api/config/alfresco/templates/webscripts/org/alfresco/repository/category/categoryAspects.get.desc.xml	(revision 0)
@@ -0,0 +1,11 @@
+<webscript>
+   <shortname>Category Management</shortname>
+   <description><![CDATA[
+   Retrieves all known category aspects
+   ]]></description>
+   <url>/api/categoryAspects</url>
+   <format default="json">argument</format>
+   <authentication>admin</authentication>
+   <transaction allow="readonly" buffersize="0">required</transaction>
+   <lifecycle>draft_public_api</lifecycle>
+</webscript>
\ No newline at end of file
Index: projects/remote-api/config/alfresco/templates/webscripts/org/alfresco/repository/category/categoryAspects.get.js
===================================================================
--- projects/remote-api/config/alfresco/templates/webscripts/org/alfresco/repository/category/categoryAspects.get.js	(revision 0)
+++ projects/remote-api/config/alfresco/templates/webscripts/org/alfresco/repository/category/categoryAspects.get.js	(revision 0)
@@ -0,0 +1,6 @@
+function main()
+{
+   model.aspects = classification.getAllClassificationAspects();
+}
+
+main();
\ No newline at end of file
Index: projects/remote-api/config/alfresco/templates/webscripts/org/alfresco/repository/category/categoryAspects.get.json.ftl
===================================================================
--- projects/remote-api/config/alfresco/templates/webscripts/org/alfresco/repository/category/categoryAspects.get.json.ftl	(revision 0)
+++ projects/remote-api/config/alfresco/templates/webscripts/org/alfresco/repository/category/categoryAspects.get.json.ftl	(revision 0)
@@ -0,0 +1,3 @@
+{
+	"aspects" : [<#list aspects as aspect>"${aspect}"<#if aspect_has_next>,</#if></#list>]
+}
\ No newline at end of file