diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 19662ea2f333501a4e267d843b82e5489ce50783..9445688ec6d787540109e46617208ff97cc3da24 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -22,7 +22,7 @@
     "name" : "Accounting and Financial Management",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category": 'Finance',
+    "category": 'Accounting & Finance',
     'complexity': "normal",
     "description": """
 Accounting and Financial Management.
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index b7bf5d89fe24b53b6af523705ca60abbc314e4c7..b35b37aa9727c107cede2050fdf09b4512188bc9 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -43,26 +43,6 @@
             </field>
         </record>
 
-        <record id="view_account_modules_installer" model="ir.ui.view">
-            <field name="name">account.installer.modules.form</field>
-            <field name="model">base.setup.installer</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//group[@name='account_accountant']" position="replace">
-                    <newline/>
-                    <separator string="Accounting &amp; Finance Features" colspan="4"/>
-                    <field name="account_followup"/>
-                    <field name="account_payment"/>
-                    <field name="account_analytic_plans"/>
-                    <field name="account_anglo_saxon"/>
-                    <field name="account_asset"/>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
         <record id="action_account_configuration_installer" model="ir.actions.act_window">
             <field name="name">Install your Chart of Accounts</field>
             <field name="type">ir.actions.act_window</field>
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 417ac2f0461d5a985c7cb6de776e493549215041..bed92df4fd2f50547359def339ead47f2f5534cf 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -224,26 +224,4 @@ class account_installer(osv.osv_memory):
 
 account_installer()
 
-class account_installer_modules(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-    _columns = {
-        'account_analytic_plans': fields.boolean('Multiple Analytic Plans',
-            help="Allows invoice lines to impact multiple analytic accounts "
-                 "simultaneously."),
-        'account_payment': fields.boolean('Suppliers Payment Management',
-            help="Streamlines invoice payment and creates hooks to plug "
-                 "automated payment systems in."),
-        'account_followup': fields.boolean('Followups Management',
-            help="Helps you generate reminder letters for unpaid invoices, "
-                 "including multiple levels of reminding and customized "
-                 "per-partner policies."),
-        'account_anglo_saxon': fields.boolean('Anglo-Saxon Accounting',
-            help="This module will support the Anglo-Saxons accounting methodology by "
-                "changing the accounting logic with stock transactions."),
-        'account_asset': fields.boolean('Assets Management',
-            help="Helps you to manage your assets and their depreciation entries."),
-    }
-
-account_installer_modules()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py
index c018d277d467b2d59186eb3517fdbd08b21ae352..d808a38fa1834d5ba54aaf2dccce333711d231f9 100644
--- a/addons/account_accountant/__openerp__.py
+++ b/addons/account_accountant/__openerp__.py
@@ -22,7 +22,7 @@
     "name" : "Accountant Access",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category": 'Finance',
+    "category": 'Hidden',
     'complexity': "normal",
     "description": """
 Accounting Access Rights.
diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py
index 5e93307865ca932bdc32617ec8b720e2b9d7af5f..f75fe3d1615059e5783fce94600e7bac83d69536 100644
--- a/addons/account_analytic_analysis/__openerp__.py
+++ b/addons/account_analytic_analysis/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name'      : 'Analytic Account View',
     'version'   : '1.1',
-    'category'  : 'Finance',
+    'category'  : 'Hidden',
     'complexity': "normal",
     'description': """
 This module is for modifying account analytic view to show important data to project manager of services companies.
diff --git a/addons/account_analytic_default/__openerp__.py b/addons/account_analytic_default/__openerp__.py
index 07cde53d003e72b422360aa1fe1b47ca50fc47f9..e46f285d9c6cb445a9c969de8670426d6f14fbbb 100644
--- a/addons/account_analytic_default/__openerp__.py
+++ b/addons/account_analytic_default/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name'      : 'Account Analytic Defaults',
     'version'   : '1.0',
-    'category'  : 'Finance',
+    'category'  : 'Hidden',
     'complexity': "normal",
     'description': """Set default values for your analytic accounts
 Allows to automatically select analytic accounts based on criterions:
diff --git a/addons/account_analytic_plans/__openerp__.py b/addons/account_analytic_plans/__openerp__.py
index d6a5834517e9f65ebac8adfd3061122bf1692a80..ffb20ffe3e8ed0a83fc6f159aed4911cfe1dd200 100644
--- a/addons/account_analytic_plans/__openerp__.py
+++ b/addons/account_analytic_plans/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name'      : 'Manage multiple plans in Analytic Accounting',
+    'name'      : 'Multiple Analytic Plans',
     'version'   : '1.0',
-    'category'  : 'Finance',
+    'category'  : 'Accounting & Finance',
     'complexity': "normal",
     'description': """
 This module allows to use several analytic plans, according to the general journal.
diff --git a/addons/account_anglo_saxon/__openerp__.py b/addons/account_anglo_saxon/__openerp__.py
index 79afb26ab26c8cb5cf77c856d90b0ece478f3b36..8cf6a37c3fc92f4fbaca24481c7d464dea31da80 100644
--- a/addons/account_anglo_saxon/__openerp__.py
+++ b/addons/account_anglo_saxon/__openerp__.py
@@ -19,7 +19,7 @@
 ##############################################################################
 
 {
-    "name"      : "Stock Accounting for Anglo-Saxon countries",
+    "name"      : "Anglo-Saxon Accouting",
     "version"   : "1.2",
     "author"    : "OpenERP SA, Veritos",
     "website"   : "http://tinyerp.com - http://veritos.nl",
@@ -36,7 +36,7 @@ when the invoice is created to transfer this amount to the debtor or creditor ac
 Secondly, price differences between actual purchase price and fixed product standard price are booked on a separate account""",
     "images"   : ["images/account_anglo_saxon.jpeg"],
     "depends"   : ["product", "purchase"],
-    "category"  : "Warehouse",
+    "category"  : "Accounting & Finance",
     "init_xml"  : [],
     "demo_xml"  : [],
     "update_xml" : ["product_view.xml",],
diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py
index 4cad6f74af3b003dfe87b5c5982432f570d1de47..dd1161e1a14b06e0c247a347b4aaa5e273ed4e39 100644
--- a/addons/account_asset/__openerp__.py
+++ b/addons/account_asset/__openerp__.py
@@ -20,16 +20,16 @@
 ##############################################################################
 
 {
-    "name" : "Asset management",
+    "name" : "Assets Management",
     "version" : "1.0",
     "depends" : ["account"],
-    "author" : "Tiny",
+    "author" : "OpenERP S.A.",
     "description": """Financial and accounting asset management.
     This Module manages the assets owned by a company or an individual. It will keep track of depreciation's occurred on 
     those assets. And it allows to create Move's of the depreciation lines.
     """,
     "website" : "http://www.openerp.com",
-    "category" : "Generic Modules/Accounting",
+    "category" : "Accounting & Finance",
     "init_xml" : [
     ],
     "demo_xml" : [ 'account_asset_demo.xml'
diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py
index 9ff5964637a42fed0830b1b70c1f462bdf1d5176..e4782ee0d2a6e4c51b05e7a7a3675cb3c66a9512 100644
--- a/addons/account_budget/__openerp__.py
+++ b/addons/account_budget/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Budget Management',
+    'name': 'Budgets',
     'version': '1.0',
-    'category': 'Finance',
+    'category': 'Project Management',
     'complexity': "normal",
     'description': """
 This module allows accountants to manage analytic and crossovered budgets.
diff --git a/addons/account_cancel/__openerp__.py b/addons/account_cancel/__openerp__.py
index 469033ac56e642fc661123d6dae9aeabf94c9c67..ac73a2b8c317a6f097cf43a3f8d7b662492187df 100644
--- a/addons/account_cancel/__openerp__.py
+++ b/addons/account_cancel/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "Cancel Entries",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category": 'Finance',
+    "category": 'Hidden',
     'complexity': "normal",
     "description": """
 Allows cancelling accounting entries.
diff --git a/addons/account_chart/__openerp__.py b/addons/account_chart/__openerp__.py
index 2b958c4a943cd7357d981d5f50201b8ff38c8220..948f13b5dcb7e82b63e310f3a8724c380a6fddd1 100644
--- a/addons/account_chart/__openerp__.py
+++ b/addons/account_chart/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Charts of Accounts',
     'version': '1.1',
-    'category': 'Finance',
+    'category': 'Hidden',
     'description': """
 Remove minimal account chart.
 =============================
diff --git a/addons/account_coda/__openerp__.py b/addons/account_coda/__openerp__.py
index fb39bc4c5bacb18faa1c768cd0fe033bc18158b3..dd604e41acaee08b4f175323fa301348916f9f59 100644
--- a/addons/account_coda/__openerp__.py
+++ b/addons/account_coda/__openerp__.py
@@ -23,7 +23,7 @@
     "name"      : "Account CODA - import bank statements from coda file",
     "version"   : "1.0",
     "author"    : "OpenERP SA",
-    "category"  : "Finance",
+    "category"  : "Hidden",
     'complexity': "normal",
     "description": """
 Module provides functionality to import bank statements from coda files.
diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index 9df99b720a23c989a63dc2e2b6ef91be00d76274..ca6321d567299783b6029f5818e410e3d9cc39fe 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -20,9 +20,9 @@
 ##############################################################################
 
 {
-    'name': 'Reminders',
+    'name': 'Followups Management',
     'version': '1.0',
-    'category': 'Finance',
+    'category': 'Accounting & Finance',
     'complexity': "normal",
     'description': """
 Modules to automate letters for unpaid invoices, with multi-level recalls.
diff --git a/addons/account_invoice_layout/__openerp__.py b/addons/account_invoice_layout/__openerp__.py
index b045b7b0b5d4a4690d5ce8e715684332efee2f24..557f3c2e02cf99955307b585c7592afcf3d004dc 100644
--- a/addons/account_invoice_layout/__openerp__.py
+++ b/addons/account_invoice_layout/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Improve Invoice Layout',
     'version': '1.0',
-    'category': 'Finance',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 This module provides some features to improve the layout of the invoices.
diff --git a/addons/account_payment/__openerp__.py b/addons/account_payment/__openerp__.py
index 8a90a1405589cf7d01aece197ed11d4da5e28385..1912dfa5198b0a759ea2ffb81d5a402536660d70 100644
--- a/addons/account_payment/__openerp__.py
+++ b/addons/account_payment/__openerp__.py
@@ -20,10 +20,10 @@
 ##############################################################################
 
 {
-    "name": "Payment Management",
+    "name": "Suppliers Payment Management",
     "version": "1.1",
     "author": "OpenERP SA",
-    "category": "Finance",
+    "category": "Accounting & Finance",
     'complexity': "easy",
     "description": """
 Module to manage invoice payment.
diff --git a/addons/account_sequence/__openerp__.py b/addons/account_sequence/__openerp__.py
index f7ab18f3e7ebebc9ba09c84a2c9002e6183b1746..31d4f373e2ff542674b6f710f7bc8126746b02bd 100644
--- a/addons/account_sequence/__openerp__.py
+++ b/addons/account_sequence/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Entries Sequence Numbering',
     'version': '1.1',
-    'category': 'Finance',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 This module maintains internal sequence number for accounting entries.
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 7da2b2da99c94c8d16114eae88c0fe39ebc6d460..97ac9950efb35b686502c14cf750bfdb3990d76a 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -32,7 +32,7 @@ Account Voucher module includes all the basic requirements of Voucher Entries fo
     * Voucher Receipt
     * Cheque Register
     """,
-    "category" : "Finance",
+    "category" : "Hidden",
     "website" : "http://tinyerp.com",
     "images" : ["images/customer_payment.jpeg","images/journal_voucher.jpeg","images/sales_receipt.jpeg","images/supplier_voucher.jpeg"],
     "depends" : ["account"],
diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py
index 30712a781674706fbf2d6b279e950bfd47986e86..65f6588a1e3a600bfd0f89c2bdf544cb3b1eed0f 100644
--- a/addons/analytic/__openerp__.py
+++ b/addons/analytic/__openerp__.py
@@ -24,7 +24,7 @@
     "version": "1.1",
     "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
-    "category" : "Finance",
+    "category" : "Hidden",
     "depends" : ["base", "decimal_precision"],
     "description": """
 Module for defining analytic accounting object.
diff --git a/addons/analytic_journal_billing_rate/__openerp__.py b/addons/analytic_journal_billing_rate/__openerp__.py
index a924121325115055065439168affaba4485c75ff..059e85d9367de6a46cc1911b3616ecd7008f7a49 100644
--- a/addons/analytic_journal_billing_rate/__openerp__.py
+++ b/addons/analytic_journal_billing_rate/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Analytic Journal Billing Rate, Define the default invoicing rate for a specific journal',
     'version': '1.0',
-    'category': 'Human Resources',
+    'category': 'Hidden',
     'description': """
 This module allows you to define what is the default invoicing rate for a specific journal on a given account.
 ==============================================================================================================
diff --git a/addons/analytic_user_function/__openerp__.py b/addons/analytic_user_function/__openerp__.py
index 9716495aabcbd7b2996f11c380c6b0eab4790c22..bb3ca084be7b1c12173093d2dc387ebdcadbe7f7 100644
--- a/addons/analytic_user_function/__openerp__.py
+++ b/addons/analytic_user_function/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Human Resources',
     'version': '1.0',
-    'category': 'Generic Modules/Others',
+    'category': 'Hidden',
     'description': """
 This module allows you to define what is the default function of a specific user on a given account.
 ====================================================================================================
diff --git a/addons/anonymization/__openerp__.py b/addons/anonymization/__openerp__.py
index 842b774eb9c9b23899b28d2bc8130ef25158d51d..41e906c078a3170d6bce0a9b4989aef32ef7a5f5 100644
--- a/addons/anonymization/__openerp__.py
+++ b/addons/anonymization/__openerp__.py
@@ -24,7 +24,7 @@
 {
     'name': 'Database Anonymization',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 This module allows you to anonymize a database.
diff --git a/addons/association/__init__.py b/addons/association/__init__.py
index 5b34f17fec984e61218bffbfb9190835b20153ba..4716d0d109b6e7b8fec8bdd3061dc5f39a6c3c56 100644
--- a/addons/association/__init__.py
+++ b/addons/association/__init__.py
@@ -18,6 +18,5 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-import profile_association
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py
index 51d44bf681dea1b7671af20663dbd4751fab5da1..0251eb68d0268fe2581b949aba991a29633520e1 100644
--- a/addons/association/__openerp__.py
+++ b/addons/association/__openerp__.py
@@ -23,8 +23,7 @@
 {
     'name': 'Association profile',
     'version': '0.1',
-    'category': 'General',
-    'category': 'Profile',
+    'category': 'Vertical Applications',
     'complexity': "normal",
     'description': """
 This module is to configure modules related to an association.
diff --git a/addons/association/profile_association.py b/addons/association/profile_association.py
deleted file mode 100644
index 0e66af14a1d323ececaf318026f110771194eac9..0000000000000000000000000000000000000000
--- a/addons/association/profile_association.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-from lxml import etree
-from osv import fields, osv
-
-class profile_association_config_install_modules_wizard(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        'hr_expense':fields.boolean('Resources Management: Expenses Tracking',  help="Tracks and manages employee expenses, and can "
-                 "automatically re-invoice clients if the expenses are "
-                 "project-related."),
-        'event_project':fields.boolean('Event Management: Events', help="Helps you to manage and organize your events."),
-        'project_gtd':fields.boolean('Getting Things Done',
-            help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
-        'wiki': fields.boolean('Wiki', help="Lets you create wiki pages and page groups in order "
-                 "to keep track of business knowledge and share it with "
-                 "and  between your employees."),
-    }
-
-    # Will be removed when rd-v61-al-config-depends will be done
-    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        res = super(profile_association_config_install_modules_wizard, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
-        doc = etree.XML(res['arch'])
-        for module in ['project_gtd','hr_expense']:
-            count = 0
-            for node in doc.xpath("//field[@name='%s']" % (module)):
-                count = count + 1
-                if count > 1:
-                    node.set('invisible', '1')
-        res['arch'] = etree.tostring(doc)
-        return res
-   
-profile_association_config_install_modules_wizard()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 12222ecbd90fba7bab3fd87c715b3a8a1873ba56..8ce97cb2e4395dee6739a2642bd908cd1b1913a7 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -1,24 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="view_confirm_install_module_form" model="ir.ui.view">
-            <field name="name">Association Application Configuration</field>
-            <field name="model">base.setup.installer</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-            <field name="arch" type="xml">
-              <data>
-                <xpath expr="//group[@name='association']" position="replace">
-                    <newline/>
-                    <separator  string="Associations Features" colspan="4" />
-                    <field name="project_gtd" />
-                    <field name="wiki" />
-                    <field name="event_project" />
-                    <field name="hr_expense" />
-                </xpath>
-              </data>
-            </field>
-        </record>
         <menuitem
             name="Association"
             id="base.menu_association"
diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py
index e1ceaf9921c208830bbbb469cb9f7c08218797bb..511407e10a21e407dc16df64c29c110567ef900f 100644
--- a/addons/auction/__openerp__.py
+++ b/addons/auction/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Auction Management',
     'version': '1.0',
-    'category': 'General',
+    'category': 'Vertical Applications',
     'complexity': "normal",
     'description': """
 This module manages the records of artists, auction articles, buyers and sellers.
diff --git a/addons/audittrail/__openerp__.py b/addons/audittrail/__openerp__.py
index 5bfd023ac39d0a46444811bdb890cc3d1931dd3d..7d2a5955ac02d96f098e11b75bd21557efef27a5 100644
--- a/addons/audittrail/__openerp__.py
+++ b/addons/audittrail/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Audit Trail',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 This module lets administrator track every user operation on all the objects of the system.
 ===========================================================================================
diff --git a/addons/auth_openid/__openerp__.py b/addons/auth_openid/__openerp__.py
index 733008ac6e5e4dd479e3443962475a25997bf710..040a96a3995cfbdece53a3a855656b429832edf1 100644
--- a/addons/auth_openid/__openerp__.py
+++ b/addons/auth_openid/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'OpenID',
     'version': '2.0',
-    'category': 'Authentification',
+    'category': 'Hidden',
     'description': """Allow users to login through OpenID.""",
     'author': 'OpenERP s.a.',
     'maintainer': 'OpenERP s.a.',
diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py
index 1170557efad7de4dcfba52468708c3cd19a8861f..18af8d0945940149394329518f457c339ce06136 100644
--- a/addons/base_action_rule/__openerp__.py
+++ b/addons/base_action_rule/__openerp__.py
@@ -22,9 +22,7 @@
 {
     'name': 'Action Rule',
     'version': '1.0',
-    'category': 'Tools',
-    'complexity': "expert",
-    'category': 'Generic Modules/Others',
+    'category': 'Hidden',
     'description': """
 This module allows to implement action rules for any object.
 ============================================================
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 6edb978301f3059c86c6520d3f36d0b710cdb4b1..0dd72a17038ef2088dbbf707d25fb2ce62ce7d06 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -34,7 +34,7 @@ It supports:
     - Recurring events
     - Invitations to people""",
     "author" : "OpenERP SA",
-    'category': 'Tools',
+    'category': 'Hidden',
     'website': 'http://www.openerp.com',
     "init_xml" : [
         'base_calendar_data.xml'
diff --git a/addons/base_contact/__openerp__.py b/addons/base_contact/__openerp__.py
index 17e7d3a69c82329905ac4a2f29cba6aede2ed8c9..5537d6f91ebfda7d7b936fde47aa097a66cf1892 100644
--- a/addons/base_contact/__openerp__.py
+++ b/addons/base_contact/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Base Contact',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "expert",
     'description': """
 This module allows you to manage your contacts entirely.
diff --git a/addons/base_crypt/__openerp__.py b/addons/base_crypt/__openerp__.py
index c9e79688288730456a01016084b2218267de3ed8..025f7db0704ffcbc979e6f587fe4b282948c1280 100644
--- a/addons/base_crypt/__openerp__.py
+++ b/addons/base_crypt/__openerp__.py
@@ -24,7 +24,7 @@
     "author" : ['OpenERP SA', "FS3"],
     "maintainer" : "OpenERP SA",
     "website" : "http://www.openerp.com",
-    "category" : "Tools",
+    "category" : "Hidden",
     'complexity': "easy",
     "description": """
 Replaces cleartext passwords in the database with a secure hash
diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py
index 370ca6c93f236d3e98ec0bb82b0e7013cde9a1bb..c9bc3866b4fb77b574b8387e4fe62ba26b28f140 100644
--- a/addons/base_iban/__openerp__.py
+++ b/addons/base_iban/__openerp__.py
@@ -21,7 +21,7 @@
 {
     'name': 'Create IBAN bank accounts',
     'version': '1.0',
-    'category': 'Finance',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity.
diff --git a/addons/base_module_doc_rst/__openerp__.py b/addons/base_module_doc_rst/__openerp__.py
index c2c5ca30a91a9121a37959be3696eaa55879a5bb..41425f77749ab8ef40a5123d3089d3a2f032ac5d 100644
--- a/addons/base_module_doc_rst/__openerp__.py
+++ b/addons/base_module_doc_rst/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Module Technical Guide in Restructured Text ',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 This module generates the Technical Guides of selected modules in Restructured Text format (RST).
 =================================================================================================
diff --git a/addons/base_module_quality/__openerp__.py b/addons/base_module_quality/__openerp__.py
index ec9ec1191d2e91fe8a48f9b075abd0bae00f2287..af258685629cfc6b7d36c066c8b5a73cfcf5a5a0 100644
--- a/addons/base_module_quality/__openerp__.py
+++ b/addons/base_module_quality/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Base module quality - To check the quality of other modules' ,
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 The aim of this module is to check the quality of other modules.
 ================================================================
diff --git a/addons/base_module_record/__openerp__.py b/addons/base_module_record/__openerp__.py
index fdb576e0ddd72c9a1b5d355fa9be538487b5ce2f..3e1cf79792aa8037bbaf0bb152692831ff18b37c 100644
--- a/addons/base_module_record/__openerp__.py
+++ b/addons/base_module_record/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Module Record',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 This module allows you to create a new module without any development.
 ======================================================================
diff --git a/addons/base_report_creator/__openerp__.py b/addons/base_report_creator/__openerp__.py
index 6c0a01f78fdfcdfe54bb23c9181a949d32ab30be..5e8bed72d031642ab72c9ba7673016f1ee3d7a90 100644
--- a/addons/base_report_creator/__openerp__.py
+++ b/addons/base_report_creator/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Statistical Report Creator',
+    'name': 'Query Builder',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Advanced Reporting',
     'complexity': "expert",
     'description': """
 This module allows you to create any statistic report on several objects.
diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py
index c5bbbbd34ec11101e7cce9468615b681254eaf86..a95235d801740ba815d7da7bda283e41dbd825de 100644
--- a/addons/base_report_designer/__openerp__.py
+++ b/addons/base_report_designer/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'OpenOffice Report Designer Interface',
+    'name': 'OpenOffice Report Designer',
     'version': '0.1',
-    'category': 'Tools',
+    'category': 'Advanced Reporting',
     'complexity': "normal",
     'description': """
 This module is used along with OpenERP OpenOffice Plugin.
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index c483b4324c1fb94e99660b349b563852e5bd9f55..4417ebf2439f69206ad6888e703788f21686a62f 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Base Setup',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 This module helps to configure the system at the installation of a new database.
diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index a87e4e24e3900013e7ae5a71c9fbc9cf95188f1e..312e20c0ffd7d22c4397ceee5341d778ac3a6bc4 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -20,123 +20,319 @@
 ##############################################################################
 import pytz
 
+import simplejson
+import cgi
 import pooler
 import tools
 from osv import fields, osv
 from tools.translate import _
+from lxml import etree
 
 #Application and feature chooser, this could be done by introspecting ir.modules
+DEFAULT_MODULES = {
+    'Customer Relationship Management' : ['crm',],
+    'Sales Management' : ['sale',],
+    'Project Management' : ['project',],
+    'Knowledge Management' : ['document',],
+    'Warehouse Management' : ['stock',],
+    'Manufacturing' : ['mrp', 'procurement'],
+    'Accounting & Finance' : ['account,'],
+    'Purchase Management' : ['purchase,'],
+    'Human Resources' : ['hr',],
+    'Point of Sales' : ['pos',],
+    'Marketing' : ['marketing',],
+}
 
 class base_setup_installer(osv.osv_memory):
     _name = 'base.setup.installer'
+
     _inherit = 'res.config.installer'
 
-    _install_if = {
-        ('sale','crm'): ['sale_crm'],
-        ('sale','project'): ['project_mrp'],
-    }
     _columns = {
-        # Generic modules
-        'crm':fields.boolean('Customer Relationship Management',
-            help="Helps you track and manage relations with customers such as"
-                 " leads, requests or issues. Can automatically send "
-                 "reminders, escalate requests or trigger business-specific "
-                 "actions based on standard events."),
-        'sale':fields.boolean('Sales Management',
-            help="Helps you handle your quotations, sale orders and invoicing"
-                 "."),
-        'project':fields.boolean('Project Management',
-            help="Helps you manage your projects and tasks by tracking them, "
-                 "generating plannings, etc..."),
-        'knowledge':fields.boolean('Knowledge Management',
-            help="Lets you install addons geared towards sharing knowledge "
-                 "with and between your employees."),
-        'stock':fields.boolean('Warehouse Management',
-            help="Helps you manage your inventory and main stock operations: delivery orders, receptions, etc."),
-        'mrp':fields.boolean('Manufacturing',
-            help="Helps you manage your manufacturing processes and generate "
-                 "reports on those processes."),
-        'account_voucher':fields.boolean('Invoicing & Payments',
-            help="Allows you to create your invoices and track the payments. It is an easier version of the accounting module for managers who are not accountants."),
-        'account_accountant':fields.boolean('Accounting & Finance',
-            help="Helps you handle your accounting needs, if you are not an accountant, we suggest you to install only the Invoicing "),
-        'purchase':fields.boolean('Purchase Management',
-            help="Helps you manage your purchase-related processes such as "
-                 "requests for quotations, supplier invoices, etc..."),
-        'hr':fields.boolean('Human Resources',
-            help="Helps you manage your human resources by encoding your employees structure, generating work sheets, tracking attendance and more."),
-        'point_of_sale':fields.boolean('Point of Sales',
-            help="Helps you get the most out of your points of sales with "
-                 "fast sale encoding, simplified payment mode encoding, "
-                 "automatic picking lists generation and more."),
-        'marketing':fields.boolean('Marketing',
-            help="Helps you manage your marketing campaigns step by step."),
-        'profile_tools':fields.boolean('Extra Tools',
-            help="Lets you install various interesting but non-essential tools "
-                "like Survey, Lunch and Ideas box."),
-        'report_designer':fields.boolean('Advanced Reporting',
-            help="Lets you install various tools to simplify and enhance "
-                 "OpenERP's report creation."),
-        # Vertical modules
-        'product_expiry':fields.boolean('Food Industry',
-            help="Installs a preselected set of OpenERP applications "
-                "which will help you manage your industry."),
-        'association':fields.boolean('Associations',
-            help="Installs a preselected set of OpenERP "
-                 "applications which will help you manage your association "
-                 "more efficiently."),
-        'auction':fields.boolean('Auction Houses',
-            help="Installs a preselected set of OpenERP "
-                 "applications selected to help you manage your auctions "
-                 "as well as the business processes around them."),
-        }
+        'selection' : fields.text('Selection'),
+    }
 
-    def _if_knowledge(self, cr, uid, ids, context=None):
-        if self.pool.get('res.users').browse(cr, uid, uid, context=context)\
-               .view == 'simple':
-            return ['document_ftp']
-        return None
+    def fields_get(self, cr, uid, fields=None, context=None):
+        if context is None:
+            context = {}
+        if fields is None:
+            fields = {}
 
-    def _if_misc_tools(self, cr, uid, ids, context=None):
-        return ['profile_tools']
+        fields = {} 
+        category_proxy = self.pool.get('ir.module.category')
+        domain = [('parent_id', '=', False),
+                  ('name', '!=', 'Uncategorized'),
+                  ('visible', '=', True)]
+        category_ids = category_proxy.search(cr, uid, domain, context=context)
+        for category in category_proxy.browse(cr, uid, category_ids, context=context):
+            category_name = 'category_%d' % (category.id,)
+            fields[category_name] = {
+                'type' : 'boolean',
+                'string' : category.name,
+                'name' : category_name,
+                'help' : category.description,
+            }
 
-    def onchange_moduleselection(self, cr, uid, ids, *args, **kargs):
-        value = {}
-        # Calculate progress
-        closed, total = self.get_current_progress(cr, uid)
-        progress = round(100. * closed / (total + len(filter(None, args))))
-        value.update({'progress':progress})
-        if progress < 10.:
-            progress = 10.
-        
-        return {'value':value}
+        module_proxy = self.pool.get('ir.module.module')
+        module_ids = module_proxy.search(cr, uid, [], context=context)
+        for module in module_proxy.browse(cr, uid, module_ids, context=context):
+            module_name = 'module_%d' % (module.id,)
+            module_is_installed = module.state == 'installed'
 
+            fields[module_name] = {
+                'type' : 'boolean',
+                'string' : module.shortdesc,
+                'name' : module_name,
+                'help' : module.description,
+            }
 
-    def execute(self, cr, uid, ids, context=None):
-        module_pool = self.pool.get('ir.module.module')
-        modules_selected = []
-        datas = self.read(cr, uid, ids, context=context)[0]
-        for mod in datas.keys():
-            if mod in ('id', 'progress'):
+        return fields
+
+    def default_get(self, cr, uid, fields=None, context=None):
+        if context is None:
+            context = {}
+        if fields is None:
+            fields = {}
+
+        result = {}
+
+        if 'dont_compute_virtual_attributes' not in context:
+            module_proxy = self.pool.get('ir.module.module')
+            module_ids = module_proxy.search(cr, uid, [], context=context)
+            for module in module_proxy.browse(cr, uid, module_ids, context=context):
+                result['module_%d' % (module.id,)] = module.state == 'installed'
+
+            cat_proxy = self.pool.get('ir.module.category')
+            cat_ids = cat_proxy.search(cr, uid, [], context=context)
+            for cat in cat_proxy.browse(cr, uid, cat_ids, context=context):
+                m = DEFAULT_MODULES.get(cat.name,[])
+                r = module_proxy.search(cr, uid, [('state','=','installed'),('name','in',m)])
+                result['category_%d' % (cat.id,)] = bool(r)
+
+        return result
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='from', context=None, toolbar=False, submenu=False):
+        def in_extended_view_group(cr, uid, context=None):
+            try:
+                model, group_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_extended')
+            except ValueError:
+                return False
+            return group_id in self.pool.get('res.users').read(cr, uid, uid, ['groups_id'], context=context)['groups_id']
+
+        result = super(base_setup_installer, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
+
+        module_category_proxy = self.pool.get('ir.module.category')
+        domain = [('parent_id', '=', False),
+                  ('name', '!=', 'Uncategorized'),
+                  ('visible', '=', True)]
+        module_category_ids = module_category_proxy.search(cr, uid, domain, context=context, order='sequence asc')
+
+        arch = ['<form string="%s">' % _('Automatic Base Setup')]
+        arch.append('<separator string="%s" colspan="4" />' % _('Install Applications'))
+        module_proxy = self.pool.get('ir.module.module')
+
+        extended_view = in_extended_view_group(cr, uid, context=context)
+
+        for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
+            domain = [('category_id', '=', module_category.id)]
+            if not extended_view:
+                domain.append(('complexity', '!=', 'expert'))
+
+            default_modules = DEFAULT_MODULES.get(module_category.name, False)
+            if default_modules:
+                domain.append(('name', 'not in', default_modules))
+
+            modules = module_proxy.browse(cr, uid, module_proxy.search(cr, uid, domain, context=context), context=context)
+            if not modules:
                 continue
-            if datas[mod] == 1:
-                modules_selected.append(mod)
-
-        module_ids = module_pool.search(cr, uid, [('name', 'in', modules_selected)], context=context)
-        need_install = False
-        for module in module_pool.browse(cr, uid, module_ids, context=context):
-            if module.state == 'uninstalled':
-                module_pool.state_update(cr, uid, [module.id], 'to install', ['uninstalled'], context)
-                need_install = True
+
+            readonly = any(module.state == 'installed' for module in modules)
+
+            attributes = {
+                'name' : 'category_%d' % (module_category.id,),
+                'on_change' : 'on_change_%s_%d(category_%d)' % ('category', module_category.id, module_category.id,),
+            }
+            if readonly:
+                attributes['modifiers'] = simplejson.dumps({'readonly' : True})
+
+            arch.append("""<field %s />""" % (" ".join(["%s='%s'" % (key, value,)
+                                                        for key, value in attributes.iteritems()]),))
+
+        # Compute the module to show
+
+        for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
+            domain = [('category_id', '=', module_category.id)]
+
+            if not extended_view:
+                domain.append(('complexity', '!=', 'expert'))
+
+            default_modules = DEFAULT_MODULES.get(module_category.name, False)
+            if default_modules:
+                domain.append(('name', 'not in', default_modules))
+
+            modules = module_proxy.browse(cr, uid, module_proxy.search(cr, uid, domain, context=context), context=context)
+
+            if not modules:
+                continue
+
+            modifiers = {
+                'invisible' : [('category_%d' % (module_category.id), '=', False)],
+            }
+            module_modifiers = dict(modifiers)
+
+            arch.append("""<separator string="%s Features" colspan="4" modifiers='%s'/>""" % (
+                cgi.escape(module_category.name),
+                simplejson.dumps(modifiers))
+            )
+
+            for module in modules:
+                #module_modifiers['readonly'] = module.state == 'installed'
+
+                arch.append("""<field name="module_%d" modifiers='%s' />""" % (
+                    module.id,
+                    simplejson.dumps(module_modifiers))
+                )
+
+        arch.append(
+            '<separator colspan="4" />'
+            '<group colspan="4" col="2">'
+            '<button special="cancel" string="Cancel" icon="gtk-cancel" />'
+            '<button string="Install Modules" type="object" name="apply_cb" icon="gtk-apply" />'
+            '</group>'
+        )
+
+        arch.append('</form>')
+
+        result['arch'] = ''.join(arch)
+        return result
+
+    def __getattr__(self, name):
+        if name.startswith('on_change_category_'):
+            def proxy(cr, uid, ids, value, context=None):
+                item = 'category_%s' % name[len('on_change_category_'):]
+                return self._on_change_selection(cr, uid, ids, item, value, context=context)
+            return proxy
+        return getattr(super(base_setup_installer, self), name)
+
+    def _on_change_selection(self, cr, uid, ids, item, value, context=None):
+        if not isinstance(item, basestring) or not value:
+            return {}
+
+        if item.startswith('category_') or item.startswith('module_'):
+            object_name, identifier = item.split('_')
+        else:
+            return {}
+
+        values = {
+        }
+
+        #if object_name == 'category':
+        #    module_ids = self.pool.get('ir.module.module').search(cr, uid, [('category_id', '=', int(identifier))], context=context)
+        #    for module_id in module_ids:
+        #        values['module_%d' % module_id] = 1
+
+        return {'value': values}
+
+    def create(self, cr, uid, values, context=None):
+        to_install = {'categories' : [], 'modules' : []}
+
+        for key, value in values.iteritems():
+            if value == 1 and (key.startswith('module_') or key.startswith('category_')):
+                kind, identifier = key.split('_')
+                if kind == 'category':
+                    to_install['categories'].append(long(identifier))
+                if kind == 'module':
+                    to_install['modules'].append(long(identifier))
+
+        values = {
+            'selection' : simplejson.dumps(to_install),
+        }
+        context.update(dont_compute_virtual_attributes=True)
+        return super(base_setup_installer, self).create(cr, uid, values, context=context)
+
+    def apply_cb(self, cr, uid, ids, context=None):
+        category_proxy = self.pool.get('ir.module.category')
+        for installer in self.browse(cr, uid, ids, context=context):
+            to_install = simplejson.loads(installer.selection)
+
+            proxy = self.pool.get('ir.module.module')
+
+            module_ids = proxy.search(cr, uid, [('id', 'in', to_install['modules'])], context=context)
+            modules = set(record['name']
+                          for record in proxy.read(cr, uid, module_ids, ['name'], context=context))
+
+            category_ids = category_proxy.search(cr, uid, [('id', 'in', to_install['categories'])], context=context)
+            selected_categories = set(record['name']
+                                      for record in category_proxy.read(cr, uid, category_ids, ['name'], context=context))
+
+            # FIXME: Use a workaround, but can do better
+            for category_name, default_modules in DEFAULT_MODULES.iteritems():
+                if category_name in selected_categories:
+                    modules.update(default_modules)
+
+            # Special Cases:
+            # * project_mrp: the dependencies are sale, project, procurement, mrp_jit
+            if 'sale' in modules and 'project' in modules:
+                modules.add('project_mrp')
+
+            need_update = False
+            module_ids = proxy.search(cr, uid, [('name', 'in', list(modules))], context=context)
+            if module_ids:
+                proxy.state_update(cr, uid, module_ids, 'to install', ['uninstalled'], context=context)
+                need_update = True
+
+            category_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'module_category_link')
+            while True and category_id:
+                cr.execute("select id, name from ir_module_module m where category_id = %s \
+                           and (select count(d.id) from ir_module_module_dependency d \
+                           where d.module_id = m.id) = (select count(d.id) from \
+                           ir_module_module_dependency d inner join ir_module_module m2 on d.name = m2.name \
+                           where d.module_id=m.id and m2.state in %s ) and state = %s",
+                          (category_id[1], ('installed', 'to install', 'to upgrade', ), 'uninstalled',))
+                modules = [name for _, name in cr.fetchall()]
+
+                module_ids = proxy.search(cr, uid, [('name', 'in', modules)], context=context)
+                if not module_ids:
+                    break
+
+                proxy.state_update(cr, uid, module_ids, 'to install', ['uninstalled'], context=context)
+                need_update = True
+
+            if need_update:
                 cr.commit()
-            elif module.state == 'installed':
-                cr.execute("update ir_actions_todo set state='open' \
-                                    from ir_model_data as data where data.res_id = ir_actions_todo.id \
-                                    and ir_actions_todo.type='special'\
-                                    and data.model = 'ir.actions.todo' and data.module=%s", (module.name, ))
-        if need_install:
-            self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
-        return
+                self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
+
+        if 'html' in context:
+            return {'type' : 'ir.actions.reload'}
+        else:
+            return {'type' : 'ir.actions.act_window_close'}
+
+    # TODO: To implement in this new wizard
+    #def execute(self, cr, uid, ids, context=None):
+    #    module_pool = self.pool.get('ir.module.module')
+    #    modules_selected = []
+    #    datas = self.read(cr, uid, ids, context=context)[0]
+    #    for mod in datas.keys():
+    #        if mod in ('id', 'progress'):
+    #            continue
+    #        if datas[mod] == 1:
+    #            modules_selected.append(mod)
+
+    #    module_ids = module_pool.search(cr, uid, [('name', 'in', modules_selected)], context=context)
+    #    need_install = False
+    #    for module in module_pool.browse(cr, uid, module_ids, context=context):
+    #        if module.state == 'uninstalled':
+    #            module_pool.state_update(cr, uid, [module.id], 'to install', ['uninstalled'], context)
+    #            need_install = True
+    #            cr.commit()
+    #        elif module.state == 'installed':
+    #            cr.execute("update ir_actions_todo set state='open' \
+    #                                from ir_model_data as data where data.res_id = ir_actions_todo.id \
+    #                                and ir_actions_todo.type='special'\
+    #                                and data.model = 'ir.actions.todo' and data.module=%s", (module.name, ))
+    #    if need_install:
+    #        self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
+    #    return
 
 #Migrate data from another application Conf wiz
 
@@ -158,11 +354,10 @@ class product_installer(osv.osv_memory):
     _name = 'product.installer'
     _inherit = 'res.config'
     _columns = {
-                'customers': fields.selection([('create','Create'), ('import','Import')], 'Customers', size=32, required=True, help="Import or create customers"),
-
+        'customers': fields.selection([('create','Create'), ('import','Import')], 'Customers', size=32, required=True, help="Import or create customers"),
     }
     _defaults = {
-                 'customers': 'create',
+        'customers': 'create',
     }
 
     def execute(self, cr, uid, ids, context=None):
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 2e2808d9ff4f783c15469da66a143837bda40ac9..01051c4cc6057672851e06a1fc9130171718d20e 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -1,87 +1,35 @@
 <openerp>
   <data>
 
-    <record id="view_base_setup_installer" model="ir.ui.view">
-      <field name="name">base.setup.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <form position="attributes">
-            <attribute name="string">Install Applications</attribute>
-          </form>
-          <xpath expr="//label[@string='description']" position="attributes">
-                <attribute name="string">Select the Applications you want your system to cover. If you are not sure about your exact needs at this stage, you can easily install them later.</attribute>
-          </xpath>
-          <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
-                    <attribute name="string"/>
-                    <attribute name="rowspan">15</attribute>
-          </xpath>
-          <xpath expr="//button[@string='Install Modules']" position="attributes">
-                    <attribute name="string">Install</attribute>
-          </xpath>
-          <separator string="title" position="attributes">
-            <attribute name="string">Install Applications</attribute>
-          </separator>
-          <group colspan="8">
-            <field name="crm" />
-            <field name="sale" />
-            <field name="project" />
-            <field name="knowledge" />
-            <field name="stock" />
-            <field name="mrp" />
-            <field name="account_voucher" />
-            <field name="account_accountant" />
-            <field name="purchase" />
-            <field name="hr" />
-            <field name="profile_tools" />
-            <field name="marketing" groups="base.group_extended" />
-            <field name="point_of_sale"/>
-            <field name="report_designer" groups="base.group_extended" />
-            <separator string="Install Specific Industry Applications" colspan="4"/>
-            <field name="association" />
-            <field name="auction" />
-            <field name="product_expiry" />
-            <group name="crm"/>
-            <group name="sale"/>
-            <group name="project"/>
-            <group name="knowledge"/>
-            <group name="mrp"/>
-            <group name="account_accountant"/>
-            <group name="purchase"/>
-            <group name="hr"/>
-            <group name="profile_tools"/>
-            <group name="marketing"/>
-            <group name="report_designer"/>
-            <group name="association"/>
-          </group>
-        </data>
-      </field>
-    </record>
-    <record id="action_base_setup_installer" model="ir.actions.act_window">
-      <field name="name">Install Applications</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">base.setup.installer</field>
-      <field name="view_id" ref="view_base_setup_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-    <record id="base_setup_installer_todo" model="ir.actions.todo">
-        <field name="action_id" ref="action_base_setup_installer"/>
-        <field name="category_id" ref="base.category_administration_config"/>
-        <field name="sequence">2</field>
-    </record>
+      <record model="ir.actions.act_window" id="action_base_setup_installer_beta">
+          <field name="name">Install Applications</field>
+          <field name="res_model">base.setup.installer</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">form</field>
+          <field name="target">new</field>
+      </record>
 
-    <record id="action_start_configurator" model="ir.actions.server">
-      <field name="name">Start Configuration</field>
-      <field name="model_id" ref="base.model_ir_actions_todo"/>
-      <field name="state">code</field>
-      <field name="code" eval="'# obj is a browse_record and will provide stupid ids to method\n' 'action = pool.get(\'ir.actions.todo\').action_launch(cr, uid, ' + str([ref('base_setup_installer_todo')]) + ', context=context)'"/>
-    </record>
 
-    <menuitem name="Add More Features" action="action_start_configurator" id="menu_view_base_module_configuration" parent="base.menu_config" type="server" icon="STOCK_EXECUTE" sequence="100"/>
+      <record id="base_setup_installer_todo" model="ir.actions.todo">
+          <field name="action_id" ref="action_base_setup_installer_beta" />
+          <field name="category_id" ref="base.category_administration_config"/>
+          <field name="sequence">2</field>
+      </record>
+
+      <record id="action_start_configurator" model="ir.actions.server">
+          <field name="name">Start Configuration</field>
+          <field name="model_id" ref="base.model_ir_actions_todo"/>
+          <field name="state">code</field>
+          <field name="code" eval="'# obj is a browse_record and will provide stupid ids to method\n' 'action = pool.get(\'ir.actions.todo\').action_launch(cr, uid, ' + str([ref('base_setup_installer_todo')]) + ', context=context)'"/>
+      </record>
+
+      <menuitem name="Add More Features" action="action_start_configurator" id="menu_view_base_module_configuration" parent="base.menu_config" type="server" icon="STOCK_EXECUTE" sequence="100"/>
+      <record id="ir_ui_view_sc_configuration" model="ir.ui.view_sc">
+          <field name="name">Add More Features</field>
+          <field name="resource">ir.ui.menu</field>
+          <field name="user_id" ref="base.user_root"/>
+          <field name="res_id" ref="menu_view_base_module_configuration" />
+      </record>
 
      <!-- Import or create customers configartion view  -->
      <record id="action_import_create_installer" model="ir.actions.act_window">
diff --git a/addons/base_synchro/__openerp__.py b/addons/base_synchro/__openerp__.py
index a95dcff71da1e081bb6265eab9959262c2802895..fba793e047356017143111bcb7ed8266d58701ae 100644
--- a/addons/base_synchro/__openerp__.py
+++ b/addons/base_synchro/__openerp__.py
@@ -23,7 +23,7 @@
         "name":"Server Object Synchronization",
         "version":"0.1",
         "author":"OpenERP SA",
-        "category":"Tools",
+        "category":"Hidden",
         "description": """
 Synchronization with all objects.
 =================================
diff --git a/addons/base_tools/__openerp__.py b/addons/base_tools/__openerp__.py
index aade76640416e53e731c88e76a6d82de10461f49..ec32805533ea82bc55471ef2c09eab1465dfdd3d 100644
--- a/addons/base_tools/__openerp__.py
+++ b/addons/base_tools/__openerp__.py
@@ -4,7 +4,7 @@
     "author": "OpenERP SA",
     "version": "1.0",
     "depends": ["base"],
-    "category" : "Tools",
+    "category" : "Hidden",
     'complexity': "easy",
     'description': """
 Common base for tools modules.
diff --git a/addons/base_vat/__openerp__.py b/addons/base_vat/__openerp__.py
index 29f402aa286d1339e02aa2a3d64fd4d3333175a2..5f7c1d2d86d3adfdc74bdc034c2bf172b19aae0c 100644
--- a/addons/base_vat/__openerp__.py
+++ b/addons/base_vat/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'VAT Number Validation',
     'version': '1.0',
-    'category': 'Finance',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 VAT validation for Partners' VAT numbers
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index f4de253c4f5b53adf9e6126af46669c89597eb41..7f37f1259035548e329013232db12c811d197b50 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Dashboard Creator',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "normal",
     'description': """
 Lets the user create a custom dashboard.
diff --git a/addons/caldav/__openerp__.py b/addons/caldav/__openerp__.py
index edf852e4d5ed44b11e21d4bc037101d89fdd4d0c..53bee3d0e946aab22c87362f02d1c7c9217402c2 100644
--- a/addons/caldav/__openerp__.py
+++ b/addons/caldav/__openerp__.py
@@ -49,7 +49,7 @@ To access OpenERP Calendar using WebCal to remote site use the URL like:
         DATABASE_NAME: Name of database on which OpenERP Calendar is created
         CALENDAR_NAME: Name of calendar to access
 """, 
-    'category': 'Tools', 
+    'category': 'Hidden', 
     "author" : "OpenERP SA",
     'website': 'http://www.openerp.com',
     "init_xml" : ["caldav_data.xml"],
diff --git a/addons/claim_from_delivery/__openerp__.py b/addons/claim_from_delivery/__openerp__.py
index 2e69400822610f9aa5c00e947ab408e542b7eae5..c3eec37a229a95f74c66a55656e3b00e23ed15af 100644
--- a/addons/claim_from_delivery/__openerp__.py
+++ b/addons/claim_from_delivery/__openerp__.py
@@ -21,7 +21,7 @@
     "name" : "Claim from Delivery",
     "version" : "1.0",
     "author" : "OpenERP SA",
-    "category" : "Warehouse",
+    "category" : "Hidden",
     "depends" : ["base", "crm_claim", "stock"],
     "init_xml" : [],
     "demo_xml" : [],
diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py
index 6e57fa5e8c3440fe9eeee292b041997847ad5094..214c5c3d45070522bd7f30ab6f4642562648d1f2 100644
--- a/addons/crm/__init__.py
+++ b/addons/crm/__init__.py
@@ -25,7 +25,6 @@ import crm_segmentation
 import crm_meeting
 import crm_lead
 import crm_phonecall
-import crm_installer
 import report
 import wizard
 import res_partner
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index c3f28c6a66fac5b621078a63dd01594a89d844ad..a6f5f1630f7b57958f67e606efc837c96bee395b 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Customer & Supplier Relationship Management',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Customer Relationship Management',
     'complexity': "easy",
     'description': """
 The generic OpenERP Customer Relationship Management.
diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py
deleted file mode 100644
index fc3816c80fab13c999e52739afeb5931ebec25b1..0000000000000000000000000000000000000000
--- a/addons/crm/crm_installer.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from lxml import etree
-from osv import fields, osv
-
-class crm_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        'name': fields.char('Name', size=64),
-        'crm_helpdesk': fields.boolean('Helpdesk', help="Manages a Helpdesk service."),
-        'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fundraising process and tracking."),
-        'crm_claim': fields.boolean('Claims', help="Manages the suppliers and customers claims, including your corrective or preventive actions."),
-        'import_sugarcrm': fields.boolean('Import Data from SugarCRM', help="Help you to import and update data from SugarCRM to OpenERP"),
-        'crm_caldav': fields.boolean('Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."),
-        'sale_crm': fields.boolean('Opportunity to Quotation', help="Create a Quotation from an Opportunity."),
-        'fetchmail': fields.boolean('Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."),
-        'thunderbird': fields.boolean('Thunderbird Plug-In', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
-        'outlook': fields.boolean('MS-Outlook Plug-In', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
-        'wiki_sale_faq': fields.boolean('Sale FAQ', help="Helps you manage wiki pages for Frequently Asked Questions on Sales Application."),
-        'import_google': fields.boolean('Google Import', help="Imports contacts and events from your google account."),
-    }
-
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        res = super(crm_installer, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
-        #Checking sale module is installed or not
-        cr.execute("SELECT * from ir_module_module where state='installed' and name = 'sale'")
-        count = cr.fetchall()
-        if count:
-            doc = etree.XML(res['arch'])
-            nodes = doc.xpath("//field[@name='sale_crm']")
-            for node in nodes:
-                node.set('invisible', '0')
-                node.set('modifiers', '{}')
-            res['arch'] = etree.tostring(doc)
-        return res
-
-crm_installer()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index b840b609c61a751ecdcff2dffbea9085c4d968b9..ecaec91cef695d5a400627f2c8fc2cc6a80a0d7e 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -1,29 +1,5 @@
 <openerp>
   <data>
-    <record id="view_crm_installer" model="ir.ui.view">
-      <field name="name">crm.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <xpath expr="//group[@name='crm']" position="replace">
-            <newline/>
-            <separator string="Customer Relationship Management Features" colspan="4"/>
-            <field name="crm_claim" groups="base.group_extended"/>
-            <field name="crm_helpdesk" groups="base.group_extended"/>
-            <field name="crm_fundraising" groups="base.group_extended"/>
-            <field name="wiki_sale_faq" groups="base.group_extended"/>
-            <field name="sale_crm" invisible="1" groups="base.group_extended"/>
-            <field name="crm_caldav"/>
-            <field name="import_sugarcrm"/>
-            <field name="fetchmail"/>
-            <field name="thunderbird"/>
-            <field name="outlook"/>
-          </xpath>
-        </data>
-      </field>
-    </record>
     
     <record model="ir.actions.act_window" id="crm_case_section_view_form_installer">
         <field name="name">Define Sales Team</field>
diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py
index fdbde1c8d2d579c61cfb9eb045fb17b312a9e79a..8f1812862c5abd07ca2393b2317b552a63ac527e 100644
--- a/addons/crm_caldav/__openerp__.py
+++ b/addons/crm_caldav/__openerp__.py
@@ -22,10 +22,9 @@
 
 
 {
-    'name': 'Extended Module to Add CalDav feature on Meeting',
+    'name': 'Calendar Synchronizing',
     'version': '1.1',
-    'category': 'Sales',
-    'category': 'Generic Modules/CRM & SRM',
+    'category': 'Customer Relationship Management',
     'complexity': "normal",
     'description': """
 Caldav features in Meeting.
diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index 696298d275bd3a2fc9a04cd95b2b896dc05f2d67..ae493c5dac23fa7b9aec9555dcfc22b06cf6b252 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Customer & Supplier Claims Management',
+    'name': 'Claims',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Customer Relationship Management',
     'complexity': "easy",
     'description': """
 This modules allows you to track your customers/suppliers claims and grievances.
diff --git a/addons/crm_fundraising/__openerp__.py b/addons/crm_fundraising/__openerp__.py
index 7a37bd13d16f3f4ff5cec816f8032c2559f11744..2d75f9e69b7d42eef4a733f6d22ced08c91ecf1e 100644
--- a/addons/crm_fundraising/__openerp__.py
+++ b/addons/crm_fundraising/__openerp__.py
@@ -21,8 +21,8 @@
 
 
 {
-    'category': 'Sales', 
-    'name': 'CRM Fundraising',
+    'category': 'Customer Relationship Management', 
+    'name': 'Fundraising',
     'version': '1.0',
     'complexity': "easy",
     'description': """
diff --git a/addons/crm_helpdesk/__openerp__.py b/addons/crm_helpdesk/__openerp__.py
index b69f1de1b08a3203bc1521628f48fee6da05385d..5124c3c58178013d40f3dd3f37814fc18369d7be 100644
--- a/addons/crm_helpdesk/__openerp__.py
+++ b/addons/crm_helpdesk/__openerp__.py
@@ -21,8 +21,8 @@
 
 
 {
-    'category': 'Sales', 
-    'name': 'CRM Helpdesk',
+    'category': 'Customer Relationship Management', 
+    'name': 'Helpdesk',
     'version': '1.0',
     'complexity': "easy",
     'description': """
diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index eca5307df910b933923faf18dfc5310838f91b80..9e72204e31d1f12e5dcecb29076b2a2b058e6831 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Partner Geo-Localization',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Hidden',
     'complexity': "normal",
     'description': """
 This is the module used by OpenERP SA to redirect customers to its partners, based on geolocalization.
diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py
index 98d69aca7b528ee93e93ee15aa202e3b30c42857..656f8360f0bf1b8c3685354ca400ba31c5515099 100644
--- a/addons/crm_profiling/__openerp__.py
+++ b/addons/crm_profiling/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'CRM Profiling Management - To Perform Segmentation within Partners',
+    'name': 'Profiling Tools',
     'version': '1.3',
-    'category': 'Sales',
+    'category': 'Marketing',
     'complexity': "easy",
     'description': """
 This module allows users to perform segmentation within partners.
diff --git a/addons/decimal_precision/__openerp__.py b/addons/decimal_precision/__openerp__.py
index a2e94c7f58d3577b0fb2485f0c83995e7467a034..b8ac25eb3792535cf608e670645368501b253d33 100644
--- a/addons/decimal_precision/__openerp__.py
+++ b/addons/decimal_precision/__openerp__.py
@@ -30,7 +30,7 @@ The decimal precision is configured per company.
     "author": "OpenERP SA",
     "version": "0.1",
     "depends": ["base"],
-    "category" : "Tools",
+    "category" : "Hidden",
     'complexity': "easy",
     "init_xml": [],
     "update_xml": [
diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index e9fa8240e2160b4d9947298d6086255cc7bb9aa2..40dab751f7924bd4ec4527ea1d7c6c2befc9e7cd 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Carriers and Deliveries',
+    'name': 'Delivery Costs',
     'version': '1.0',
-    'category': 'Warehouse',
+    'category': 'Sales Management',
     'complexity': "normal",
     'description': """
 Allows you to add delivery methods in sale orders and picking.
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index c98daa4eaaf9a0503a4cc90d05b141d665be49a5..6b9cbd21f48d854248a08e9b050531f7db02b5ee 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -23,8 +23,7 @@
 {
     'name': 'Integrated Document Management System',
     'version': '2.1',
-    'category': 'Tools',
-    'category': 'Generic Modules/Others',
+    'category': 'Knowledge Management',
     'complexity': "normal",
     'description': """
 This is a complete document management system.
diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py
index 2683ba5ef0a8022aa901465b0e2b2e4f77d3af46..07de65825d8d43585e31511e8e2572dae02136a3 100644
--- a/addons/document_ftp/__openerp__.py
+++ b/addons/document_ftp/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Integrated FTP Server with Document Management System',
+    'name': 'Shared Repositories (FTP)',
     'version': '1.99',
-    'category': 'Tools',
+    'category': 'Knowledge Management',
     'complexity': "normal",
     'description': """
 This is a support FTP Interface with document management system.
diff --git a/addons/document_ics/__openerp__.py b/addons/document_ics/__openerp__.py
index 56bb8f11feec8e687877ac43a74092d4899f268b..7d718266d6ae5b8159f554281cbe854ded8ab579 100644
--- a/addons/document_ics/__openerp__.py
+++ b/addons/document_ics/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Support for iCal based on Document Management System',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "normal",
     'description': """
 Allows to synchronise calendars with others applications.
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index dc74085ab6f864046bb5a0beb09a798413d4cb8a..5576c17ba647f210f7a8971fefc66fa7532c3940 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -29,10 +29,10 @@
 ##############################################################################
 
 {
-        "name" : "WebDAV server for Document Management",
+        "name" : "Shared Repositories (WebDAV)",
         "version" : "2.3",
         "author" : "OpenERP SA",
-        "category" : "Tools",
+        "category" : "Knowledge Management",
         'complexity': "normal",
         "website": "http://www.openerp.com",
         "description": """
diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index e5f83f9ac0c8a0664207a0beb20e0a61979e5827..06fa969c0c2f6628ae6abb45ef60b1005653c17c 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -21,11 +21,11 @@
 ##############################################################################
 
 {
-    "name" : "Email Templates",
+    "name" : "Automated E-Mails",
     "version" : "1.1",
     "author" : "Openlabs",
     "website" : "http://openerp.com",
-    "category" : "Tools",
+    "category" : "Marketing",
     'complexity': "expert",
     "depends" : ['mail'],
     "description": """
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 9a9acaf0fb3a5489440ae58dcb327d85ae93ec6e..1890ed7bf843316061ef193232534d76b047d1d5 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Event',
     'version': '0.1',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 Organization and management of Events.
diff --git a/addons/event_project/__openerp__.py b/addons/event_project/__openerp__.py
index ddd32c376316a4bde086fb5a702068fc9b01d5b1..e8d110bc4f825b82ce5b52b8d051733f2a5e8ada 100644
--- a/addons/event_project/__openerp__.py
+++ b/addons/event_project/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Event Project - Create Retro-Planning to manage your Events',
     'version': '0.1',
-    'category': 'Tools',
+    'category': 'Hidden/Link',
     'complexity': "easy",
     'description': """
 Organization and management of events.
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index 986c3bc12a13b5e93b08bc05704d38a96b57d6c0..ae082aacacddecff4f02635691ad39cbdd1ab2be 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -21,11 +21,11 @@
 ##############################################################################
 
 {
-    "name" : "Automated Email Retriever",
+    "name" : "Fetch Emails",
     "version" : "1.0",
     "depends" : ["base", 'mail'],
     "author" : "OpenERP SA",
-    "category": 'Tools',
+    "category": 'Customer Relationship Management',
     "description": """
 Retrieve incoming email on POP / IMAP servers
 =============================================
diff --git a/addons/fetchmail_crm/__openerp__.py b/addons/fetchmail_crm/__openerp__.py
index 2be9920ee832347d65da0c90d066637676a7c19d..66cff346d0aed41edc504456661e788d211423e1 100644
--- a/addons/fetchmail_crm/__openerp__.py
+++ b/addons/fetchmail_crm/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "depends" : ["fetchmail", "crm"],
     "author" : "OpenERP SA",
-    "category": 'Tools',
+    "category": 'Hidden/Link',
     "description": """
     """,
     'website': 'http://www.openerp.com',
diff --git a/addons/fetchmail_crm_claim/__openerp__.py b/addons/fetchmail_crm_claim/__openerp__.py
index b8f0fa244708a8718ca9e66a61aefe3da15cc546..cfe6a675d205e8c3c09bcafaaf62bd3a12c3ff2a 100644
--- a/addons/fetchmail_crm_claim/__openerp__.py
+++ b/addons/fetchmail_crm_claim/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "depends" : ["fetchmail", "crm_claim"],
     "author" : "OpenERP SA",
-    "category": 'Tools',
+    "category": 'Hidden/Link',
     "description": """
     """,
     'website': 'http://www.openerp.com',
diff --git a/addons/fetchmail_hr_recruitment/__openerp__.py b/addons/fetchmail_hr_recruitment/__openerp__.py
index fd5b8346227cf6dd6c301057d0551cbfbcd1904e..755310976457ec563bf755575d6df4a2e2706167 100644
--- a/addons/fetchmail_hr_recruitment/__openerp__.py
+++ b/addons/fetchmail_hr_recruitment/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "depends" : ["fetchmail", "hr_recruitment"],
     "author" : "OpenERP SA",
-    "category": 'Tools',
+    "category": 'Hidden/Link',
     "description": """
     """,
     'website': 'http://www.openerp.com',
diff --git a/addons/fetchmail_project_issue/__openerp__.py b/addons/fetchmail_project_issue/__openerp__.py
index 641012fc9abb561f018036e19008caca9a407582..1165949108a0ffdededeea484cf4340927adb826 100644
--- a/addons/fetchmail_project_issue/__openerp__.py
+++ b/addons/fetchmail_project_issue/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "depends" : ["fetchmail", "project_issue"],
     "author" : "OpenERP SA",
-    "category": 'Tools',
+    "category": 'Hidden/Link',
     "description": """
     """,
     'website': 'http://www.openerp.com',
diff --git a/addons/google_base_account/__openerp__.py b/addons/google_base_account/__openerp__.py
index 409ca205c74d1dc9a29af1fb48f1bb06028ded0d..19afc18bf099f3647be52d15a379c561a515e003 100644
--- a/addons/google_base_account/__openerp__.py
+++ b/addons/google_base_account/__openerp__.py
@@ -23,8 +23,8 @@
 {
     'name': 'Google user',
     'version': '1.0',
-    'category': 'Generic Modules/Others',
-    'description': """The module adds google user  in res user""",
+    'category': 'Hidden',
+    'description': """The module adds google user in res user""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
diff --git a/addons/google_map/__openerp__.py b/addons/google_map/__openerp__.py
index 5c48a9370d7a4fad03b1e57e21b231dcdb3abf87..423351a53efc269d980e1c7b8f79e6c833d12156 100644
--- a/addons/google_map/__openerp__.py
+++ b/addons/google_map/__openerp__.py
@@ -23,9 +23,7 @@
 {
     'name': 'Google Map',
     'version': '1.0',
-    'category': 'Tools',
-    'complexity': "easy",
-    'category': 'Generic Modules/Others',
+    'category': 'Hidden',
     'description': """
 The module adds Google Map field in partner address.
 ====================================================
diff --git a/addons/hr/__init__.py b/addons/hr/__init__.py
index 769e894f1bb447ee112a431717901bd3db4381d9..e2ff754ad358097332915fae62becc2bc5852120 100644
--- a/addons/hr/__init__.py
+++ b/addons/hr/__init__.py
@@ -21,9 +21,8 @@
 
 import hr_department
 import hr
-import installer
 
 import report
 import wizard
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index d2c235313d0a56827ab607aa57c855c61ef1f523..263f842b5b48ecb3b7ded4767ccb158ce1ae5e3f 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -1,29 +1,6 @@
 <openerp>
     <data>
 
-        <record id="view_hr_installer" model="ir.ui.view">
-            <field name="name">hr.installer.view</field>
-            <field name="model">base.setup.installer</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//group[@name='hr']" position="replace">
-                        <newline/>
-                        <separator string="Human Resources Features" colspan="4"/>
-                        <field name="hr_holidays"/>
-                        <field name="hr_expense"/>
-                        <field name="hr_recruitment"/>
-                        <field name="hr_timesheet_sheet"/>
-                        <field name="hr_contract"/>
-                        <field name="hr_attendance"/>
-                        <field name="hr_evaluation"/>
-                        <field name="hr_payroll"/>
-                        <field name="hr_payroll_account" groups="base.group_extended"/>
-                    </xpath>
-                </data>
-            </field>
-        </record>
 
         <record id="category_hr_management_config" model="ir.actions.todo.category">
             <field name="name">HR Management</field>
diff --git a/addons/hr/installer.py b/addons/hr/installer.py
deleted file mode 100644
index 3916acaeb1e0cb3f630f72b5a0357e6de28be3d7..0000000000000000000000000000000000000000
--- a/addons/hr/installer.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from osv import fields, osv
-
-class hr_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-    _columns = {
-        # Human Resources Management
-        'hr_holidays': fields.boolean('Leaves Management',
-            help="Tracks employee leaves, allocation requests and planning."),
-        'hr_expense': fields.boolean('Expenses',
-            help="Tracks and manages employee expenses, and can "
-                 "automatically re-invoice clients if the expenses are "
-                 "project-related."),
-        'hr_recruitment': fields.boolean('Recruitment Process',
-            help="Helps you manage and streamline your recruitment process."),
-        'hr_timesheet_sheet':fields.boolean('Timesheets',
-            help="Tracks and helps employees encode and validate timesheets "
-                 "and attendances."),
-        'hr_contract': fields.boolean("Employee's Contracts",
-            help="Extends employee profiles to help manage their contracts."),
-        'hr_evaluation': fields.boolean('Periodic Evaluations',
-            help="Lets you create and manage the periodic evaluation and "
-                 "performance review of employees."),
-        'hr_attendance': fields.boolean('Attendances',
-            help="Simplifies the management of employee's attendances."),
-        'hr_payroll': fields.boolean('Payroll',
-            help="Generic Payroll system."),
-        'hr_payroll_account': fields.boolean('Payroll Accounting',
-            help="Generic Payroll system Integrated with Accountings."),
-        }
-hr_installer()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index f7111fdb1916eb768a32a780b5d58ac359b2169e..3d9459101440ca82cd2e0e24fb8754b65345d94f 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Attendances Of Employees',
+    'name': 'Attendances',
     'version': '1.1',
     'category': 'Human Resources',
     'complexity': "easy",
diff --git a/addons/hr_contract/__openerp__.py b/addons/hr_contract/__openerp__.py
index 091204fcf74ffaca964084a74a3a5a9162780057..a0d303383f7d67145561d2fa11d30b435855284b 100644
--- a/addons/hr_contract/__openerp__.py
+++ b/addons/hr_contract/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Human Resources Contracts',
+    'name': "Employee's Contracts",
     'version': '1.0',
     'category': 'Human Resources',
     'complexity': "easy",
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 6deba41c05f1c3d7f5f2cad572737b10e8157b52..bed442dc2ad71bc9c93978edb47ee4bf1a52d83a 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name" : "Human Resources Evaluation",
+    "name" : "Periodic Evaluations",
     "version": "0.1",
     "author": "OpenERP SA",
     "category": "Human Resources",
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 09352fcfa8914a2db078098217faf746e0b9b5c1..4a22f00e076543de53489210279982f812b60c1d 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Human Resources Expenses Tracking',
+    'name': 'Expenses',
     'version': '1.0',
     'category': 'Human Resources',
     'complexity': "easy",
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 63c2eb76195a0acad59e2ad437fa1cbd914493e9..563bb409b415cdc5f9e37bc650f957d537149d20 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    "name": "Human Resources: Holidays management",
+    "name": "Leaves Management",
     "version": "1.5",
     "author": ['OpenERP SA', 'Axelor'],
     "category": "Human Resources",
diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 9e7debaa992fee750db4c3e0cd9bbefa4ceaf290..34e8924bea54bdd9a4ae4f3d95b9d201e287fad1 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 {
-    'name': 'Human Resource Payroll',
+    'name': 'Payroll',
     'version': '1.0',
     'category': 'Human Resources',
     'complexity': "expert",
diff --git a/addons/hr_payroll_account/__openerp__.py b/addons/hr_payroll_account/__openerp__.py
index 5a7f67d5d212393c8b40f4dfdcaac4e39f2eee98..beaa08b56cd3813ef03e5a648c12bc8f373fd68a 100644
--- a/addons/hr_payroll_account/__openerp__.py
+++ b/addons/hr_payroll_account/__openerp__.py
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 {
-    'name': 'Human Resource Payroll Accounting',
+    'name': 'Payroll Accounting',
     'version': '1.0',
     'category': 'Human Resources',
     'complexity': "expert",
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 790ac78cd4f4d8d9e63dd3fd259ddbc5a5a738de..b728609c53d615e6607c2f7075d84a456065e322 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 {
-    'name': 'HR - Recruitment',
+    'name': 'Recruitment Process',
     'version': '1.0',
     'category': 'Human Resources',
     'complexity': "easy",
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index 40e3f720da1ddc5881542ceb9be9acfb9939d7f9..76886a45aafc83967fdf48dbc5e98b6d0c9cc094 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Human Resources (Timesheet encoding)',
     'version': '1.0',
-    'category': 'Human Resources',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 This module implements a timesheet system.
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index 95682d00ef0c2ef32e55ec6b0376c2d8b64e9706..d4237baf36c2e3e70f600ede06c26715fc392cad 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Invoice on analytic lines',
     'version': '1.0',
-    'category': 'Human Resources',
+    'category': 'Hidden/Link',
     'description': """Generate your Invoices from Expenses, Timesheet Entries, ...
 Module to generate invoices based on costs (human resources, expenses, ...).
 ============================================================================
diff --git a/addons/html_view/__openerp__.py b/addons/html_view/__openerp__.py
index c4a7f0339930e224ce41edb4ed59f88948020f9e..3deceff9d6f2f307d6df9f110b6990aee9b9536d 100644
--- a/addons/html_view/__openerp__.py
+++ b/addons/html_view/__openerp__.py
@@ -2,7 +2,7 @@
     "name" : "Html View",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category" : "Tools",
+    "category" : "Hidden",
     "depends" : ['base'],
     "init_xml" : ['html_view.xml'],
     "demo_xml" : [],
diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py
index 2a561a93b81a31b6d545a11d4c17ea9d448b3fdb..e6dab775d6e3e894431f71b1f679507157c0984b 100644
--- a/addons/idea/__openerp__.py
+++ b/addons/idea/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Idea Manager',
+    'name': 'Ideas Box',
     'version': '0.1',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 This module allows your user to easily and efficiently participate in enterprise innovation.
diff --git a/addons/import_base/__openerp__.py b/addons/import_base/__openerp__.py
index f244338a7e375f79aba0979cbcc3b5746921488e..6d4f4374dfe203c869c25cdc54921b77b8972948 100644
--- a/addons/import_base/__openerp__.py
+++ b/addons/import_base/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Base framework for module that need to import complex data',
     'version': '0.9',
-    'category': 'Generic Modules',
+    'category': 'Hidden',
     'description': """
         This module provide a class import_framework to help importing 
         complex data from other software
diff --git a/addons/import_google/__openerp__.py b/addons/import_google/__openerp__.py
index f1ab89a041d0d171cf6f7406be9197a84fe22f03..a0a15756ec312fb2dd8aab10a4cf19c5e589332e 100644
--- a/addons/import_google/__openerp__.py
+++ b/addons/import_google/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Google Import',
     'version': '1.0',
-    'category': 'Generic Modules/Others',
+    'category': 'Customer Relationship Management',
     'description': """The module adds google contact in partner address and add google calendar events details in Meeting""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
diff --git a/addons/import_sugarcrm/__openerp__.py b/addons/import_sugarcrm/__openerp__.py
index 071f58099b399e60baa395b409bd4ea48ac61e86..927a4b542eda545e333f64ef04250384a713bd95 100644
--- a/addons/import_sugarcrm/__openerp__.py
+++ b/addons/import_sugarcrm/__openerp__.py
@@ -20,9 +20,9 @@
 ##############################################################################
 
 {
-    'name': 'Import SugarCRM Data into OpenERP Module.',
+    'name': 'Import Data from SugarCRM',
     'version': '1.0',
-    'category': 'Generic Modules',
+    'category': 'Customer Relationship Management',
     'description': """This Module Import SugarCRM "Leads", "Opportunities", "Users", "Accounts", 
             "Contacts", "Employees", Meetings, Phonecalls, Emails, and Project, Project Tasks Data into OpenERP Module.""",
     'author': 'OpenERP SA',
diff --git a/addons/knowledge/__init__.py b/addons/knowledge/__init__.py
index 3511d091ecb139e8fe7cdfec46004a3214a7756c..9a3d6d2fbb69ca0763a753a140d04743d06afc4e 100644
--- a/addons/knowledge/__init__.py
+++ b/addons/knowledge/__init__.py
@@ -19,6 +19,5 @@
 #
 ##############################################################################
 
-import installer
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py
index c2f1b2c7a88961072266354c3d2f1d4a8cc69a8d..2ca58e9861f4a197aa7e0dd3bbe569096b984012 100644
--- a/addons/knowledge/__openerp__.py
+++ b/addons/knowledge/__openerp__.py
@@ -25,21 +25,20 @@
     "version" : "1.0",
     "depends" : ["base","base_setup"],
     "author" : "OpenERP SA",
-    "category": 'Tools',
+    "category": 'Hidden',
     'complexity': "easy",
     "description": """
-Installer for knowledge-based tools.
+Installer for knowledge-based Hidden.
 ====================================
 
 Makes the Knowledge Application Configuration available from where you can install
-document and Wiki based tools.
+document and Wiki based Hidden.
     """,
     'website': 'http://www.openerp.com',
     'init_xml': [],
     'update_xml': [
         'security/knowledge_security.xml',
         'security/ir.model.access.csv',
-        'knowledge_installer.xml',
         'knowledge_view.xml',
     ],
     'demo_xml': ['knowledge_demo.xml'],
diff --git a/addons/knowledge/installer.py b/addons/knowledge/installer.py
deleted file mode 100644
index 0f6b29597de144d12ba90567064e5062444e862a..0000000000000000000000000000000000000000
--- a/addons/knowledge/installer.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from osv import fields, osv
-
-class knowledge_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        # Knowledge Management
-        'document_ftp':fields.boolean('Shared Repositories (FTP)',
-            help="Provides an FTP access to your OpenERP's "
-                "Document Management System. It lets you access attachments "
-                "and virtual documents through a standard FTP client."),
-        'document_webdav':fields.boolean('Shared Repositories (WebDAV)',
-            help="Provides a WebDAV access to your OpenERP's Document "
-                 "Management System. Lets you access attachments and "
-                 "virtual documents through your standard file browser."),
-        'wiki':fields.boolean('Collaborative Content (Wiki)',
-            help="Lets you create wiki pages and page groups in order "
-                 "to keep track of business knowledge and share it with "
-                 "and  between your employees."),
-        # Content templates
-        'wiki_faq':fields.boolean('Template: Internal FAQ',
-            help="Creates a skeleton internal FAQ pre-filled with "
-                 "documentation about OpenERP's Document Management "
-                 "System."),
-        'wiki_quality_manual':fields.boolean('Template: Quality Manual',
-            help="Creates an example skeleton for a standard quality manual."),
-        }
-    _defaults = {
-        'document_ftp':True,
-        }
-
-knowledge_installer()
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
deleted file mode 100644
index d9a4a45df6666bed842799147cc7da0dac84c85f..0000000000000000000000000000000000000000
--- a/addons/knowledge/knowledge_installer.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<openerp>
-  <data>
-    <record id="view_knowledge_installer" model="ir.ui.view">
-      <field name="name">knowledge.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <xpath expr="//group[@name='knowledge']" position="replace">
-            <newline/>
-            <separator  string="Knowledge Management Features" colspan="4" />
-            <field name="document_ftp" />
-            <field name="document_webdav" />
-            <field name="wiki" />
-            <field name="wiki_faq" />
-            <field name="wiki_quality_manual" />
-          </xpath>
-        </data>
-      </field>
-    </record>
-  </data>
-</openerp>
diff --git a/addons/l10n_at/__openerp__.py b/addons/l10n_at/__openerp__.py
index 6c8e8b5eda36de452052a9e7f0411a58e22c62f6..d28598c1ed2e0c94fe18da12c72d43d8b49566b4 100644
--- a/addons/l10n_at/__openerp__.py
+++ b/addons/l10n_at/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "author" : "conexus.at",
 	"website" : "http://www.conexus.at",
-    "category" : "Localisation/Account Charts",
+    "category" : "Localization/Account Charts",
     "depends" : ["account_chart", 'base_vat'],
     "description": "This module provides the standard Accounting Chart for Austria which is based on the Template from BMF.gv.at. Please keep in mind that you should review and adapt it with your Accountant, before using it in a live Environment.",
     "demo_xml" : [],
diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py
index 6fd486f06fbeece3ad595e52a84e5bfc96a4704e..26c9837a8bf6d25ec166437e377867790de53b3a 100644
--- a/addons/l10n_be/__openerp__.py
+++ b/addons/l10n_be/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 {   'name': 'Belgium - Plan Comptable Minimum Normalise',
     'version': '1.1',
-    'category': 'Finance',
+    'category': 'Localization/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Belgium in OpenERP.
 ==============================================================================
diff --git a/addons/l10n_be_hr_payroll/__openerp__.py b/addons/l10n_be_hr_payroll/__openerp__.py
index ca0851ed9eb2b1efa3d507f42834e6778bb863bc..b6a36a7528c122c3432444fae768b8e4c625eabd 100644
--- a/addons/l10n_be_hr_payroll/__openerp__.py
+++ b/addons/l10n_be_hr_payroll/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 {
     'name': 'Belgian Payroll Rules',
-    'category': 'payroll',
+    'category': 'Localization/Payroll',
     'author': 'OpenERP SA',
     'depends': ['hr_payroll','hr_contract'],
     'version': '1.0',
diff --git a/addons/l10n_br/__openerp__.py b/addons/l10n_br/__openerp__.py
index 578978599a06ec381942520ac2178b91227594b0..ecd6c9d6fa6e2eb18c942bf886f383883b156713 100644
--- a/addons/l10n_br/__openerp__.py
+++ b/addons/l10n_br/__openerp__.py
@@ -21,7 +21,7 @@
 {
     'name': 'Brazilian Localization',
     'description': 'Brazilian Localization',
-    'category': 'Finance',
+    'category': 'Localization/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Brazil in OpenERP.
 =============================================================================
diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py
index b73f4fbbb05716150a30fc0f47a677944cb29eec..fbfadbf97554043254486fc6f1281771e925844a 100644
--- a/addons/l10n_ca/__openerp__.py
+++ b/addons/l10n_ca/__openerp__.py
@@ -23,7 +23,7 @@
     "version" : "1.0",
     "author" : "Savoir-faire Linux",
     "website" : "http://www.savoirfairelinux.com",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the module to manage the English and French - Canadian accounting chart in OpenERP.
 ===========================================================================================
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index d3398ccf23a8b639e0500024be4f6acc4d741b40..66a32c80437d417097ff24f867d0980832c37f5c 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -62,7 +62,7 @@ TODO :
 """,
     "version" : "6.0",
     "author" : "Camptocamp SA",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "website": "http://www.camptocamp.com",
 
     "depends" : [
diff --git a/addons/l10n_cn/__openerp__.py b/addons/l10n_cn/__openerp__.py
index 5674c95cd439bc57fe70c7c4eb0599789cb69ab9..6a0635052754c979c3b31e11b8876f4fcd993257 100644
--- a/addons/l10n_cn/__openerp__.py
+++ b/addons/l10n_cn/__openerp__.py
@@ -20,7 +20,7 @@
 {
     "name" : "中国会计科目表",
     "version" : "1.0",
-    "category": "Finance",
+    "category": "Localization/Account Charts",
     "author" : "openerp-china.org",
     "maintainer":"openerp-china.org",
     "website":"http://openerp-china.org",
diff --git a/addons/l10n_cr/__openerp__.py b/addons/l10n_cr/__openerp__.py
index a2656e8dc598a601d537d05434825ab03b17b748..5fc4d80d7f7591cc5868674a071b6d53d5afceca 100644
--- a/addons/l10n_cr/__openerp__.py
+++ b/addons/l10n_cr/__openerp__.py
@@ -38,7 +38,7 @@
     'url': 'http://launchpad.net/openerp-costa-rica',
     'author': 'ClearCorp S.A.',
     'website': 'http://clearcorp.co.cr',
-    'category': 'Finance',
+    'category': 'Localization/Account Charts',
     'description': """
 Chart of accounts for Costa Rica.
 =================================
diff --git a/addons/l10n_de/__openerp__.py b/addons/l10n_de/__openerp__.py
index 9582ce185fa3cabb727d85fc9a51cb10c57c105b..8cbdaa3b6eece2402f122b00553a8bafd208c880 100644
--- a/addons/l10n_de/__openerp__.py
+++ b/addons/l10n_de/__openerp__.py
@@ -125,7 +125,7 @@
     "version" : "1.0",
     "author" : "openbig.org",
     "website" : "http://www.openbig.org",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 Dieses  Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem SKR03.
 ==============================================================================
diff --git a/addons/l10n_ec/__openerp__.py b/addons/l10n_ec/__openerp__.py
index 27c72e4b2e6509b286a0b101a526820c6d3b480e..0e93a3ac57b514c698a66c148fba6bf4ae32b8ed 100644
--- a/addons/l10n_ec/__openerp__.py
+++ b/addons/l10n_ec/__openerp__.py
@@ -20,7 +20,7 @@
 {
     'name': 'Ecuador - Accounting Chart',
     'version': '1.1',
-    'category': 'Finance',
+    'category': 'Localization/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Ecuador in OpenERP.
 ==============================================================================
diff --git a/addons/l10n_es/__openerp__.py b/addons/l10n_es/__openerp__.py
index aa27dc73f6f5fc29b90a970cd1baef81ac712601..3cdc521ad6012aff0e1b14dc676426a4b05d13c1 100644
--- a/addons/l10n_es/__openerp__.py
+++ b/addons/l10n_es/__openerp__.py
@@ -26,7 +26,7 @@
     "version" : "3.0",
     "author" : "Spanish Localization Team",
     'website' : 'https://launchpad.net/openerp-spain',
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 Spanish Charts of Accounts (PGCE 2008).
 =======================================
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index d0e8f48176674caf815e8ecd19c7dfec54f7a519..1bcb659c32295b476db0875fdf64996f42571dfe 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -30,7 +30,7 @@
     "version" : "1.0",
     "author" : "OpenERP SA",
     "website": "http://www.openerp.com",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the module to manage the accounting chart for France in OpenERP.
 ========================================================================
diff --git a/addons/l10n_gr/__openerp__.py b/addons/l10n_gr/__openerp__.py
index b1bae1a1bfb014e8299dafda40deb91f0f9b4e5d..72b1d2c7cc4e57c7089b8857532d00382fedcc0f 100644
--- a/addons/l10n_gr/__openerp__.py
+++ b/addons/l10n_gr/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "0.2",
     "author" : "P. Christeas, OpenERP SA.",
     "website": "http://openerp.hellug.gr/",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the base module to manage the accounting chart for Greece.
 ==================================================================
diff --git a/addons/l10n_gt/__openerp__.py b/addons/l10n_gt/__openerp__.py
index 8806479b69d86aeadd137c07e24e33b66bb4fd73..d80c1fa80a780d0e113d9436aaec3d725357a081 100644
--- a/addons/l10n_gt/__openerp__.py
+++ b/addons/l10n_gt/__openerp__.py
@@ -35,7 +35,7 @@
 {
     'name': 'Guatemala - Plan contable general',
     'version': '3.0',
-    'category': 'Finance',
+    'category': 'Localization/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Guatemala.
 =====================================================================
diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py
index ab99941c37921d8d855b98972302b70ddaf2a7b4..9aaec0613192f853d39056db0d118c6d102eb24e 100644
--- a/addons/l10n_in/__openerp__.py
+++ b/addons/l10n_in/__openerp__.py
@@ -29,7 +29,7 @@ Indian Accounting : Chart of Account.
 Indian accounting chart and localization.
     """,
     "author": ['OpenERP SA', 'Axelor'],
-    "category": "Finance",
+    "category": "Localization/Account Charts",
     "depends": [
         "account",
         "account_chart"
diff --git a/addons/l10n_it/__openerp__.py b/addons/l10n_it/__openerp__.py
index 41161f67a70f4f78d154848c2b1c756c1cd9fbd3..d6138608aa2501c7e0da246bdbf4ce73490b7fba 100644
--- a/addons/l10n_it/__openerp__.py
+++ b/addons/l10n_it/__openerp__.py
@@ -36,7 +36,7 @@ Piano dei conti italiano di un'impresa generica.
 Italian accounting chart and localization.
     """,
     "license": "AGPL-3",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     'website': 'http://www.openerp-italia.org/',
     'init_xml': [
         'report.xml',
diff --git a/addons/l10n_lu/__openerp__.py b/addons/l10n_lu/__openerp__.py
index 09d8dbfabe3cc14443db0e01b08b245e23698d7e..7a4436e31c17138b5db117af3b2ccf9bfc3398d7 100644
--- a/addons/l10n_lu/__openerp__.py
+++ b/addons/l10n_lu/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Luxembourg - Plan Comptable Minimum Normalise',
     'version': '1.0',
-    'category': 'Finance',
+    'category': 'Localization/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Luxembourg.
 ======================================================================
diff --git a/addons/l10n_ma/__openerp__.py b/addons/l10n_ma/__openerp__.py
index 3a26f6992dce07fff88621c868ae5d601dc9d087..a9bd7ce557e2afbfcf4b258509d1833115051344 100644
--- a/addons/l10n_ma/__openerp__.py
+++ b/addons/l10n_ma/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "Maroc - Plan Comptable Général",
     "version" : "1.0",
     "author" : "kazacube",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the base module to manage the accounting chart for Maroc.
 =================================================================
diff --git a/addons/l10n_mx/__openerp__.py b/addons/l10n_mx/__openerp__.py
index 17aea022d4887eec46d28b3aaaced547a4c097cc..d56d5f570b158945991a333ed39020b98a654b8c 100644
--- a/addons/l10n_mx/__openerp__.py
+++ b/addons/l10n_mx/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "Mexico - Chart of Account",
     "version" : "1.0",
     "author" : "RelTek Mexico",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the module to manage the accounting chart for Mexico in OpenERP.
 ========================================================================
diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py
index 849053fb0adbef6cd6ff3ba0b04502740dc379d5..5635e16d6c31214a16838cdc943cb69e763d89b1 100644
--- a/addons/l10n_nl/__openerp__.py
+++ b/addons/l10n_nl/__openerp__.py
@@ -88,7 +88,7 @@
 {
     "name" : "Netherlands - Grootboek en BTW rekeningen",
     "version" : "1.5",
-    "category": "Finance",
+    "category": "Localization/Account Charts",
     "description": """
 This is the module to manage the accounting chart for Netherlands in OpenERP.
 =============================================================================
diff --git a/addons/l10n_pl/__openerp__.py b/addons/l10n_pl/__openerp__.py
index 584a7d27832886cda89e17eee592f6c9523456bd..0ec97ab7cb64f0270cdf9a98142651b785dec90a 100644
--- a/addons/l10n_pl/__openerp__.py
+++ b/addons/l10n_pl/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.0",
     "author" : "Grzegorz Grzelak (Cirrus)",
     "website": "http://www.cirrus.pl",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the module to manage the accounting chart and taxes for Poland in OpenERP.
 ==================================================================================
diff --git a/addons/l10n_ro/__openerp__.py b/addons/l10n_ro/__openerp__.py
index 134a4aea679583bbe3d4f3f9f7a464f6ca226ce5..647b4b354492017f054e00c4cda7ef3270defd02 100644
--- a/addons/l10n_ro/__openerp__.py
+++ b/addons/l10n_ro/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.1",
     "author" : "filsys",
     "website": "http://www.filsystem.ro",
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "depends" : ["account_chart", 'base_vat'],
     "description": """
 This is the module to manage the accounting chart, VAT structure and Registration Number for Romania in OpenERP.
diff --git a/addons/l10n_syscohada/__openerp__.py b/addons/l10n_syscohada/__openerp__.py
index 6cf85ed5f19956d6443f1e5c00585259560673b3..0fa4631b1f1e27d7bc0d973d28d09f00a19a7f84 100644
--- a/addons/l10n_syscohada/__openerp__.py
+++ b/addons/l10n_syscohada/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "OHADA - The accounting chart ",
     "version" : "1.0",
     "author" : "Baamtu Senegal",
-    "category" : "Localisation/Account Charts",
+    "category" : "Localization/Account Charts",
     "description": """This module implements the accounting chart for OHADA area.
     It allows any company or association to manage its financial accounting.
     Countries that use OHADA are the following:
@@ -39,4 +39,4 @@
     "active": False,
     "installable": True
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_th/__openerp__.py b/addons/l10n_th/__openerp__.py
index 714fc959c4a41a23166aa4dbd5ec7ca885126e88..1b2c4771aee6cad5cf70c93ac42e165be4ef09fb 100644
--- a/addons/l10n_th/__openerp__.py
+++ b/addons/l10n_th/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Thailand - Thai Chart of Accounts',
     'version': '1.0',
-    'category': 'Finance',
+    'category': 'Localization/Account Charts',
     'description': """
 Chart of Accounts for Thailand.
 ===============================
diff --git a/addons/l10n_uk/__openerp__.py b/addons/l10n_uk/__openerp__.py
index cf97b79d3239c94784465208a108492c3b54041e..f6e253fffc2abdb28d8b0485d86a2dd08c470bb0 100644
--- a/addons/l10n_uk/__openerp__.py
+++ b/addons/l10n_uk/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'UK Chart of Accounts - latest (Smartode/CT600)',
     'version': '1.0',
-    'category': 'Localisation/Account Charts',
+    'category': 'Localization/Account Charts',
     'description': """This is the latest UK OpenERP localisation necesary to run OpenERP accounting for UK SME's with:
     - a CT600-ready chart of accounts
     - VAT100-ready tax structure
diff --git a/addons/l10n_ve/__openerp__.py b/addons/l10n_ve/__openerp__.py
index b48c208dd17eb7db4a54adf7d1d8a7d1f919cc98..45ac68fc10550d6422fae50420aa51ffb380b175 100644
--- a/addons/l10n_ve/__openerp__.py
+++ b/addons/l10n_ve/__openerp__.py
@@ -26,7 +26,7 @@
     "name" : "Venezuela -Chart of Account",
     "version" : "1.0",
     "author" : ['OpenERP SA', "Netquatro"],
-    "category" : "Finance",
+    "category" : "Localization/Account Charts",
     "description":
 '''
 This is the module to manage the accounting chart for Venezuela in OpenERP.
diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index d2f91c6f0403bf7bf6341f40f2782fb08c569c0c..2a493f39dcf9f9b294414a2028e0a1e6c5654e62 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name": "Lunch Module",
+    "name": "Lunch",
     "author": "OpenERP SA",
     'complexity': "easy",
     "Description": """
@@ -33,7 +33,7 @@
     """,
     "version": "0.1",
     "depends": ["base_tools"],
-    "category" : "Tools",
+    "category" : "Hidden",
     'description': """
     The base module to manage lunch
 
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 08473cad102969cb62656bf10e291de956bbc7e5..47d731aa4e5fffd03121d2ce69c43ece8df90374 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Email Subsystem',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 A generic email subsystem with message storage and queuing
diff --git a/addons/marketing/__init__.py b/addons/marketing/__init__.py
index c83787a6ef71e9c96c67da8627fd85a5b52ac3ad..e68279cad8d6f74469e007ecd5513fcbfee0d2fb 100644
--- a/addons/marketing/__init__.py
+++ b/addons/marketing/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import marketing_wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py
index d9845cd957d62e75774eb95718b7ff3c588a4c2b..1f1995c52dad8778fc66e34a94293786f6e5ef63 100644
--- a/addons/marketing/__openerp__.py
+++ b/addons/marketing/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.1",
     "depends" : ["base", "base_setup"],
     "author" : "OpenERP SA",
-    "category": 'Sales',
+    "category": 'Marketing',
     'complexity': "expert",
     "description": """
 Menu for Marketing.
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index 9f70651e5ab888f7c986ab08b69f5868bf96068a..a697d586cd48b38d9c70c19f6d3813b2fc9cd326 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -11,23 +11,5 @@
             web_icon="images/marketing.png"
             web_icon_hover="images/marketing-hover.png"/>
 
-
-        <record id="view_marketing_installer" model="ir.ui.view">
-            <field name="name">marketing.installer.view</field>
-            <field name="model">base.setup.installer</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//group[@name='marketing']" position="replace">
-                        <newline/>
-                        <separator  string="Marketing Features" colspan="4" />
-                        <field name="marketing_campaign" />
-                        <field name="email_template" />
-                        <field name="crm_profiling" />
-                    </xpath>
-                </data>
-            </field>
-        </record>
     </data>
 </openerp>
diff --git a/addons/marketing/marketing_wizard.py b/addons/marketing/marketing_wizard.py
deleted file mode 100644
index cedba8151c915bd99bab0e2019949d15fb3a5e2a..0000000000000000000000000000000000000000
--- a/addons/marketing/marketing_wizard.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from osv import fields, osv
-
-class marketing_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-    _columns = {
-        'email_template':fields.boolean('Automated E-Mails',
-            help="Helps you to design templates of emails and integrate them in your different processes."),
-        'marketing_campaign':fields.boolean('Marketing Campaigns',
-            help="Helps you to manage marketing campaigns and automate actions and communication steps."),
-        'crm_profiling':fields.boolean('Profiling Tools',
-            help="Helps you to perform segmentation of partners and design segmentation questionnaires")
-    }
-    _defaults = {
-        'marketing_campaign': lambda *a: 1,
-    }
-
-marketing_installer()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index 78060b1e571c695bf7ff7109489b9153ab53bf2d..44a2f1e30bdd765eb4b5c287b55d0e5f255826d4 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    "name" : "Marketing Campaign",
+    "name" : "Marketing Campaigns",
     "version" : "1.1",
     "depends" : ["marketing",
                  "document",
@@ -29,7 +29,7 @@
                  "decimal_precision"
                 ],
     "author" : "OpenERP SA",
-    "category": 'Sales',
+    "category": 'Marketing',
     'complexity': "expert",
     "description": """
 This module provides leads automation through marketing campaigns (campaigns can in fact be defined on any resource, not just CRM Leads).
diff --git a/addons/marketing_campaign_crm_demo/__openerp__.py b/addons/marketing_campaign_crm_demo/__openerp__.py
index 7fd9155bf9beb8120e12c1b1168e567378e32d6c..4841cc1a2e83c181cfba908a1b6f274317d8fd18 100644
--- a/addons/marketing_campaign_crm_demo/__openerp__.py
+++ b/addons/marketing_campaign_crm_demo/__openerp__.py
@@ -27,7 +27,7 @@
                  "crm",
                 ],
     "author" : "OpenERP SA",
-    "category": 'Sales',
+    "category": 'Hidden',
     "description": """
 Demo data for the module marketing_campaign.
 ============================================
diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py
index affcf0a0294d440305af1bb5ad2644fe9e3f3a07..20d01b6a60eb0bab2bf66952c6baa4c036d98cf6 100644
--- a/addons/membership/__openerp__.py
+++ b/addons/membership/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Membership',
     'version': '0.1',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 This module allows you to manage all operations for managing memberships.
 =========================================================================
diff --git a/addons/mrp/__init__.py b/addons/mrp/__init__.py
index 30367ec35f89671898a0bdeeb0b9b5674d32afea..52a5bdda77bf97b1c8385b7b554c9810d269f603 100644
--- a/addons/mrp/__init__.py
+++ b/addons/mrp/__init__.py
@@ -22,7 +22,6 @@
 import mrp
 import stock
 import product
-import installer
 import wizard
 import report
 import company
diff --git a/addons/mrp/installer.py b/addons/mrp/installer.py
deleted file mode 100644
index 7fc7fea9c1e48b36d8fed11b958a252230a0ecef..0000000000000000000000000000000000000000
--- a/addons/mrp/installer.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from osv import fields, osv
-
-class mrp_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        # Manufacturing Resource Planning
-        'stock_location': fields.boolean('Advanced Routes',
-            help="Manages product routes and paths within and between "
-                 "locations (e.g. warehouses)."),
-        'mrp_jit': fields.boolean('Just In Time Scheduling',
-            help="Enables Just In Time computation of procurement orders."
-                 "\n\nWhile it's more resource intensive than the default "
-                 "setup, the JIT computer avoids having to wait for the "
-                 "procurement scheduler to run or having to run the "
-                 "procurement scheduler manually."),
-        'mrp_operations': fields.boolean('Manufacturing Operations',
-            help="Enhances production orders with readiness states as well "
-                 "as the start date and end date of execution of the order."),
-        'mrp_subproduct': fields.boolean('MRP Subproducts',
-            help="Enables multiple product output from a single production "
-                 "order: without this, a production order can have only one "
-                 "output product."),
-        'mrp_repair': fields.boolean('Repairs',
-            help="Enables warranty and repair management (and their impact "
-                 "on stocks and invoicing)."),
-        }
-
-    _defaults = {
-        'mrp_jit': lambda self,cr,uid,*a: self.pool.get('res.users').browse(cr, uid, uid).view == 'simple',
-    }
-mrp_installer()
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index 33ef333d8ca36599fb000c3064c387b554559023..b4d4551bda8789a695ca78ab039a010711b360a4 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -1,26 +1,5 @@
 <openerp>
   <data>
-    <record id="view_mrp_installer" model="ir.ui.view">
-      <field name="name">mrp.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <xpath expr="//group[@name='mrp']" position="replace">
-            <newline/>
-            <separator  string="Manufacturing Features" colspan="4" />
-            <field name="stock_location" />
-            <field name="mrp_jit" />
-            <field name="mrp_operations" />
-            <field name="mrp_subproduct" />
-            <field name="mrp_repair" />
-          </xpath>
-        </data>
-      </field>
-    </record>
-
-
     <record id="category_mrp_config" model="ir.actions.todo.category">
         <field name="name">MRP Management</field>
         <field name="sequence">6</field>
diff --git a/addons/mrp_jit/__openerp__.py b/addons/mrp_jit/__openerp__.py
index 77bece7cfd6111f64252fd03d73b16f715b37e2d..72ef35ebc4bef2cb716e20ccaab70dc266ab5d6b 100644
--- a/addons/mrp_jit/__openerp__.py
+++ b/addons/mrp_jit/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'MRP JIT',
+    'name': 'Just In Time Scheduling',
     'version': '1.0',
     'category': 'Manufacturing',
     'complexity': "easy",
diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py
index 08f8f5b7f5b46717e61383408f2126ab5d121996..0ac2d83c524c87f3d225f7e4bbaed31b651500f8 100644
--- a/addons/mrp_operations/__openerp__.py
+++ b/addons/mrp_operations/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Work Center Production start end workflow',
+    'name': 'Manufacturing Operations',
     'version': '1.0',
     'category': 'Manufacturing',
     'complexity': "easy",
diff --git a/addons/mrp_repair/__openerp__.py b/addons/mrp_repair/__openerp__.py
index 134b16542a5180c955c9da6dd892d0cca3460388..06aa78c30f6c81cb7e4bc8efa73fcef6fc382647 100644
--- a/addons/mrp_repair/__openerp__.py
+++ b/addons/mrp_repair/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Products Repairs Module - Manage All products Repairs',
+    'name': 'Repairs',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Manufacturing',
     'description': """
 The aim is to have a complete module to manage all products repairs. The following topics should be covered by this module:
 ===========================================================================================================================
diff --git a/addons/mrp_subproduct/__openerp__.py b/addons/mrp_subproduct/__openerp__.py
index 52fd3758fbcaff248d6080dffb24c1c8f78c7bd7..5c3db5436d5b4e0f615d25c90fbb23bf758ba82c 100644
--- a/addons/mrp_subproduct/__openerp__.py
+++ b/addons/mrp_subproduct/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'MRP Sub Product - To produce several products from one production order',
+    'name': 'MRP Subproducts',
     'version': '1.0',
     'category': 'Manufacturing',
     'description': """
diff --git a/addons/multi_company/__openerp__.py b/addons/multi_company/__openerp__.py
index d82f0e1eb7c509385d3c42482d675c9a1b98d686..636ff1cac29c44543d3defc0d8d94ffd1775acf4 100644
--- a/addons/multi_company/__openerp__.py
+++ b/addons/multi_company/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Multi-Company',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "expert",
     'description': """
 This module is for managing a multicompany environment.
diff --git a/addons/outlook/__openerp__.py b/addons/outlook/__openerp__.py
index e376bcfa34a50c809146957b11c393595036ddb2..beab5aca6482c44b87ef4de12651b8faf63700c2 100644
--- a/addons/outlook/__openerp__.py
+++ b/addons/outlook/__openerp__.py
@@ -21,12 +21,12 @@
 
 
 {
-    'name' : 'Outlook Interface',
+    'name' : 'Outlook Plug-In',
     'version' : '1.0',
     'author' : 'OpenERP SA',
     'website' : 'http://www.openerp.com/',
     'depends' : ['base', 'mail'],
-    'category' : 'Tools',
+    'category' : 'Customer Relationship Management',
     'description': '''
 This module provides the Outlook Plug-in.
 =========================================
diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py
index b3429dde32984cba3ce2d0c9a4ba9a52f8f14e0f..65035912d856842a39510c7f9aeef60e5a74a472 100644
--- a/addons/pad/__openerp__.py
+++ b/addons/pad/__openerp__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 {
-    'name': 'Enhanced support for (Ether)Pad attachments',
+    'name': 'Collaborative Note Pad',
     'version': '1.0.3',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 Adds enhanced support for (Ether)Pad attachments in the web client.
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 125449cfc6f0fc0f780f272d2e3c771fcadd4ed8..1f6a808d2a06142240e24cf16879b281955dd122 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Point Of Sale',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Point Of Sale',
     'description': """
 This module provides a quick and easy sale process.
 ===================================================
diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 6bb69cd91c9ad87f594fb9186cf186eb712b7cfa..1b3be74c79f055bb14bff5bf5d7fc845449cbf71 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -24,7 +24,7 @@
     'version' : "1.0",
     'depends' : ["base", "share"],
     'author' : "OpenERP SA",
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 This module defines 'portals' to customize the access to your OpenERP database
 for external users.
diff --git a/addons/process/__openerp__.py b/addons/process/__openerp__.py
index 4af045ff6bb38cf2f9665eb535519ee86de6898b..e35ae2b06aee3f9187eb9c6c08e4a818723fc6b2 100644
--- a/addons/process/__openerp__.py
+++ b/addons/process/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Enterprise Process',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 This module shows the basic processes involved in the selected modules and in the sequence they occur.
 ======================================================================================================
diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py
index e590163f8a7020c896f3561de668574e4f4231b0..87a766a009f53dec15ad36271e985feba1d1bdbd 100644
--- a/addons/procurement/__openerp__.py
+++ b/addons/procurement/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.0",
     "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
-    "category" : "Warehouse",
+    "category" : "Warehouse Management",
     "depends" : ["base","process", "product", "stock"],
     "description": """
 This is the module for computing Procurements.
diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index bcddcc93bdf6714ada9f012eaf1b8ebb840b7019..7498265a5f9a88ffd431f6bd42538296c6cc554f 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -24,7 +24,7 @@
     "name" : "Products & Pricelists",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category" : "Warehouse",
+    "category" : "Hidden",
     "depends" : ["base", "process", "decimal_precision"],
     "init_xml" : [],
     "demo_xml" : ["product_demo.xml"],
diff --git a/addons/product_expiry/__openerp__.py b/addons/product_expiry/__openerp__.py
index 434f5605baa3f2e4cabdd35c13382ffb7038467e..ebf3b97bc0a716fda24ae0efbba59fde2c9da4ac 100644
--- a/addons/product_expiry/__openerp__.py
+++ b/addons/product_expiry/__openerp__.py
@@ -21,7 +21,7 @@
     "name" : "Products Expiry Date",
     "version" : "1.0",
     "author" : "OpenERP SA",
-    "category" : "Warehouse",
+    "category" : "Vertical Applications",
     'complexity': "easy",
     "depends" : ["stock"],
     "init_xml" : [],
diff --git a/addons/product_manufacturer/__openerp__.py b/addons/product_manufacturer/__openerp__.py
index 5aea3f333d370456bec50a0d047c44c7e29b858a..d04d07241374b10eb6716759e9ae833816a1f51a 100644
--- a/addons/product_manufacturer/__openerp__.py
+++ b/addons/product_manufacturer/__openerp__.py
@@ -21,7 +21,7 @@
     "name" : "Products Attributes & Manufacturers",
     "version" : "1.0",
     "author" : "OpenERP SA",
-    "category" : "Tools",
+    "category" : "Hidden",
     'complexity': "easy",
     "depends" : ["stock"],
     "init_xml" : [],
diff --git a/addons/product_margin/__openerp__.py b/addons/product_margin/__openerp__.py
index 9ef858fa9ec71d1923b5c02c254f1546fb76f021..b412e8b63ebac4203e16421b3c5f09bc6e0928bf 100644
--- a/addons/product_margin/__openerp__.py
+++ b/addons/product_margin/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Margins in Product',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Hidden',
     'description': """
 Adds a reporting menu in products that computes sales, purchases, margins and other interesting indicators based on invoices.
 =============================================================================================================================
diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py
index 903bc6c75233ddeb074f7600d087d532ccda150e..d05c3a82c117508ac803b0ffeab14b2097167c5f 100644
--- a/addons/product_visible_discount/__openerp__.py
+++ b/addons/product_visible_discount/__openerp__.py
@@ -21,7 +21,7 @@
     "name": "Visible Discount",
     "version": "1.0",
     "author": "OpenERP SA",
-    "category": "Sales",
+    "category": "Hidden",
     'complexity': "easy",
     "description": """
 This module lets you calculate discounts on Sale Order lines and Invoice lines base on the partner's pricelist.
diff --git a/addons/profile_tools/__init__.py b/addons/profile_tools/__init__.py
index 3511d091ecb139e8fe7cdfec46004a3214a7756c..9a3d6d2fbb69ca0763a753a140d04743d06afc4e 100644
--- a/addons/profile_tools/__init__.py
+++ b/addons/profile_tools/__init__.py
@@ -19,6 +19,5 @@
 #
 ##############################################################################
 
-import installer
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/profile_tools/__openerp__.py b/addons/profile_tools/__openerp__.py
index 46528337f981668e6996e8b6e84cc85847613f43..bd8790d1496392574816a14689f66085e286eee8 100644
--- a/addons/profile_tools/__openerp__.py
+++ b/addons/profile_tools/__openerp__.py
@@ -21,28 +21,27 @@
 
 
 {
-    "name" : "Miscellaneous Tools",
+    "name" : "Miscellaneous Hidden",
     "version" : "1.0",
     "depends" : ["base", "base_setup"],
     "author" : "OpenERP SA",
-    "category" : "Tools",
+    "category" : "Hidden",
     'complexity': "easy",
     "description": """
-Installer for extra tools like lunch, survey, idea, share, etc.
+Installer for extra Hidden like lunch, survey, idea, share, etc.
 ===============================================================
 
-Makes the Extra Tools Configuration available from where you can install
+Makes the Extra Hidden Configuration available from where you can install
 modules like share, lunch, pad, idea, survey and subscription.
     """,
     'website': 'http://www.openerp.com',
     'init_xml': [],
     'update_xml': [
-        'misc_tools_installer.xml',
     ],
     'demo_xml': [],
     'installable': True,
     'active': False,
     'certificate' : '00557100228403879621',
-    'images': ['images/config_extra_tools.jpeg'],
+    'images': ['images/config_extra_Hidden.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/profile_tools/installer.py b/addons/profile_tools/installer.py
deleted file mode 100644
index 44258234d11ca4fb2e47d907199634a05ad38b0e..0000000000000000000000000000000000000000
--- a/addons/profile_tools/installer.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from osv import fields, osv
-
-class misc_tools_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        'lunch':fields.boolean('Lunch',help='A simple module to help you to manage Lunch orders.'),
-        'subscription':fields.boolean('Recurring Documents',help='Helps to generate automatically recurring documents.'),
-        'survey':fields.boolean('Survey',help='Allows you to organize surveys.'),
-        'idea':fields.boolean('Ideas Box',help='Promote ideas of the employees, votes and discussion on best ideas.'),
-        'share':fields.boolean('Web Share',help='Allows you to give restricted access to your OpenERP documents to external users, ' \
-            'such as customers, suppliers, or accountants. You can share any OpenERP Menu such as your project tasks, support requests, invoices, etc.'),
-        'pad': fields.boolean('Collaborative Note Pads',
-            help="This module creates a tighter integration between a Pad "
-                 "instance of your choosing and your OpenERP Web Client by "
-                 "letting you easily link pads to OpenERP objects via "
-                 "OpenERP attachments."),
-    }
-misc_tools_installer()
-
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
deleted file mode 100644
index 703a8aed9c738d11aab57acb721a55fb002801ba..0000000000000000000000000000000000000000
--- a/addons/profile_tools/misc_tools_installer.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<openerp>
-  <data>
-    <record id="view_misc_tools_installer" model="ir.ui.view">
-      <field name="name">misc_tools.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <xpath expr="//group[@name='profile_tools']" position="replace">
-            <newline/>
-            <separator  string="Extra Tools Features" colspan="4" />
-            <field name="share" />
-            <field name="lunch" />
-            <field name="idea" />
-            <field name="survey" />
-            <field name="subscription" />
-            <field name="pad" />
-          </xpath>
-        </data>
-      </field>
-    </record>
-  </data>
-</openerp>
diff --git a/addons/project/__init__.py b/addons/project/__init__.py
index 142cd98e485366c0434b29cc59065a34b5fb3787..01bef264e02695a15af5599a2dacaffd6c38e593 100644
--- a/addons/project/__init__.py
+++ b/addons/project/__init__.py
@@ -21,7 +21,6 @@
 
 import project
 import company
-import installer
 import report
 import wizard
 import res_partner
diff --git a/addons/project/installer.py b/addons/project/installer.py
deleted file mode 100644
index 36b458da296febd8e4bb86c694f91922127d817e..0000000000000000000000000000000000000000
--- a/addons/project/installer.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-
-class project_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        # Project Management
-        'project_long_term': fields.boolean(
-        'Long Term Planning',
-            help="Enables long-term projects tracking, including "
-                 "multiple-phase projects and resource allocation handling."),
-        'hr_timesheet_sheet': fields.boolean('Timesheets',
-            help="Tracks and helps employees encode and validate timesheets "
-                 "and attendances."),
-        'project_timesheet': fields.boolean('Bill Time on Tasks',
-            help="Helps generate invoices based on time spent on tasks, if activated on the project."),
-        'account_budget': fields.boolean('Budgets',
-            help="Helps accountants manage analytic and crossover budgets."),
-        'project_issue': fields.boolean('Issues Tracker',
-            help="Automatically synchronizes project tasks and crm cases."),
-        # Methodologies
-        'project_scrum': fields.boolean('Methodology: SCRUM',
-            help="Implements and tracks the concepts and task types defined "
-                 "in the SCRUM methodology."),
-        'project_gtd': fields.boolean('Methodology: Getting Things Done',
-            help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
-    }
-project_installer()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 7974dd4af62fa40e69d0763f779189663c7fc144..1dd8965fe764560864539a18e437ba0ba93df2fb 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -2,27 +2,6 @@
 <openerp>
     <data>
 
-        <record id="view_project_installer" model="ir.ui.view">
-            <field name="name">project.installer.view</field>
-            <field name="model">base.setup.installer</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//group[@name='project']" position="replace">
-                        <newline/>
-                        <separator  string="Project Management Features" colspan="4" />
-                        <field name="project_issue" />
-                        <field name="project_long_term" />
-                        <field name="hr_timesheet_sheet" />
-                        <field name="project_timesheet" />
-                        <field name="account_budget" />
-                        <field name="project_scrum" />
-                        <field name="project_gtd" />
-                    </xpath>
-                </data>
-            </field>
-        </record>
 
         <record id="category_project_config" model="ir.actions.todo.category">
             <field name="name">Project Management</field>
diff --git a/addons/project_caldav/__openerp__.py b/addons/project_caldav/__openerp__.py
index 29c9ec4d483a97669f9a83474095f608623e70cf..37ecbb1c91084dd6312c4e7ccdaf20168817011a 100644
--- a/addons/project_caldav/__openerp__.py
+++ b/addons/project_caldav/__openerp__.py
@@ -23,7 +23,7 @@
     "name": "CalDAV for Task Management",
     "version": "1.1",
     "author": "OpenERP SA",
-    "category": "Project Management",
+    "category": "Hidden",
     "description": """
 Synchronization between Project Task and Caldav Vtodo.
 ======================================================
diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py
index 5f70392352be72b03eb0baabf9ba00f6b73d1a9a..8d03112ed0445e7dd9a2b0006d18546b11da2a68 100644
--- a/addons/project_gtd/__openerp__.py
+++ b/addons/project_gtd/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Getting Things Done - Time Management Module',
+    'name': 'Methodology: Getting Things Done',
     'version': '1.0',
     'category': 'Project Management',
     'complexity': "easy",
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 459c44dea049ff15201c0080e09f75239e61ba45..e77499df3d07396b58340c34250263449099290d 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -21,7 +21,7 @@
 ##############################################################################
 
 {
-    'name': 'Issue Management in Project Management',
+    'name': 'Issues Tracker',
     'version': '1.0',
     'category': 'Project Management',
     'complexity': "easy",
diff --git a/addons/project_issue_sheet/__openerp__.py b/addons/project_issue_sheet/__openerp__.py
index cc1cd6504b0e483461bb2e139f4e32ca30bad4be..972245533adc7820973beda63527d6f0bfe0a5f8 100644
--- a/addons/project_issue_sheet/__openerp__.py
+++ b/addons/project_issue_sheet/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Add the Timesheet support for Issue Management in Project Management',
     'version': '1.0',
-    'category': 'Project Management',
+    'category': 'Hidden/Link',
     'description': """
 This module adds the Timesheet support for the Issues/Bugs Management in Project.
 =================================================================================
diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index 76e872d65f7f59b4fc0e143997a6eb690ddd3777..ef57f53e5f13d17b2d071af23b1d0bbe52c6f012 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    "name": "Long Term Project Management",
+    "name": "Long Term Planning",
     "version": "1.1",
     "author": "OpenERP SA",
     "website": "http://www.openerp.com",
diff --git a/addons/project_mailgate/__openerp__.py b/addons/project_mailgate/__openerp__.py
index 76ff6dbbc4703f7c966119d8a4e876e3a3e00dc2..ba3e2e57ba5e0c8fdf4e183d93938e7f0542694e 100644
--- a/addons/project_mailgate/__openerp__.py
+++ b/addons/project_mailgate/__openerp__.py
@@ -25,7 +25,7 @@
     "version": "1.1",
     "author": "OpenERP SA",
     "website": "http://www.openerp.com",
-    "category": "Project Management",
+    "category": "Hidden",
     'complexity': "easy",
     "images": ["images/project_mailgate_task.jpeg"],
     "depends": ["project", "mail"],
diff --git a/addons/project_messages/__openerp__.py b/addons/project_messages/__openerp__.py
index 3f1882ed376b798e285e526342c6cfd8046fee6b..f7e501107841da591012788dc3083fb615e4bc75 100644
--- a/addons/project_messages/__openerp__.py
+++ b/addons/project_messages/__openerp__.py
@@ -26,7 +26,7 @@
     "images": ["images/project_message.jpeg"],
     "depends": ["project"],
     "author": "OpenERP SA",
-    "category": 'Project Management',
+    "category": 'Hidden',
     'complexity': "easy",
     "description": """
 This module provides the functionality to send messages within a project.
diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py
index 86520a0cc78292f0fdfc40ae0edaba02b85a89e9..3cb2fb401798ecccb3b1789fa3990bad9832a88c 100644
--- a/addons/project_mrp/__openerp__.py
+++ b/addons/project_mrp/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Automatic task creation from procurement lines',
     'version': '1.0',
-    'category': 'Project Management',
+    'category': 'Hidden/Link',
     'complexity': "easy",
     'description': """
 Automatically creates project tasks from procurement lines
diff --git a/addons/project_planning/__openerp__.py b/addons/project_planning/__openerp__.py
index 537170d4e3decf1e9cf5d41cb1d51b09cce50410..9ce5e8a2d9ab2668904dfb93798af3dcea43fe51 100644
--- a/addons/project_planning/__openerp__.py
+++ b/addons/project_planning/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Planning Management Module',
     'version': '1.0',
-    'category': 'Project Management',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """Keep track of your planning
 This module helps you to manage your plannings.
diff --git a/addons/project_retro_planning/__openerp__.py b/addons/project_retro_planning/__openerp__.py
index 8157180321ac67234233e50c7b5e61ab86686f78..68ea9d5d78eff42081a40d96cd4164aa88cf8645 100644
--- a/addons/project_retro_planning/__openerp__.py
+++ b/addons/project_retro_planning/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Project Retro planning',
     'version': '0.1',
-    'category': 'Project Management',
+    'category': 'Hidden',
     'description': """
 Changes dates according to change in project End Date.
 ======================================================
diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py
index 9b2f4c4e046b2a4cee8e791074d79a88b6257804..fb08b8432beec702e74bc2fe950a99d97a114ef0 100644
--- a/addons/project_scrum/__openerp__.py
+++ b/addons/project_scrum/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Scrum, Agile Development Method',
+    'name': 'Methodology: SCRUM',
     'version': '1.0',
     'category': 'Project Management',
     'complexity': "easy",
diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index 1263a51480477abb0063e8039dca151cd3eeb73f..1076eb7065eebb5579abd7fb3db6409f007992b3 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Project Timesheet',
+    'name': 'Bill Time on Tasks',
     'version': '1.0',
     'category': 'Project Management',
     'description': """
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 975754dd5feeb01eb85b7d13d4f52597451c7dec..faf9850d14a9b5cd25a2d1bb49a19b545059a23d 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Purchase Management',
     'version': '1.1',
-    'category': 'Purchases',
+    'category': 'Purchase Management',
     'complexity': "easy",
     'description': """
 Purchase module is for generating a purchase order for purchase of goods from a supplier.
diff --git a/addons/purchase/wizard/purchase_installer.py b/addons/purchase/wizard/purchase_installer.py
index 03327002953dc65b284409c414f93a45a8aa9839..a96d07f6caf404344e85c6c29075d3a07fac2cc9 100644
--- a/addons/purchase/wizard/purchase_installer.py
+++ b/addons/purchase/wizard/purchase_installer.py
@@ -20,15 +20,6 @@
 ##############################################################################
 from osv import fields, osv
 
-class purchase_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        'purchase_requisition':fields.boolean('Purchase Requisition',help="Manages your Purchase Requisition and allows you to easily keep track and manage all your purchase orders."),
-        'purchase_analytic_plans': fields.boolean('Purchase Analytic Plans',help="Manages analytic distribution and purchase orders.")
-    }
-purchase_installer()
-
 class purchase_config_wizard(osv.osv_memory):
     _name = 'purchase.config.wizard'
     _inherit = 'res.config'
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index 0519ac3dd01c7d7f99cb90d763858168a8f62f6e..37ae97e9eca16d05183a89a88374e42034a4fd93 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -1,22 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="view_purchase_install_module_form" model="ir.ui.view">
-            <field name="name">Purchases Application Configuration</field>
-            <field name="model">base.setup.installer</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-            <field name="arch" type="xml">
-              <data>
-                  <xpath expr="//group[@name='purchase']" position="replace">
-                    <newline/>
-                    <separator  string="Purchase Management Features" colspan="4" />
-                    <field name="purchase_requisition" />
-                    <field name="purchase_analytic_plans" />
-                  </xpath>
-              </data>
-            </field>
-        </record>
 
         <record id="action_import_create_supplier_installer" model="ir.actions.act_window">
             <field name="name">Create or Import Suppliers</field>
diff --git a/addons/purchase_analytic_plans/__openerp__.py b/addons/purchase_analytic_plans/__openerp__.py
index 56d9bd59051e1fa72a85dfaf1d3682856b4925f8..a29fd64944ce1d0475a06bc54911ea6630bc152b 100644
--- a/addons/purchase_analytic_plans/__openerp__.py
+++ b/addons/purchase_analytic_plans/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Purchase Analytic Distribution Management',
+    'name': 'Purchase Analytic Plans',
     'version': '1.0',
-    'category': 'Purchases',
+    'category': 'Purchase Management',
     'description': """
 The base module to manage analytic distribution and purchase orders.
 ====================================================================
diff --git a/addons/purchase_double_validation/__openerp__.py b/addons/purchase_double_validation/__openerp__.py
index c111d0679c11e967ef8138eb5de6e47f55618e69..9645514076fe5d5b89c7ae5cff1d24d8cc51722c 100644
--- a/addons/purchase_double_validation/__openerp__.py
+++ b/addons/purchase_double_validation/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name" : "Double Validation for Purchase",
     "version" : "1.1",
-    "category": 'Purchases',
+    "category": 'Hidden',
     'complexity': "easy",
     "images" : ["images/purchase_validation.jpeg"],
     "depends" : ["base","purchase"],
diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index a3658414e0fbf9b89c7c36eeae501641fd724042..cdb13e3e1aa487a4bfcd15724a20d6329d6886ba 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -18,10 +18,10 @@
 #
 ##############################################################################
 {
-    "name" : "Purchase - Purchase Requisition",
+    "name" : "Purchase Requisition",
     "version" : "0.1",
     "author" : "OpenERP SA",
-    "category" : "Purchases",
+    "category" : "Purchase Management",
     'complexity': "easy",
     "images" : ['images/purchase_requisitions.jpeg'],
     "website" : "http://www.openerp.com",
diff --git a/addons/report_designer/__init__.py b/addons/report_designer/__init__.py
index 3511d091ecb139e8fe7cdfec46004a3214a7756c..9a3d6d2fbb69ca0763a753a140d04743d06afc4e 100644
--- a/addons/report_designer/__init__.py
+++ b/addons/report_designer/__init__.py
@@ -19,6 +19,5 @@
 #
 ##############################################################################
 
-import installer
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_designer/__openerp__.py b/addons/report_designer/__openerp__.py
index 73982086c8f19d0b95289571bb31d2301d06b17d..fd29d2b96eea2c312856d1e55f7de22d1ae45116 100644
--- a/addons/report_designer/__openerp__.py
+++ b/addons/report_designer/__openerp__.py
@@ -21,28 +21,27 @@
 
 
 {
-    "name" : "Reporting Tools Installer",
+    "name" : "Reporting Hidden Installer",
     "version" : "1.0",
     "depends" : ["base", "base_setup"],
     "author" : "OpenERP SA",
-    "category": "Tools",
+    "category": "Hidden",
     "description": """
-Installer for reporting tools.
+Installer for reporting Hidden.
 ==============================
 
-Makes the Reporting Tools Configuration available from where you can install
+Makes the Reporting Hidden Configuration available from where you can install
 modules like base_report_designer and base_report_creator.
     """,
     'website': 'http://www.openerp.com',
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
-        'report_designer_installer.xml',
     ],
     'demo_xml': [],
     'installable': True,
     'active': False,
     'certificate' : '00764037194670093149',
-    'images': ['images/config_reporting_tools.jpeg'],
+    'images': ['images/config_reporting_Hidden.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_designer/installer.py b/addons/report_designer/installer.py
deleted file mode 100644
index e4bbc4ffa936c26bc9c12bd0e0348980e090ebf8..0000000000000000000000000000000000000000
--- a/addons/report_designer/installer.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from osv import fields, osv
-
-class report_designer_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        # Reporting
-        'base_report_designer':fields.boolean('OpenOffice Report Designer',help="Adds wizards to Import/Export .SXW report which "
-                                "you can modify in OpenOffice.Once you have modified it you can "
-                                "upload the report using the same wizard."),
-        'base_report_creator':fields.boolean('Query Builder',help="Allows you to create any statistic "
-                                "reports  on several objects. It's a SQL query builder and browser for end users."),
-    }
-report_designer_installer()
-
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
deleted file mode 100644
index d8d1798578e19f3876d981fbb41ac0ee97f2e07e..0000000000000000000000000000000000000000
--- a/addons/report_designer/report_designer_installer.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<openerp>
-  <data>
-    <record id="view_report_designer_installer" model="ir.ui.view">
-      <field name="name">report_designer.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <xpath expr="//group[@name='report_designer']" position="replace">
-            <newline/>
-            <separator  string="Advanced Reporting Features" colspan="4" />
-            <field name="base_report_designer" />
-            <field name="base_report_creator" />
-          </xpath>
-        </data>
-      </field>
-    </record>
-  </data>
-</openerp>
diff --git a/addons/report_intrastat/__openerp__.py b/addons/report_intrastat/__openerp__.py
index b3101317ece5a45c1b98b5ac351e2e85a14aad73..6c80e0f2b8136336063c5288056cf2f68e580326 100644
--- a/addons/report_intrastat/__openerp__.py
+++ b/addons/report_intrastat/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Intrastat Reporting',
     'version': '1.0',
-    'category': 'Warehouse',
+    'category': 'Hidden',
     'description': """
 A module that adds intrastat reports.
 =====================================
diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py
index e593791f8268a440e893f61bcff5ac83265109b8..339818a646b8b9d2c5bfec4e0040c03362b1f2fb 100644
--- a/addons/report_webkit/__openerp__.py
+++ b/addons/report_webkit/__openerp__.py
@@ -74,7 +74,7 @@ Web client WYSIWYG
     "version" : "0.9",
     "depends" : ["base"],
     "author" : "Camptocamp SA - NBessi",
-    "category": "Tools",
+    "category": "Hidden",
     "url": "http://http://www.camptocamp.com/",
     "data": [ "security/ir.model.access.csv",
               "data.xml",
diff --git a/addons/report_webkit_sample/__openerp__.py b/addons/report_webkit_sample/__openerp__.py
index 3670aa4c5d2c91569219c2bf9c806a653db1bb01..d485692c164689c7c85082aaa98e256738627619 100644
--- a/addons/report_webkit_sample/__openerp__.py
+++ b/addons/report_webkit_sample/__openerp__.py
@@ -43,7 +43,7 @@ You have to create the print buttons by calling the wizard. For more details see
                     """,
     "version" : "0.9",
     "depends" : ["base", "account", "report_webkit"],
-    "category": "Tools",
+    "category": "Hidden",
     "author" : "Camptocamp SA - NBessi",
     "url": "http://www.camptocamp.com/",
     "data": ["report_webkit_html_view.xml",
diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py
index dab9b06d5f8c770eb581bc2e402cb3cae009ca88..f1e020215a61ac18ca963d0933fcf3d97d006745 100644
--- a/addons/resource/__openerp__.py
+++ b/addons/resource/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "Resource",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category" : "Project Management",
+    "category" : "Hidden",
     "website" : "http://www.openerp.com",
     "description": """
 Module for resource management.
diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py
index 3c7af56e80810bbaf15280488d20068e7adfac69..c7be8e7e14ba502710995a8e514e9b9e7fd366af 100644
--- a/addons/sale/__init__.py
+++ b/addons/sale/__init__.py
@@ -25,7 +25,6 @@
 
 import sale
 import stock
-import sale_installer
 import wizard
 import report
 import company
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index c983edc881e8aa762ee78a58e2be21ba0938b404..ac2f2090c7f8aa6cdc19aa0a369ed53fd3f592a3 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -22,8 +22,7 @@
 {
     'name': 'Sales Management',
     'version': '1.0',
-    'category': 'Sales',
-    'category': 'Generic Modules/Sales & Purchases',
+    'category': 'Sales Management',
     'complexity': "easy",
     'description': """
 The base module to manage quotations and sales orders.
@@ -79,7 +78,6 @@ Dashboard for Sales Manager that includes:
         'sale_sequence.xml',
         'sale_data.xml',
         'sale_view.xml',
-        'sale_installer.xml',
         'report/sale_report_view.xml',
         'sale_report.xml',
         'stock_view.xml',
diff --git a/addons/sale/sale_installer.py b/addons/sale/sale_installer.py
deleted file mode 100644
index dcac79270b2c3da295174ccc265a75ae9bded635..0000000000000000000000000000000000000000
--- a/addons/sale/sale_installer.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-
-class sale_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        'delivery': fields.boolean('Delivery Costs', 
-            help="Allows you to compute delivery costs on your quotations."),
-        'sale_journal': fields.boolean('Invoicing journals',
-            help="Allows you to group and invoice your delivery orders according to different invoicing types: daily, weekly, etc."),
-        'sale_layout': fields.boolean('Sales Orders Print Layout',
-            help="Provides some features to improve the layout of the Sales Order reports."),
-        'sale_margin': fields.boolean('Margins in Sales Orders',
-            help="Gives the margin of profitability by calculating "
-                 "the difference between Unit Price and Cost Price."),
-        'sale_order_dates': fields.boolean('Full Dates on Sales Orders',
-            help="Adds commitment, requested and effective dates on Sales Orders."),
-    }
-    
-sale_installer()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/sale_installer.xml b/addons/sale/sale_installer.xml
deleted file mode 100644
index ae48e9f14b25f0457fd57dbf2f25be53c725c055..0000000000000000000000000000000000000000
--- a/addons/sale/sale_installer.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<openerp>
-  <data>
-    <record id="view_sale_installer" model="ir.ui.view">
-      <field name="name">sale.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <xpath expr="//group[@name='sale']" position="replace">
-            <newline/>
-            <separator  string="Sales Management Features" colspan="4" />
-            <field name="delivery" />
-            <field name="sale_journal" />
-            <field name="sale_layout" />
-            <field name="sale_margin" />
-            <field name="sale_order_dates" />
-          </xpath>
-        </data>
-      </field>
-    </record>
-  </data>
-</openerp>
diff --git a/addons/sale_analytic_plans/__openerp__.py b/addons/sale_analytic_plans/__openerp__.py
index 91f04c1b977a16dff7dbfa221d6ac6b01ea02df3..1850fbf8b2af6727a696c6ad971438782ac1a396 100644
--- a/addons/sale_analytic_plans/__openerp__.py
+++ b/addons/sale_analytic_plans/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Sales Analytic Distribution Management',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Hidden',
     'description': """
 The base module to manage analytic distribution and sales orders.
 =================================================================
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 7fe2bd135c7111629fb4fd0538f40261daf4e2be..c3f4365bfeebf9307ad51cdb00aaaba265c7b739 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -20,9 +20,9 @@
 ##############################################################################
 
 {
-    'name': 'Creates Sales order from Opportunity',
+    'name': 'Opportunity to Quotation',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Hidden/Link',
     'complexity': "easy",
     'description': """
 This module adds a shortcut on one or several opportunity cases in the CRM.
diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py
index c95b94da3eec75f5ebcfb5172d30fe6a160d01ed..1cd2eef2d77f1771028adae966d557f1850c7b00 100644
--- a/addons/sale_journal/__openerp__.py
+++ b/addons/sale_journal/__openerp__.py
@@ -20,9 +20,9 @@
 ##############################################################################
 
 {
-    'name': 'Managing sales and deliveries by journal',
+    'name': 'Invoicing Journals',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Sales Management',
     'complexity': "easy",
     'description': """
 The sales journal modules allows you to categorise your sales and deliveries (picking lists) between different journals.
diff --git a/addons/sale_layout/__openerp__.py b/addons/sale_layout/__openerp__.py
index 8f9005e50a0dec820974dc457425b12605d6da00..b3d033fed447acfc46bf9e1add61d377a8f2b0ed 100644
--- a/addons/sale_layout/__openerp__.py
+++ b/addons/sale_layout/__openerp__.py
@@ -19,7 +19,7 @@
 ##############################################################################
 
 {
-    "name" : "Sale Order Layout",
+    "name" : "Sales Orders Print Layout",
     "version" : "1.0",
     "images" : ["images/sale_layout.jpeg"],
     "depends" : ["sale", "account_invoice_layout"],
@@ -36,7 +36,7 @@ It gives you the possibility to
 
     """,
     "website" : "http://www.openerp.com",
-    "category" : "Sales",
+    "category" : "Sales Management",
     "init_xml" : [],
     "demo_xml" : [],
     "update_xml" : [
diff --git a/addons/sale_margin/__openerp__.py b/addons/sale_margin/__openerp__.py
index 1170c72485c4d664b0e67947b85ee6983e3f0825..c7eae6daea28709fed70cd18315db4e9b5e6cf91 100644
--- a/addons/sale_margin/__openerp__.py
+++ b/addons/sale_margin/__openerp__.py
@@ -19,9 +19,9 @@
 ##############################################################################
 
 {
-    "name":"Margins in Sales Order",
+    "name":"Margins in Sales Orders",
     "version":"1.0",
-    "category" : "Sales",
+    "category" : "Sales Management",
     "description": """
 This module adds the 'Margin' on sales order.
 =============================================
diff --git a/addons/sale_mrp/__openerp__.py b/addons/sale_mrp/__openerp__.py
index 1fd1fab9d2f1c4f0f196d8ced27aa8a5fc938aa9..7d4443a3cce91856e0dd6c6d6ba3bef497a0f143 100644
--- a/addons/sale_mrp/__openerp__.py
+++ b/addons/sale_mrp/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Sales and MRP Management',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Hidden/Link',
     'complexity': "easy",
     'description': """
 This module provides facility to the user to install mrp and sales modulesat a time.
diff --git a/addons/sale_order_dates/__openerp__.py b/addons/sale_order_dates/__openerp__.py
index eb7e3a516fa7f5302d75f6084fd51394ec54c9ee..f88a2777a00a9500dfe62a0ab3607aa4b8e7d27c 100644
--- a/addons/sale_order_dates/__openerp__.py
+++ b/addons/sale_order_dates/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Sales Order Dates',
+    'name': 'Full Dates on Sales Order',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Sales Management',
     'complexity': "easy",
     'description': """
 Add additional date information to the sales order.
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index 52ffa165c146db66ea7cfdbe1d48eaf531ab94da..f6a0c93285d7996a8ed8ee18fadd042c2eed0dd2 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -21,11 +21,11 @@
 
 
 {
-    "name" : "Sharing Tools",
+    "name" : "Web Share",
     "version" : "1.5",
     "depends" : ["base", "mail"],
     "author" : "OpenERP SA",
-    "category": 'Tools',
+    "category": 'Hidden',
     'complexity': "easy",
     "description": """
 This module adds generic sharing tools to your current OpenERP database.
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index c6ea30db3307096ddda50b82fb540b3b897a7d4f..5b1d392a5920b4f44183774120bae778f6c52fa8 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -47,7 +47,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
     "website" : "http://www.openerp.com",
     "images" : ["images/stock_forecast_report.png", "images/delivery_orders.jpeg", "images/inventory_analysis.jpeg","images/location.jpeg","images/moves_analysis.jpeg","images/physical_inventories.jpeg","images/warehouse_dashboard.jpeg"],
     "depends" : ["product", "account"],
-    "category" : "Warehouse",
+    "category" : "Warehouse Management",
     "init_xml" : [],
     "demo_xml" : ["stock_demo.xml"],
     "update_xml" : [
diff --git a/addons/stock_invoice_directly/__openerp__.py b/addons/stock_invoice_directly/__openerp__.py
index 98c63dca506581e3e39a5dd06a33ab0eb6e1c794..69acadeb8bdfb22ac1e93da6efb44ca327480146 100644
--- a/addons/stock_invoice_directly/__openerp__.py
+++ b/addons/stock_invoice_directly/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Invoice Picking Directly',
     'version': '1.0',
-    'category': 'Warehouse',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 Invoice Wizard for Delivery.
diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index d50bcc0cac49790e900c8925d95848fdffc20baf..1c4b7841a100a2c059a77913bdf2794b1a672986 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Warehouse Locations Paths',
+    'name': 'Advanced Routes',
     'version': '1.0',
-    'category': 'Warehouse',
+    'category': 'Manufacturing',
     'description': """
 This module supplements the Warehouse application by effectively implementing Push and Pull inventory flows.
 ============================================================================================================
diff --git a/addons/stock_no_autopicking/__openerp__.py b/addons/stock_no_autopicking/__openerp__.py
index 9b12ac49c3466cc2cb966161dd397ee210bea226..bd5629579cc4877833999b81d5186485abaf77ad 100644
--- a/addons/stock_no_autopicking/__openerp__.py
+++ b/addons/stock_no_autopicking/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Stock No Auto-Picking',
     'version': '1.0',
-    'category': 'Warehouse',
+    'category': 'Hidden',
     'description': """
 This module allows an intermediate picking process to provide raw materials to production orders.
 =================================================================================================
diff --git a/addons/stock_planning/__openerp__.py b/addons/stock_planning/__openerp__.py
index eb3cb385078e401220bca4adac0dc0b98fb858e4..e3043758b9445a8ac8aec7abad3f9a00bd1b04ca 100644
--- a/addons/stock_planning/__openerp__.py
+++ b/addons/stock_planning/__openerp__.py
@@ -23,7 +23,7 @@
     "name": "Master Procurement Schedule",
     "version": "1.2",
     "author": "OpenERP SA and Grzegorz Grzelak (OpenGLOBE)",
-    "category": "Warehouse",
+    "category": "Hidden",
     "images": ["images/master_procurement_schedule.jpeg","images/sales_forecast.jpeg","images/stock_planning_line.jpeg","images/stock_sales_period.jpeg"],
     "depends": ["crm", "stock","sale"],
     "complexity": "expert",
diff --git a/addons/subscription/__openerp__.py b/addons/subscription/__openerp__.py
index d2010c47987da7b4b2bb5fd72e7725cea3b0888b..581d54c9c4b67a9dd8e8951ddb4aa029fcf1f42b 100644
--- a/addons/subscription/__openerp__.py
+++ b/addons/subscription/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Subscription and recurring operations',
+    'name': 'Recurring Documents',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 Create recurring documents.
 ===========================
diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index 5a551c28a3d95e18dfe916701039553a9fac519c..e9bd92f584065377e50dca3c4dc96cce1831b4ab 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -20,9 +20,9 @@
 ##############################################################################
 
 {
-    'name': 'Survey Module',
+    'name': 'Survey',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'description': """
 This module is used for surveying.
 ==================================
diff --git a/addons/thunderbird/__openerp__.py b/addons/thunderbird/__openerp__.py
index 51e4153e897b2b288eabf2146ccb1941fdf5cf08..5b124af05aa8699d7702972fa23b2f41b39cb4ca 100644
--- a/addons/thunderbird/__openerp__.py
+++ b/addons/thunderbird/__openerp__.py
@@ -20,12 +20,12 @@
 #
 ##############################################################################
 {
-    "name" : "Thunderbird Interface",
+    "name" : "Thunderbird Plug-In",
     "version" : "1.0",
     "author" : ['OpenERP SA', 'Axelor'],
     "website" : "http://www.openerp.com/",
     "depends" : ["base","mail"],
-    "category" : "Tools",
+    "category" : "Customer Relationship Management",
     "description": """
 This module is required for the Thuderbird Plug-in to work properly.
 ====================================================================
diff --git a/addons/users_ldap/__openerp__.py b/addons/users_ldap/__openerp__.py
index 6d1fe9a720ee6f8d7b462bc1c4fe467ef0477a5b..fad6f7fbe7e3f8e6275d3361f6245d10137351fa 100644
--- a/addons/users_ldap/__openerp__.py
+++ b/addons/users_ldap/__openerp__.py
@@ -106,7 +106,7 @@ will disable LDAP authentication if installed at the same time.
 
 
     "website" : "http://www.openerp.com",
-    "category" : "Tools",
+    "category" : "Hidden",
     "data" : [
         "users_ldap_view.xml",
         "user_ldap_installer.xml",
diff --git a/addons/warning/__openerp__.py b/addons/warning/__openerp__.py
index 66915423af8865655eced0c0c4d1f8d237bd0d00..c299d830ed95c7e4589b56ef861a1fa44b57565b 100644
--- a/addons/warning/__openerp__.py
+++ b/addons/warning/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Display Warning Messages',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 Module to trigger warnings in OpenERP objects.
diff --git a/addons/web_livechat/__openerp__.py b/addons/web_livechat/__openerp__.py
index 85187aa492c379bd9158aef30f1a4b641c0b6f42..0731b003dbc7af2099a0d9791f1ee739cf2370b9 100644
--- a/addons/web_livechat/__openerp__.py
+++ b/addons/web_livechat/__openerp__.py
@@ -21,7 +21,7 @@
 {
     'name': 'Live Chat Support',
     'version': '2.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 Enable live chat support for those who have a maintenance contract.
diff --git a/addons/web_uservoice/__openerp__.py b/addons/web_uservoice/__openerp__.py
index ebcc91e7e67c170e78bd107560cb3648b7271bd6..9cbff61ad54db8003f191b7b8043c421b0807b8e 100644
--- a/addons/web_uservoice/__openerp__.py
+++ b/addons/web_uservoice/__openerp__.py
@@ -21,7 +21,7 @@
 {
     'name': 'Receive User Feedback',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Hidden',
     'complexity': "easy",
     'description': """
 Add Feedback button in header.
diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py
index cf2234b4386c549ae7f404557bdede4cf6d52a0e..1c6aae0baaf2bf49b68f6c4e2a16d26d87f5f182 100644
--- a/addons/wiki/__openerp__.py
+++ b/addons/wiki/__openerp__.py
@@ -20,9 +20,9 @@
 ##############################################################################
 
 {
-    'name': 'Document Management - Wiki',
+    'name': 'Collaborative Content (Wiki)',
     'version': '1.0.1',
-    'category': 'Tools',
+    'category': 'Knowledge Management',
     'complexity': "easy",
     'description': """
 The base module to manage documents(wiki).
diff --git a/addons/wiki_faq/__openerp__.py b/addons/wiki_faq/__openerp__.py
index 873b4fea9d0d877161076cb49e937109f0d1cbc9..96b8c2cdc118eccda72eadcb49c8883eb3239248 100644
--- a/addons/wiki_faq/__openerp__.py
+++ b/addons/wiki_faq/__openerp__.py
@@ -20,9 +20,9 @@
 ##############################################################################
 
 {
-    'name': 'Document Management - Wiki - FAQ',
+    'name': 'Template: Internal FAQ',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Knowledge Management',
     'complexity': "easy",
     'description': """
 This module provides a Wiki FAQ Template.
diff --git a/addons/wiki_quality_manual/__openerp__.py b/addons/wiki_quality_manual/__openerp__.py
index e962265cea85811cd75623d26a79436b26d90c5b..c03b466af0bdcfcd130eaa39d3f90b391d794c9c 100644
--- a/addons/wiki_quality_manual/__openerp__.py
+++ b/addons/wiki_quality_manual/__openerp__.py
@@ -20,9 +20,9 @@
 ##############################################################################
 
 {
-    'name': 'Document Management - Wiki - Quality Manual',
+    'name': 'Template: Quality Manual',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Knowledge Management',
     'complexity': "easy",
     'description': """
 Quality Manual Template.
diff --git a/addons/wiki_sale_faq/__openerp__.py b/addons/wiki_sale_faq/__openerp__.py
index 7d06dc73712c37725024b059a42711d38d0bfee5..1e56baf58cc6cce1a0e40a6e1fd632ae9742d15f 100644
--- a/addons/wiki_sale_faq/__openerp__.py
+++ b/addons/wiki_sale_faq/__openerp__.py
@@ -20,9 +20,9 @@
 ##############################################################################
 
 {
-    'name': 'Wiki - Sale-FAQ',
+    'name': 'Sale FAQ',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Customer Relationship Management',
     'complexity': "easy",
     'description': """
 This module provides a Wiki Sales FAQ Template.