diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py
index c60ebda5d26..a33a1f5fc27 100644
--- a/addons/base_action_rule/__openerp__.py
+++ b/addons/base_action_rule/__openerp__.py
@@ -22,8 +22,7 @@
 {
     'name': 'Action Rule',
     'version': '1.0',
-    'category': 'Base',
-    'complexity': "expert",
+    'category': 'Tools',
     'description': """
 This module allows to implement action rules for any object.
 ============================================================
diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index fa251719509..33837b5553b 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -43,6 +43,8 @@ DEFAULT_MODULES = {
     'Marketing' : ['marketing',],
 }
 
+HIDDEN_CATEGORIES = ('Tools', 'System', 'Localization', 'Link', 'Uncategorized')
+
 class base_setup_installer(osv.osv_memory):
     _name = 'base.setup.installer'
 
@@ -61,7 +63,7 @@ class base_setup_installer(osv.osv_memory):
         fields = {} 
         category_proxy = self.pool.get('ir.module.category')
         domain = [('parent_id', '=', False),
-                  ('name', 'not in', ('Localization', 'Others', 'Tools', 'Base', 'Link'))]
+                  ('name', 'not in', HIDDEN_CATEGORIES )]
         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,)
@@ -119,7 +121,7 @@ class base_setup_installer(osv.osv_memory):
 
         module_category_proxy = self.pool.get('ir.module.category')
         domain = [('parent_id', '=', False),
-                  ('name', 'not in', ('Localization', 'Others', 'Tools', 'Base', 'Link'))]
+                  ('name', 'not in', HIDDEN_CATEGORIES)]
         module_category_ids = module_category_proxy.search(cr, uid, domain, context=context, order='sequence asc')
 
         arch = ['<form string="%s">' % _('Automatic Base Setup')]
diff --git a/addons/google_base_account/__openerp__.py b/addons/google_base_account/__openerp__.py
index 8a8c9925900..3dafebd0cc1 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': 'Others',
-    'description': """The module adds google user  in res user""",
+    'category': 'Tools',
+    '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 4a778b0daff..0b8566b35e2 100644
--- a/addons/google_map/__openerp__.py
+++ b/addons/google_map/__openerp__.py
@@ -23,8 +23,7 @@
 {
     'name': 'Google Map',
     'version': '1.0',
-    'category': 'Others',
-    'complexity': "easy",
+    'category': 'Tools',
     'description': """
 The module adds Google Map field in partner address.
 ====================================================