diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Address.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Address.xml
index 562831cea15a8dc7d03f2b3d0f3b83da3d1fb531..e3f4f7b9c5154af23769d2ae44974367ac0e188f 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Address.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Address.xml
@@ -42,6 +42,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>content_icon</string> </key>
             <value> <string>document_icon.gif</string> </value>
@@ -62,10 +68,22 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Address</string> </value>
         </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Agent%20Privilege.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Agent%20Privilege.xml
index 7f1ed50f7b8cedd137070cafd9cf94c1f678a855..16c68511422d51086ee73f61a4b893f1e44e07c6 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Agent%20Privilege.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Agent%20Privilege.xml
@@ -35,6 +35,18 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>allowed_content_types</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>content_icon</string> </key>
             <value> <string>document.gif</string> </value>
@@ -53,10 +65,22 @@
             <key> <string>factory</string> </key>
             <value> <string>addAgentPrivilege</string> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Agent Privilege</string> </value>
         </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Agent.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Agent.xml
index d782fdddbaecf594b3f6d144b5ecfb8542b3b975..c40b279ababebd79473707966d10d0940417d225 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Agent.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Agent.xml
@@ -43,9 +43,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Agent Privilege</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Alarm%20Tool.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Alarm%20Tool.xml
index f6608fd5984cdfbe5611ec8ebe70e819db6f6d94..8654bb4c3e22db4880a91ba3d37ba2f38109e8ff 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Alarm%20Tool.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Alarm%20Tool.xml
@@ -37,9 +37,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Alarm</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -68,6 +66,12 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Alarm Tool</string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Applied%20Rule.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Applied%20Rule.xml
index 60d08d88e9baacb57cecaadcaf109d1e02db8a9c..9737b2c505cccad83336639e0d9210b975968107 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Applied%20Rule.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Applied%20Rule.xml
@@ -40,9 +40,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Simulation Movement</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Assignment.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Assignment.xml
index 40c8a6f42130e8205f27f84873ffaa3f810cd14c..2017e0ede92eb50b6f41b80fe21cea523df70ac4 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Assignment.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Assignment.xml
@@ -41,6 +41,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>content_icon</string> </key>
             <value> <string>order_icon.gif</string> </value>
@@ -61,10 +67,22 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Assignment</string> </value>
         </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Bank%20Account.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Bank%20Account.xml
index 0713aec961a01bf2930015d2fb5ef44c3bb2b7db..3d92e14de9a8df3b550a369e514ade2c547ba68b 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Bank%20Account.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Bank%20Account.xml
@@ -38,9 +38,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Agent</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -74,6 +72,12 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Bank Account</string> </value>
@@ -85,9 +89,7 @@
         <item>
             <key> <string>property_sheet_list</string> </key>
             <value>
-              <tuple>
-                <string>BankAccount</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Base%20Category.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Base%20Category.xml
index 28fe8c3fd7e5a3e46b7bc507c88a85dacd5d4174..0807f05c5a1c1e74b3367687542d9ffecb474e3b 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Base%20Category.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Base%20Category.xml
@@ -36,9 +36,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Category</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -68,6 +66,12 @@ be a problem).</string> </value>
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Base Category</string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Tool.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Tool.xml
index b6dff69242d85b5e311f999015b6db929d842703..f0c081af98b7414f039fd30c750e5ed056fad154 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Tool.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Tool.xml
@@ -40,9 +40,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Base Category</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -72,6 +70,12 @@ be a problem).</string> </value>
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Category Tool</string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category.xml
index 54a6199ab284077c9d536fc9369bedb3bb1b708c..2c42e786317ed6b15881865d377a01a0df0e608e 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category.xml
@@ -40,9 +40,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Category</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Credit%20Card.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Credit%20Card.xml
index 602a10b4f440df89701d24a76efd5aac6121b133..ecea6f7a5e0e382e6c8922b9a324900f057b7162 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Credit%20Card.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Credit%20Card.xml
@@ -120,9 +120,7 @@
         <item>
             <key> <string>property_sheet_list</string> </key>
             <value>
-              <tuple>
-                <string>CreditCard</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Line.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Line.xml
index f5a76ae78d8b520a4b104f7dae7ff3a047957e25..6c6258809daea96d0a5e4e887ecfabd78685630e 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Line.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Line.xml
@@ -38,17 +38,13 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Currency Exchange Cell</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>base_category_list</string> </key>
             <value>
-              <tuple>
-                <string>price_currency</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -79,9 +75,7 @@
         <item>
             <key> <string>hidden_content_type_list</string> </key>
             <value>
-              <tuple>
-                <string>Currency Exchange Cell</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Currency%20Module.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Currency%20Module.xml
index b321913d3423be17d0bb536a8e6a33f79f5e6b7d..3e1aa3ad1a576a203e6f602b95bf9d83d5d530a9 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Currency%20Module.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Currency%20Module.xml
@@ -40,10 +40,13 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Currency</string>
-                <string>ERP5Currency</string>
-              </tuple>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -66,10 +69,22 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Currency Module</string> </value>
         </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Currency Module</string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Currency.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Currency.xml
index ed8484d6feb8607a9b460c022241d9b89cc7f9fd..41e6bafb86c2168fbb5ac9bf5459395c412fcd03 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Currency.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Currency.xml
@@ -42,9 +42,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Currency Exchange Line</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Delivery%20Builder.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Delivery%20Builder.xml
index c0118d2180df9ebed69faa3bd195891fdec5d20d..d597c3f9c48b6353772cdc07e6dc877765b588c3 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Delivery%20Builder.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Delivery%20Builder.xml
@@ -40,9 +40,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Predicate Group</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Delivery%20Tool.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Delivery%20Tool.xml
index decd66b87f42d692a86b8150e8ac196bf08e56a7..f4501a65a28a962a65246756ec849d6865fa3601 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Delivery%20Tool.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Delivery%20Tool.xml
@@ -39,9 +39,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Delivery Builder</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Document.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Document.xml
index 0e13f41525e2040289a9f07cacbd72e52104cfa2..94c3ff888fa11c46c78a41a7c4b547d7e08dfc9b 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Document.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Document.xml
@@ -42,6 +42,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>content_icon</string> </key>
             <value> <string>document_icon.gif</string> </value>
@@ -62,10 +68,22 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Document</string> </value>
         </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Email.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Email.xml
index e8d11049980d16e3ea1b2b1d6badc1203385bcae..df812a3ce9a4b63a2da3737ca47cabb315ac0a3e 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Email.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Email.xml
@@ -41,6 +41,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>content_icon</string> </key>
             <value> <string>document_icon.gif</string> </value>
@@ -61,10 +67,22 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Email</string> </value>
         </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Favorite.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Favorite.xml
index e29cf6aece4869d464b204544b8db4ba8a025819..34e67dde91294988cadeae9dad2e652cc623932d 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Favorite.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Favorite.xml
@@ -29,6 +29,12 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>allowed_content_types</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>content_icon</string> </key>
             <value> <string>link_icon.gif</string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/File.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/File.xml
index 680b54f3eabf6571b0bd6c5bea95a0d467303336..e090af6fda4c6a258a4022bd4e02397e20dd6c7d 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/File.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/File.xml
@@ -42,6 +42,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>content_icon</string> </key>
             <value> <string>file_icon.gif</string> </value>
@@ -62,10 +68,22 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>File</string> </value>
         </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Folder.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Folder.xml
index eeec914c9b19d2391295f0a8dd75e35196ea3b86..b490202e20a9ee2b9d6c9422370f56a8ed919e3c 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Folder.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Folder.xml
@@ -42,6 +42,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>content_icon</string> </key>
             <value> <string>folder_icon.gif</string> </value>
@@ -62,10 +68,22 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>0</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Folder</string> </value>
         </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Image.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Image.xml
index a7d17889957f834ca466eddbc70ed532e0e885b7..0969a73bb3704736990e1d56184737a60415b90a 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Image.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Image.xml
@@ -44,6 +44,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>content_icon</string> </key>
             <value> <string>document_icon.gif</string> </value>
@@ -64,10 +70,22 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Image</string> </value>
         </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Link.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Link.xml
index 6dcbf1596f4c845ad657fc4b37ff087bea740e8b..45401ce5f0b8ac4a6eba51215af8bd72096c71e3 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Link.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Link.xml
@@ -29,6 +29,12 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>allowed_content_types</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>content_icon</string> </key>
             <value> <string>link_icon.gif</string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/News%20Item.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/News%20Item.xml
index 4d3f83ba46bb5ccc2e297eac3d933bff9231feaf..1a261cdcedc0bfaf5de6b8d3a02b7e2e2267430e 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/News%20Item.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/News%20Item.xml
@@ -29,6 +29,12 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>allowed_content_types</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>content_icon</string> </key>
             <value> <string>newsitem_icon.gif</string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Order%20Builder.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Order%20Builder.xml
index a7b2ff6ff9a72721301abcdbe8298c04faca405e..ad5e93f5802486038ae27d315d1d4c7551fd1954 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Order%20Builder.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Order%20Builder.xml
@@ -40,9 +40,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Predicate Group</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Order%20Tool.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Order%20Tool.xml
index ee79080f582360cf5f2d0beefd25c63bbbca388e..83735c685b1fc91494e47dbf1203481eaf08d231 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Order%20Tool.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Order%20Tool.xml
@@ -39,9 +39,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Order Builder</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Organisation%20Module.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Organisation%20Module.xml
index 9207cdb9281aba6aea848f7f884bc4e2ca389ea7..d59ee0daa734301d51c83409df50fc23cbe76dbb 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Organisation%20Module.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Organisation%20Module.xml
@@ -50,9 +50,13 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Organisation</string>
-              </tuple>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -75,10 +79,22 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Organisation Module</string> </value>
         </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Organisation.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Organisation.xml
index 698ad1a111fd8a2adafec67b23a9d4978781ae74..435d61462322b0a42ea62e29d0545739fb7d0a40 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Organisation.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Organisation.xml
@@ -47,19 +47,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Address</string>
-                <string>Bank Account</string>
-                <string>ChatAddress</string>
-                <string>Credit Card</string>
-                <string>Document</string>
-                <string>Email</string>
-                <string>Fax</string>
-                <string>File</string>
-                <string>Image</string>
-                <string>Link</string>
-                <string>Telephone</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Person%20Module.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Person%20Module.xml
index 2e4580c50fefed093da78bd26feb53f5c579a2ec..2b6df5eb5cfd9af4c2f41d6cc0666ae718f0bfe2 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Person%20Module.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Person%20Module.xml
@@ -55,9 +55,13 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Person</string>
-              </tuple>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -80,10 +84,22 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Person Module</string> </value>
         </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Person.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Person.xml
index c00992193c2761d427ece373dc3830a56ac5ada8..1dc7f54e55eda41c19b590145b0eb1db3af7aca4 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Person.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Person.xml
@@ -53,19 +53,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Address</string>
-                <string>Assignment</string>
-                <string>Bank Account</string>
-                <string>Career</string>
-                <string>ChatAddress</string>
-                <string>Credit Card</string>
-                <string>Email</string>
-                <string>Fax</string>
-                <string>File</string>
-                <string>Image</string>
-                <string>Telephone</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Predicate.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Predicate.xml
index 796114dbbea95e562bc429eafd72750b13eea666..beef031e7ea6fcfa3a7cbd287b153818d415a1b2 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Predicate.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Predicate.xml
@@ -36,9 +36,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Value Predicate</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Preference%20Tool.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Preference%20Tool.xml
index 6d3d1dabdcaee2d01c8b141bfe1928824b0eaf68..1c98c8c33fd5394a6a3171e1055e9fdbc7ddfcd0 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Preference%20Tool.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Preference%20Tool.xml
@@ -39,9 +39,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Preference</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Route%20Tool.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Route%20Tool.xml
index 1e7588914ba8ca739deb663e8a93e1786bf23f46..5e52485bbcf633076d0e4d89d65bf38f31ad8be4 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Route%20Tool.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Route%20Tool.xml
@@ -36,6 +36,18 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>allowed_content_types</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>content_icon</string> </key>
             <value> <string>folder_icon.gif</string> </value>
@@ -57,10 +69,22 @@ be a problem).</string> </value>
             <key> <string>filter_content_types</string> </key>
             <value> <int>0</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Route Tool</string> </value>
         </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Rule%20Tool.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Rule%20Tool.xml
index 1cbcb4fd28091d610a8bfd43efd860093a26f855..f3e68a1ebb59b5bcccc5738d2e3a789f666e466b 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Rule%20Tool.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Rule%20Tool.xml
@@ -39,11 +39,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Delivery Rule</string>
-                <string>Invoice Rule</string>
-                <string>Invoice Transaction Rule</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -73,6 +69,12 @@ be a problem).</string> </value>
             <key> <string>filter_content_types</string> </key>
             <value> <int>0</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Rule Tool</string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Simulation%20Movement.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Simulation%20Movement.xml
index b734f6d0e5598aaa5eb48f54c48d742af752cbd1..060be17f4dbe8803bf44b5d8b1c53a0f07f51969 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Simulation%20Movement.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Simulation%20Movement.xml
@@ -42,9 +42,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Applied Rule</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Simulation%20Tool.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Simulation%20Tool.xml
index 298a23c9d410e8b95bfeec42df2f9d84843d5e25..95cccb1441ed6a3afc7edc65244fedaf24488586 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Simulation%20Tool.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Simulation%20Tool.xml
@@ -36,9 +36,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Applied Rule</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Telephone.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Telephone.xml
index caa539103f6548280498fb377c27983608b2ab62..8afe4a6e8a0da328f70340083b662e1e97a95c8f 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Telephone.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Telephone.xml
@@ -43,6 +43,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>content_icon</string> </key>
             <value> <string>document_icon.gif</string> </value>
@@ -63,10 +69,22 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Telephone</string> </value>
         </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Template%20Tool.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Template%20Tool.xml
index 50c3fdb2066fdfc0575aa60c968ba793383e45d3..0ba3c91ae0c376e11039d2d99c8f2152fb77f530 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Template%20Tool.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Template%20Tool.xml
@@ -41,9 +41,13 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Business Template</string>
-              </tuple>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -66,10 +70,22 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Template Tool</string> </value>
         </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Template Tool</string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Trash%20Bin.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Trash%20Bin.xml
index a27ceea71d4ae8c7373dfeb04626e084efe04d16..3926272b8e943a456b80d62e754a5b0b684968da 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Trash%20Bin.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Trash%20Bin.xml
@@ -46,9 +46,7 @@
         <item>
             <key> <string>base_category_list</string> </key>
             <value>
-              <tuple>
-                <string>causality</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -94,11 +92,7 @@
         <item>
             <key> <string>property_sheet_list</string> </key>
             <value>
-              <tuple>
-                <string>Base</string>
-                <string>SimpleItem</string>
-                <string>Task</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Trash%20Tool.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Trash%20Tool.xml
index 13e1cae5a7ad0c583b61b7b79c3800aedb1c24b6..138aaaf3c61934135d21f31c5e74e9cbb3304f7c 100755
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Trash%20Tool.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Trash%20Tool.xml
@@ -39,9 +39,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Trash Bin</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>