diff --git a/mayan/apps/acls/apps.py b/mayan/apps/acls/apps.py
index a86efadb28..f634672c91 100644
--- a/mayan/apps/acls/apps.py
+++ b/mayan/apps/acls/apps.py
@@ -4,16 +4,18 @@ from django import apps
 from django.db.models.signals import post_migrate
 from django.utils.translation import ugettext_lazy as _
 
-from navigation.api import register_links
-from project_setup.api import register_setup
+from common.menus import (
+    menu_multi_item, menu_object, menu_secondary, menu_setup, menu_sidebar
+)
 
 from .classes import (
     AccessHolder, AccessObject, AccessObjectClass, ClassAccessHolder
 )
 from .links import (
-    acl_class_acl_detail, acl_class_acl_list, acl_class_grant, acl_class_list,
-    acl_class_new_holder_for, acl_class_revoke, acl_detail, acl_grant,
-    acl_holder_new, acl_revoke, acl_setup_valid_classes
+    link_acl_class_acl_detail, link_acl_class_acl_list, link_acl_class_grant,
+    link_acl_class_list, link_acl_class_new_holder_for, link_acl_class_revoke,
+    link_acl_detail, link_acl_grant, link_acl_holder_new, link_acl_revoke,
+    link_acl_setup_valid_classes
 )
 from .models import CreatorSingleton
 
@@ -28,13 +30,22 @@ class ACLsApp(apps.AppConfig):
     verbose_name = _('ACLs')
 
     def ready(self):
-        register_links([AccessObject], [acl_holder_new], menu_name='sidebar')
-        register_links(AccessObjectClass, [acl_class_acl_list, acl_class_new_holder_for])
-        register_links(AccessHolder, [acl_detail])
-        register_links(['acls:acl_setup_valid_classes', 'acls:acl_class_acl_list', 'acls:acl_class_new_holder_for', 'acls:acl_class_acl_detail', 'acls:acl_class_multiple_grant', 'acls:acl_class_multiple_revoke'], [acl_class_list], menu_name='secondary_menu')
-        register_links(ClassAccessHolder, [acl_class_acl_detail])
-        register_links(['acls:acl_detail'], [acl_grant, acl_revoke], menu_name='multi_item_links')
-        register_links(['acls:acl_class_acl_detail'], [acl_class_grant, acl_class_revoke], menu_name='multi_item_links')
-        register_setup(acl_setup_valid_classes)
+        menu_sidebar.bind_links(links=[link_acl_holder_new], sources=[AccessObject])
 
+        #register_links(AccessObjectClass, [acl_class_acl_list, acl_class_new_holder_for])
+        #register_links(AccessHolder, [acl_detail])
+        #register_links(ClassAccessHolder, [acl_class_acl_detail])
+        #register_links(['acls:acl_detail'], [acl_grant, acl_revoke], menu_name='multi_item_links')
+        #register_links(['acls:acl_class_acl_detail'], [acl_class_grant, acl_class_revoke], menu_name='multi_item_links')
+        menu_setup.bind_links(links=[link_acl_setup_valid_classes])
         post_migrate.connect(create_creator_user, dispatch_uid='create_creator_user')
+
+        menu_secondary.bind_links(
+            links=[link_acl_class_list],
+            sources=[
+                'acls:acl_setup_valid_classes', 'acls:acl_class_acl_list',
+                'acls:acl_class_new_holder_for', 'acls:acl_class_acl_detail',
+                'acls:acl_class_multiple_grant',
+                'acls:acl_class_multiple_revoke'
+            ],
+         )
diff --git a/mayan/apps/acls/links.py b/mayan/apps/acls/links.py
index 336eb224f3..9e0800a0af 100644
--- a/mayan/apps/acls/links.py
+++ b/mayan/apps/acls/links.py
@@ -2,20 +2,23 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
+from navigation import Link
+
 from .permissions import (
     ACLS_CLASS_EDIT_ACL, ACLS_CLASS_VIEW_ACL, ACLS_EDIT_ACL, ACLS_VIEW_ACL
 )
 
-acl_list = {'text': _('ACLs'), 'view': 'acls:acl_list', 'famfam': 'lock', 'permissions': [ACLS_VIEW_ACL]}
-acl_detail = {'text': _('Details'), 'view': 'acls:acl_detail', 'args': ['access_object.gid', 'object.gid'], 'famfam': 'key_go', 'permissions': [ACLS_VIEW_ACL]}
-acl_grant = {'text': _('Grant'), 'view': 'acls:acl_multiple_grant', 'famfam': 'key_add', 'permissions': [ACLS_EDIT_ACL]}
-acl_revoke = {'text': _('Revoke'), 'view': 'acls:acl_multiple_revoke', 'famfam': 'key_delete', 'permissions': [ACLS_EDIT_ACL]}
-acl_holder_new = {'text': _('New holder'), 'view': 'acls:acl_holder_new', 'args': 'access_object.gid', 'famfam': 'user', 'permissions': [ACLS_EDIT_ACL]}
+link_acl_list = Link(permissions=[ACLS_VIEW_ACL], text=_('ACLs'), view='acls:acl_list')
 
-acl_setup_valid_classes = {'text': _('Default ACLs'), 'view': 'acls:acl_setup_valid_classes', 'icon': 'fa fa-lock', 'permissions': [ACLS_CLASS_VIEW_ACL]}
-acl_class_list = {'text': _('Classes'), 'view': 'acls:acl_setup_valid_classes', 'famfam': 'package', 'permissions': [ACLS_CLASS_VIEW_ACL]}
-acl_class_acl_list = {'text': _('ACLs for class'), 'view': 'acls:acl_class_acl_list', 'args': 'object.gid', 'famfam': 'lock_go', 'permissions': [ACLS_CLASS_VIEW_ACL]}
-acl_class_acl_detail = {'text': _('Details'), 'view': 'acls:acl_class_acl_detail', 'args': ['access_object_class.gid', 'object.gid'], 'famfam': 'key_go', 'permissions': [ACLS_CLASS_VIEW_ACL]}
-acl_class_new_holder_for = {'text': _('New holder'), 'view': 'acls:acl_class_new_holder_for', 'args': 'object.gid', 'famfam': 'user', 'permissions': [ACLS_CLASS_EDIT_ACL]}
-acl_class_grant = {'text': _('Grant'), 'view': 'acls:acl_class_multiple_grant', 'famfam': 'key_add', 'permissions': [ACLS_CLASS_EDIT_ACL]}
-acl_class_revoke = {'text': _('Revoke'), 'view': 'acls:acl_class_multiple_revoke', 'famfam': 'key_delete', 'permissions': [ACLS_CLASS_EDIT_ACL]}
+link_acl_detail = Link(permissions=[ACLS_VIEW_ACL], text=_('Details'), view='acls:acl_detail', args=['access_object.gid', 'object.gid'])
+link_acl_grant = Link(permissions=[ACLS_EDIT_ACL], text=_('Grant'), view='acls:acl_multiple_grant')
+link_acl_revoke = Link(permissions=[ACLS_EDIT_ACL], text=_('Revoke'), view='acls:acl_multiple_revoke')
+link_acl_holder_new = Link(permissions=[ACLS_EDIT_ACL], text=_('New holder'), view='acls:acl_holder_new', args='access_object.gid')
+link_acl_setup_valid_classes = Link(icon='fa fa-lock', permissions=[ACLS_CLASS_VIEW_ACL], text=_('Default ACLs'), view='acls:acl_setup_valid_classes')
+link_acl_class_list = Link(permissions=[ACLS_CLASS_VIEW_ACL], text=_('Classes'), view='acls:acl_setup_valid_classes')
+
+link_acl_class_acl_list = Link(permissions=[ACLS_CLASS_VIEW_ACL], text=_('ACLs for class'), view='acls:acl_class_acl_list', args='object.gid')
+link_acl_class_acl_detail = Link(permissions=[ACLS_CLASS_VIEW_ACL], text=_('Details'), view='acls:acl_class_acl_detail', args=['access_object_class.gid', 'object.gid'])
+link_acl_class_new_holder_for = Link(permissions=[ACLS_CLASS_EDIT_ACL], text=_('New holder'), view='acls:acl_class_new_holder_for', args='object.gid')
+link_acl_class_grant = Link(permissions=[ACLS_CLASS_EDIT_ACL], text=_('Grant'), view='acls:acl_class_multiple_grant')
+link_acl_class_revoke = Link(permissions=[ACLS_CLASS_EDIT_ACL], text=_('Revoke'), view='acls:acl_class_multiple_revoke')
diff --git a/mayan/apps/acls/templatetags/__init__.py b/mayan/apps/acls/templatetags/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/mayan/apps/acls/templatetags/acl_tags.py b/mayan/apps/acls/templatetags/acl_tags.py
deleted file mode 100644
index f8f8471912..0000000000
--- a/mayan/apps/acls/templatetags/acl_tags.py
+++ /dev/null
@@ -1,73 +0,0 @@
-from __future__ import unicode_literals
-
-import logging
-
-from django.core.exceptions import PermissionDenied
-from django.template import (
-    Library, Node, TemplateSyntaxError, Variable, VariableDoesNotExist
-)
-
-from acls.models import AccessEntry
-
-logger = logging.getLogger(__name__)
-register = Library()
-
-
-class CheckAccessNode(Node):
-    def __init__(self, permission_list=None, requester=None, obj=None, *args, **kwargs):
-        self.requester = requester
-        self.permission_list = permission_list
-        self.obj = obj
-
-    def render(self, context):
-        permission_list = Variable(self.permission_list).resolve(context)
-        logger.debug('permission_list: %s', ','.join([unicode(p) for p in permission_list]))
-
-        try:
-            # Check access_object, useful for document_page views
-            obj = Variable('access_object').resolve(context)
-            logger.debug('access_object: %s', obj)
-        except VariableDoesNotExist:
-            try:
-                obj = Variable(self.obj).resolve(context)
-                logger.debug('obj: %s', obj)
-            except VariableDoesNotExist:
-                context['access'] = False
-                logger.debug('no obj, access False')
-                return ''
-
-        if not permission_list:
-            # There is no permissions list to check against which means
-            # this link is available for all
-            context['access'] = True
-            return ''
-
-        requester = Variable(self.requester).resolve(context)
-        logger.debug('requester: %s', requester)
-
-        if obj:
-            try:
-                AccessEntry.objects.check_accesses(permission_list, requester, obj)
-            except PermissionDenied:
-                context['access'] = False
-                logger.debug('access: False')
-                return ''
-            else:
-                context['access'] = True
-                logger.debug('access: True')
-                return ''
-        else:
-            context['access'] = False
-            logger.debug('No object, access: False')
-            return ''
-
-
-@register.tag
-def check_access(parser, token):
-    try:
-        # Splitting by None == splitting by spaces.
-        tag_name, args = token.contents.split(None, 1)
-    except ValueError:
-        raise TemplateSyntaxError('%r tag requires arguments' % token.contents.split()[0])
-
-    return CheckAccessNode(*args.split())
diff --git a/mayan/apps/appearance/templates/appearance/base.html b/mayan/apps/appearance/templates/appearance/base.html
index 37dfb115ea..861e91aead 100644
--- a/mayan/apps/appearance/templates/appearance/base.html
+++ b/mayan/apps/appearance/templates/appearance/base.html
@@ -107,7 +107,7 @@
                         </div>
                         <div id="navbar" class="navbar-collapse collapse">
                             <ul class="nav navbar-nav">
-                                {% get_top_menu_links as menu_links %}
+                                {% get_menu_links 'main menu' as menu_links %}
                                 {% for link in menu_links %}
                                     {% with 'true' as as_li %}
                                     {% with 'true' as hide_active_anchor %}
@@ -158,17 +158,8 @@
 
                 {% get_action_links as links %}
 
-                {% get_object_facet_links as form_navigation_links %}
-{% comment %}
-                {% if navigation_object_list %}
-                    {% for navigation_object_dict in navigation_object_list %}
-                        {% copy_variable navigation_object_dict.object as "navigation_object_name" %}
-                        {% get_object_navigation_links "form_header" as form_navigation_links %}
-                    {% endfor %}
-                {% else %}
-                    {% get_object_navigation_links "form_header" as form_navigation_links %}
-                {% endif %}
-{% endcomment %}
+                {% get_menu_links 'object facet' as form_navigation_links %}
+
                 <div class="row">
                     {% if links or form_navigation_links %}
                         <div class="col-xs-8 col-sm-8 col-md-10 col-lg-10">
diff --git a/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html b/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html
index 5839ab9fa3..5b3c184a1f 100644
--- a/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html
+++ b/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html
@@ -106,7 +106,7 @@
                                                 {% copy_variable list_object_variable_name as "navigation_object_name" %}
                                             {% endif %}
                                             <td class="last">
-                                                {% get_object_links as links %}
+                                                {% get_menu_links 'object menu' as links %}
                                                 {% with links as object_navigation_links %}
                                                 {% with 'true' as horizontal %}
                                                     {% include 'navigation/generic_navigation.html' %}
diff --git a/mayan/apps/appearance/templates/navigation/generic_subnavigation.html b/mayan/apps/appearance/templates/navigation/generic_subnavigation.html
index 189da5ff9c..acf06cf0fd 100644
--- a/mayan/apps/appearance/templates/navigation/generic_subnavigation.html
+++ b/mayan/apps/appearance/templates/navigation/generic_subnavigation.html
@@ -1,20 +1,11 @@
-{% load permission_tags %}
 {% load navigation_tags %}
-{% load acl_tags %}
 
-{% with link.permissions as permissions %}
-    {% check_permissions request.user permissions %}
-    {% check_access permissions request.user object %}
+{% if as_li %}
+    <li class="{% if link.active and li_class_active %}{{ li_class_active }}{% endif %}">
+{% endif %}
 
-    {% if permission or access %}
-        {% if as_li %}
-            <li class="{% if link.active and li_class_active %}{{ li_class_active }}{% endif %}">
-        {% endif %}
+    {% include link_template|default:'navigation/generic_link_instance.html' %}
 
-            {% include link_template|default:'navigation/generic_link_instance.html' %}
-
-        {% if as_li %}
-            </li>
-        {% endif %}
-    {% endif %}
-{% endwith %}
+{% if as_li %}
+    </li>
+{% endif %}
diff --git a/mayan/apps/appearance/templates/navigation/large_button_link.html b/mayan/apps/appearance/templates/navigation/large_button_link.html
index 132da7ace0..1defe5fa11 100644
--- a/mayan/apps/appearance/templates/navigation/large_button_link.html
+++ b/mayan/apps/appearance/templates/navigation/large_button_link.html
@@ -1,7 +1,5 @@
-{% load static %}
-
 <div class="{% if div_class %}{{ div_class }}{% else %}col-xs-12 col-sm-6 col-md-4 col-lg-3{% endif %}">
-    <a class="btn btn-default btn-lg btn-block" href="{% url link.view %}" style="margin-bottom: 5px;">
+    <a class="btn btn-default btn-lg btn-block" href="{{ link.url }}" style="margin-bottom: 5px;">
         <i class="{{ link.icon }} fa-2x"></i><br>
         {{ link.text }}
     </a>
diff --git a/mayan/apps/checkouts/apps.py b/mayan/apps/checkouts/apps.py
index 9ec62f2d62..a4b1d8b8e3 100644
--- a/mayan/apps/checkouts/apps.py
+++ b/mayan/apps/checkouts/apps.py
@@ -6,14 +6,14 @@ from django import apps
 from django.utils.translation import ugettext_lazy as _
 
 from acls.api import class_permissions
-from common.menus import menu_main
+from common.menus import menu_facet, menu_main, menu_sidebar
 from documents.models import Document
 from mayan.celery import app
-from navigation.api import register_links
 from rest_api.classes import APIEndPoint
 
 from .links import (
-    checkin_document, checkout_document, checkout_info, link_checkout_list
+    link_checkin_document, link_checkout_document, link_checkout_info,
+    link_checkout_list
 )
 from .models import DocumentCheckout
 from .permissions import (
@@ -50,9 +50,8 @@ class CheckoutsApp(apps.AppConfig):
             PERMISSION_DOCUMENT_RESTRICTIONS_OVERRIDE
         ])
 
-        register_links(Document, [checkout_info], menu_name='form_header')
-        register_links(['checkouts:checkout_info', 'checkouts:checkout_document', 'checkouts:checkin_document'], [checkout_document, checkin_document], menu_name="sidebar")
-
+        menu_facet.bind_links(links=[link_checkout_info], sources=[Document])
         menu_main.bind_links(links=[link_checkout_list])
+        menu_sidebar.bind_links(links=[link_checkout_document, link_checkin_document], sources=['checkouts:checkout_info', 'checkouts:checkout_document', 'checkouts:checkin_document'])
 
         APIEndPoint('checkouts')
diff --git a/mayan/apps/checkouts/links.py b/mayan/apps/checkouts/links.py
index 03a3ac060b..d58a37257e 100644
--- a/mayan/apps/checkouts/links.py
+++ b/mayan/apps/checkouts/links.py
@@ -19,6 +19,6 @@ def is_not_checked_out(context):
 
 
 link_checkout_list = Link(icon='fa fa-shopping-cart', text=_('Checkouts'), view='checkouts:checkout_list')
-checkout_document = {'text': _('Check out document'), 'view': 'checkouts:checkout_document', 'args': 'object.pk', 'famfam': 'basket_put', 'condition': is_not_checked_out, 'permissions': [PERMISSION_DOCUMENT_CHECKOUT]}
-checkin_document = {'text': _('Check in document'), 'view': 'checkouts:checkin_document', 'args': 'object.pk', 'famfam': 'basket_remove', 'condition': is_checked_out, 'permissions': [PERMISSION_DOCUMENT_CHECKIN, PERMISSION_DOCUMENT_CHECKIN_OVERRIDE]}
-checkout_info = {'text': _('Check in/out'), 'view': 'checkouts:checkout_info', 'args': 'object.pk', 'famfam': 'basket', 'permissions': [PERMISSION_DOCUMENT_CHECKIN, PERMISSION_DOCUMENT_CHECKIN_OVERRIDE, PERMISSION_DOCUMENT_CHECKOUT]}
+link_checkout_document = Link(condition=is_not_checked_out, permissions=[PERMISSION_DOCUMENT_CHECKOUT], text=_('Check out document'), view='checkouts:checkout_document', args='object.pk')
+link_checkin_document = Link(condition=is_checked_out, permissions=[PERMISSION_DOCUMENT_CHECKIN, PERMISSION_DOCUMENT_CHECKIN_OVERRIDE], text=_('Check in document'), view='checkouts:checkin_document', args='object.pk')
+link_checkout_info = Link(permissions=[PERMISSION_DOCUMENT_CHECKIN, PERMISSION_DOCUMENT_CHECKIN_OVERRIDE, PERMISSION_DOCUMENT_CHECKOUT], text=_('Check in/out'), view='checkouts:checkout_info', args='object.pk')
diff --git a/mayan/apps/common/__init__.py b/mayan/apps/common/__init__.py
index e69de29bb2..adcd313a77 100644
--- a/mayan/apps/common/__init__.py
+++ b/mayan/apps/common/__init__.py
@@ -0,0 +1 @@
+from .menus import *  # NOQA
diff --git a/mayan/apps/common/apps.py b/mayan/apps/common/apps.py
index 4a2584ef58..86dbe5e5c1 100644
--- a/mayan/apps/common/apps.py
+++ b/mayan/apps/common/apps.py
@@ -12,7 +12,6 @@ from django.db.models.signals import post_migrate, post_save
 from django.utils.translation import ugettext_lazy as _
 
 from common import settings as common_settings
-from navigation.api import register_links
 
 from .links import (
     link_about, link_current_user_details, link_current_user_edit,
@@ -95,10 +94,19 @@ class CommonApp(apps.AppConfig):
 
     def ready(self):
         menu_main.bind_links(links=[link_about], position=-1)
-        menu_secondary.bind_links(links=[link_about, link_license], sources=['common:about_view', 'common:license_view'])
-
-        register_links(['common:current_user_details', 'common:current_user_edit', 'common:current_user_locale_profile_details', 'common:current_user_locale_profile_edit', 'common:password_change_view'], [link_current_user_details, link_current_user_edit, link_current_user_locale_profile_details, link_current_user_locale_profile_edit, link_password_change, link_logout], menu_name='secondary_menu')
-        #register_links(['common:about_view', 'common:license_view'], [link_about, link_license], menu_name='secondary_menu')
+        menu_secondary.bind_links(
+            links=[link_about, link_license],
+            sources=['common:about_view', 'common:license_view']
+        )
+        menu_secondary.bind_links(
+            links=[
+                link_current_user_details, link_current_user_edit,
+                link_current_user_locale_profile_details,
+                link_current_user_locale_profile_edit,
+                link_password_change, link_logout
+            ],
+            sources=['common:current_user_details', 'common:current_user_edit', 'common:current_user_locale_profile_details', 'common:current_user_locale_profile_edit', 'common:password_change_view']
+        )
 
         post_migrate.connect(create_superuser_and_anonymous_user, dispatch_uid='create_superuser_and_anonymous_user')
         post_save.connect(auto_admin_account_passwd_change, dispatch_uid='auto_admin_account_passwd_change', sender=User)
diff --git a/mayan/apps/common/links.py b/mayan/apps/common/links.py
index 8a4e79923d..d16e18ea4f 100644
--- a/mayan/apps/common/links.py
+++ b/mayan/apps/common/links.py
@@ -4,18 +4,16 @@ from django.utils.translation import ugettext_lazy as _
 
 from navigation import Link
 
+
 def has_usable_password(context):
     return context['request'].user.has_usable_password
 
 
 link_about = Link(icon='fa fa-question', text=_('About'), view='common:about_view')
+link_current_user_details = Link(icon='fa fa-user', text=_('User details'), view='common:current_user_details')
+link_current_user_edit = Link(icon='fa fa-user', text=_('Edit details'), view='common:current_user_edit')
+link_current_user_locale_profile_details = Link(icon='fa fa-globe', text=_('Locale profile'), view='common:current_user_locale_profile_details')
+link_current_user_locale_profile_edit = Link(icon='fa fa-globe', text=_('Edit locale profile'), view='common:current_user_locale_profile_edit')
 link_license = Link(icon='fa fa-book', text=_('License'), view='common:license_view')
-
-link_password_change = {'text': _('Change password'), 'view': 'common:password_change_view', 'icon': 'fa fa-key', 'condition': has_usable_password}
-link_current_user_details = {'text': _('User details'), 'view': 'common:current_user_details', 'icon': 'fa fa-user'}
-link_current_user_edit = {'text': _('Edit details'), 'view': 'common:current_user_edit', 'icon': 'fa fa-user'}
-
-link_current_user_locale_profile_details = {'text': _('Locale profile'), 'view': 'common:current_user_locale_profile_details', 'icon': 'fa fa-globe'}
-link_current_user_locale_profile_edit = {'text': _('Edit locale profile'), 'view': 'common:current_user_locale_profile_edit', 'icon': 'fa fa-globe'}
-
-link_logout = {'text': _('Logout'), 'view': 'common:logout_view', 'icon': 'fa fa-sign-out'}
+link_logout = Link(icon='fa fa-sign-out', text=_('Logout'), view='common:logout_view')
+link_password_change = Link(condition=has_usable_password, icon='fa fa-key', text=_('Change password'), view='common:password_change_view')
diff --git a/mayan/apps/common/menus.py b/mayan/apps/common/menus.py
index 215d15a168..e4c80fe0f5 100644
--- a/mayan/apps/common/menus.py
+++ b/mayan/apps/common/menus.py
@@ -2,8 +2,16 @@ from __future__ import unicode_literals
 
 from navigation import Menu
 
+__all__ = (
+    'menu_facet', 'menu_object', 'menu_main', 'menu_multi_item',
+    'menu_secondary', 'menu_setup', 'menu_sidebar', 'menu_tools'
+)
+
 menu_facet = Menu(name='object facet')
 menu_object = Menu(name='object menu')
 menu_main = Menu(name='main menu')
+menu_multi_item = Menu(name='multi item menu')
 menu_secondary = Menu(name='secondary menu')
+menu_setup = Menu(name='setup menu')
 menu_sidebar = Menu(name='sidebar menu')
+menu_tools = Menu(name='tools menu')
diff --git a/mayan/apps/django_gpg/apps.py b/mayan/apps/django_gpg/apps.py
index d197074517..f9d726f270 100644
--- a/mayan/apps/django_gpg/apps.py
+++ b/mayan/apps/django_gpg/apps.py
@@ -5,12 +5,11 @@ from django.utils.translation import ugettext_lazy as _
 
 from hkp import Key as KeyServerKey
 
-from navigation.api import register_links
-from project_setup.api import register_setup
+from common import menu_setup
 
 from .api import Key
 from .links import (
-    key_delete, key_query, key_receive, key_setup, public_keys
+    key_delete, key_query, key_receive, link_key_setup, public_keys
 )
 
 
@@ -19,7 +18,8 @@ class DjangoGPGApp(apps.AppConfig):
     verbose_name = _('Django GPG')
 
     def ready(self):
-        register_links(['django_gpg:key_delete', 'django_gpg:key_public_list', 'django_gpg:key_query'], [public_keys, key_query], menu_name='sidebar')
-        register_links(Key, [key_delete])
-        register_links(KeyServerKey, [key_receive])
-        register_setup(key_setup)
+        # TODO: convert
+        #register_links(['django_gpg:key_delete', 'django_gpg:key_public_list', 'django_gpg:key_query'], [public_keys, key_query], menu_name='sidebar')
+        #register_links(Key, [key_delete])
+        #register_links(KeyServerKey, [key_receive])
+        menu_setup.bind_links(links=[link_key_setup])
diff --git a/mayan/apps/django_gpg/links.py b/mayan/apps/django_gpg/links.py
index 3889df9d55..0b09f86549 100644
--- a/mayan/apps/django_gpg/links.py
+++ b/mayan/apps/django_gpg/links.py
@@ -2,6 +2,8 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
+from navigation import Link
+
 from .permissions import (
     PERMISSION_KEY_DELETE, PERMISSION_KEY_RECEIVE, PERMISSION_KEY_VIEW,
     PERMISSION_KEYSERVER_QUERY
@@ -12,4 +14,4 @@ public_keys = {'text': _('Public keys'), 'view': 'django_gpg:key_public_list', '
 key_delete = {'text': _('Delete'), 'view': 'django_gpg:key_delete', 'args': ['object.fingerprint', 'object.type'], 'famfam': 'key_delete', 'permissions': [PERMISSION_KEY_DELETE]}
 key_query = {'text': _('Query keyservers'), 'view': 'django_gpg:key_query', 'famfam': 'zoom', 'permissions': [PERMISSION_KEYSERVER_QUERY]}
 key_receive = {'text': _('Import'), 'view': 'django_gpg:key_receive', 'args': 'object.keyid', 'famfam': 'key_add', 'keep_query': True, 'permissions': [PERMISSION_KEY_RECEIVE]}
-key_setup = {'text': _('Key management'), 'view': 'django_gpg:key_public_list', 'args': 'object.pk', 'icon': 'fa fa-key', 'permissions': [PERMISSION_KEY_VIEW]}
+link_key_setup = Link(icon='fa fa-key', permissions=[PERMISSION_KEY_VIEW], text=_('Key management'), view='django_gpg:key_public_list', args='object.pk')
diff --git a/mayan/apps/document_acls/apps.py b/mayan/apps/document_acls/apps.py
index 20fe662ae2..065215278f 100644
--- a/mayan/apps/document_acls/apps.py
+++ b/mayan/apps/document_acls/apps.py
@@ -6,7 +6,6 @@ from django.utils.translation import ugettext_lazy as _
 from acls.api import class_permissions
 from acls.permissions import ACLS_VIEW_ACL, ACLS_EDIT_ACL
 from documents.models import Document
-from navigation.api import register_links
 
 from .links import acl_list
 
@@ -16,7 +15,8 @@ class DocumentACLsApp(apps.AppConfig):
     verbose_name = _('Document ACLs')
 
     def ready(self):
-        register_links(Document, [acl_list], menu_name='form_header')
+        #TODO: convert
+        #register_links(Document, [acl_list], menu_name='form_header')
 
         class_permissions(Document, [
             ACLS_VIEW_ACL,
diff --git a/mayan/apps/document_comments/apps.py b/mayan/apps/document_comments/apps.py
index e9b212be1b..ba5063f35d 100644
--- a/mayan/apps/document_comments/apps.py
+++ b/mayan/apps/document_comments/apps.py
@@ -9,7 +9,7 @@ from acls.api import class_permissions
 from common.classes import ModelAttribute
 from common.utils import encapsulate
 from documents.models import Document
-from navigation.api import register_links, register_model_list_columns
+from navigation.api import register_model_list_columns
 
 from .links import comment_add, comment_delete, comments_for_document
 from .permissions import (
@@ -32,9 +32,10 @@ class DocumentCommentsApp(apps.AppConfig):
             )
         )
 
-        class_permissions(Document, [PERMISSION_COMMENT_CREATE,
-                                     PERMISSION_COMMENT_DELETE,
-                                     PERMISSION_COMMENT_VIEW])
+        class_permissions(Document, [
+            PERMISSION_COMMENT_CREATE,
+            PERMISSION_COMMENT_DELETE,
+            PERMISSION_COMMENT_VIEW])
 
         register_model_list_columns(Comment, [
             {
@@ -51,8 +52,9 @@ class DocumentCommentsApp(apps.AppConfig):
             }
         ])
 
-        register_links(['comments:comments_for_document', 'comments:comment_add', 'comments:comment_delete', 'comments:comment_multiple_delete'], [comment_add], menu_name='sidebar')
-        register_links(Comment, [comment_delete])
-        register_links(Document, [comments_for_document], menu_name='form_header')
+        # TODO: convert
+        #register_links(['comments:comments_for_document', 'comments:comment_add', 'comments:comment_delete', 'comments:comment_multiple_delete'], [comment_add], menu_name='sidebar')
+        #register_links(Comment, [comment_delete])
+        #register_links(Document, [comments_for_document], menu_name='form_header')
 
         ModelAttribute(Document, label=_('Comments'), name='comments', type_name='related')
diff --git a/mayan/apps/document_indexing/apps.py b/mayan/apps/document_indexing/apps.py
index 8e2f756139..01a43be4e5 100644
--- a/mayan/apps/document_indexing/apps.py
+++ b/mayan/apps/document_indexing/apps.py
@@ -4,17 +4,15 @@ from django import apps
 from django.db.models.signals import post_save, post_delete
 from django.utils.translation import ugettext_lazy as _
 
-from common.menus import menu_main
+from common import menu_main, menu_setup
 from documents.models import Document
 from main.api import register_maintenance_links
 from metadata.models import DocumentMetadata
-from navigation.api import register_links
-from project_setup.api import register_setup
 from rest_api.classes import APIEndPoint
 
 from .links import (
     document_index_list, link_index_main_menu, index_parent,
-    index_setup, index_setup_create, index_setup_document_types,
+    link_index_setup, index_setup_create, index_setup_document_types,
     index_setup_delete, index_setup_edit, index_setup_list, index_setup_view,
     link_rebuild_index_instances, template_node_create, template_node_delete,
     template_node_edit
@@ -46,13 +44,14 @@ class DocumentIndexingApp(apps.AppConfig):
 
         register_maintenance_links([link_rebuild_index_instances], namespace='document_indexing', title=_('Indexes'))
 
-        register_links(Document, [document_index_list], menu_name='form_header')
-        register_links([Index, 'indexing:index_setup_list', 'indexing:index_setup_create'], [index_setup_list, index_setup_create], menu_name='secondary_menu')
-        register_links(Index, [index_setup_edit, index_setup_view, index_setup_document_types, index_setup_delete])
-        register_links(IndexInstanceNode, [index_parent])
-        register_links(IndexTemplateNode, [template_node_create, template_node_edit, template_node_delete])
+        # TODO: convert
+        #register_links(Document, [document_index_list], menu_name='form_header')
+        #register_links([Index, 'indexing:index_setup_list', 'indexing:index_setup_create'], [index_setup_list, index_setup_create], menu_name='secondary_menu')
+        #register_links(Index, [index_setup_edit, index_setup_view, index_setup_document_types, index_setup_delete])
+        #register_links(IndexInstanceNode, [index_parent])
+        #register_links(IndexTemplateNode, [template_node_create, template_node_edit, template_node_delete])
 
-        register_setup(index_setup)
+        menu_setup.bind_links(links=[link_index_setup])
 
         menu_main.bind_links(links=[link_index_main_menu])
 
diff --git a/mayan/apps/document_indexing/links.py b/mayan/apps/document_indexing/links.py
index 7801f10f8e..c009902b94 100644
--- a/mayan/apps/document_indexing/links.py
+++ b/mayan/apps/document_indexing/links.py
@@ -23,7 +23,7 @@ def is_not_root_node(context):
 
 link_index_main_menu = Link(icon='fa fa-sitemap', text=_('Indexes'), view='indexing:index_list')
 
-index_setup = {'text': _('Indexes'), 'view': 'indexing:index_setup_list', 'icon': 'fa fa-sitemap', 'permissions': [PERMISSION_DOCUMENT_INDEXING_SETUP]}
+link_index_setup = Link(icon='fa fa-sitemap', permissions=[PERMISSION_DOCUMENT_INDEXING_SETUP], text=_('Indexes'), view='indexing:index_setup_list')
 index_setup_list = {'text': _('Indexes'), 'view': 'indexing:index_setup_list', 'famfam': 'tab', 'permissions': [PERMISSION_DOCUMENT_INDEXING_SETUP]}
 index_setup_create = {'text': _('Create index'), 'view': 'indexing:index_setup_create', 'famfam': 'tab_add', 'permissions': [PERMISSION_DOCUMENT_INDEXING_CREATE]}
 index_setup_edit = {'text': _('Edit'), 'view': 'indexing:index_setup_edit', 'args': 'index.pk', 'famfam': 'tab_edit', 'permissions': [PERMISSION_DOCUMENT_INDEXING_EDIT]}
diff --git a/mayan/apps/document_signatures/apps.py b/mayan/apps/document_signatures/apps.py
index ded4b80fe6..b691d68420 100644
--- a/mayan/apps/document_signatures/apps.py
+++ b/mayan/apps/document_signatures/apps.py
@@ -14,7 +14,6 @@ from acls.api import class_permissions
 from django_gpg.exceptions import GPGDecryptionError
 from django_gpg.runtime import gpg
 from documents.models import Document, DocumentVersion
-from navigation.api import register_links
 
 from .links import (
     document_signature_delete, document_signature_download,
@@ -58,8 +57,9 @@ class DocumentSignaturesApp(apps.AppConfig):
     verbose_name = _('Document signatures')
 
     def ready(self):
-        register_links(Document, [document_verify], menu_name='form_header')
-        register_links(['signatures:document_verify', 'signatures:document_signature_upload', 'signatures:document_signature_download', 'signatures:document_signature_delete'], [document_signature_upload, document_signature_download, document_signature_delete], menu_name='sidebar')
+        # TODO: convert
+        #register_links(Document, [document_verify], menu_name='form_header')
+        #register_links(['signatures:document_verify', 'signatures:document_signature_upload', 'signatures:document_signature_download', 'signatures:document_signature_delete'], [document_signature_upload, document_signature_download, document_signature_delete], menu_name='sidebar')
 
         DocumentVersion.register_pre_open_hook(1, document_pre_open_hook)
         DocumentVersion.register_post_save_hook(1, document_post_save_hook)
diff --git a/mayan/apps/document_states/apps.py b/mayan/apps/document_states/apps.py
index cd7d569d37..82a700448d 100644
--- a/mayan/apps/document_states/apps.py
+++ b/mayan/apps/document_states/apps.py
@@ -4,10 +4,10 @@ from django import apps
 from django.db.models.signals import post_save
 from django.utils.translation import ugettext_lazy as _
 
+from common import menu_setup
 from common.utils import encapsulate
 from documents.models import Document
-from navigation.api import register_links, register_model_list_columns
-from project_setup.api import register_setup
+from navigation.api import register_model_list_columns
 
 from .models import (
     Workflow, WorkflowInstance, WorkflowInstanceLogEntry, WorkflowState,
@@ -37,7 +37,7 @@ class DocumentStatesApp(apps.AppConfig):
     def ready(self):
         post_save.connect(launch_workflow, dispatch_uid='launch_workflow', sender=Document)
 
-        register_setup(link_setup_workflow_list)
+        menu_setup.bind_links(links=[link_setup_workflow_list])
 
         register_model_list_columns(Workflow, [
             {
@@ -102,10 +102,11 @@ class DocumentStatesApp(apps.AppConfig):
             },
         ])
 
-        register_links([Document], [link_document_workflow_instance_list], menu_name='form_header')
-        register_links([WorkflowInstance], [link_workflow_instance_detail, link_workflow_instance_transition])
-        register_links([Workflow, 'document_states:setup_workflow_create', 'document_states:setup_workflow_list'], [link_setup_workflow_list, link_setup_workflow_create], menu_name='secondary_menu')
-        register_links([Workflow], [link_setup_workflow_states, link_setup_workflow_transitions, link_setup_workflow_document_types, link_setup_workflow_edit, link_setup_workflow_delete])
-        register_links([Workflow], [link_setup_workflow_state_create, link_setup_workflow_transition_create], menu_name='sidebar')
-        register_links([WorkflowState], [link_setup_workflow_state_edit, link_setup_workflow_state_delete])
-        register_links([WorkflowTransition], [link_setup_workflow_transition_edit, link_setup_workflow_transition_delete])
+        # TODO: convert
+        #register_links([Document], [link_document_workflow_instance_list], menu_name='form_header')
+        #register_links([WorkflowInstance], [link_workflow_instance_detail, link_workflow_instance_transition])
+        #register_links([Workflow, 'document_states:setup_workflow_create', 'document_states:setup_workflow_list'], [link_setup_workflow_list, link_setup_workflow_create], menu_name='secondary_menu')
+        #register_links([Workflow], [link_setup_workflow_states, link_setup_workflow_transitions, link_setup_workflow_document_types, link_setup_workflow_edit, link_setup_workflow_delete])
+        ##register_links([Workflow], [link_setup_workflow_state_create, link_setup_workflow_transition_create], menu_name='sidebar')
+        #register_links([WorkflowState], [link_setup_workflow_state_edit, link_setup_workflow_state_delete])
+        #register_links([WorkflowTransition], [link_setup_workflow_transition_edit, link_setup_workflow_transition_delete])
diff --git a/mayan/apps/document_states/links.py b/mayan/apps/document_states/links.py
index 26ca1d10a0..ee4ab994d0 100644
--- a/mayan/apps/document_states/links.py
+++ b/mayan/apps/document_states/links.py
@@ -2,7 +2,9 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-link_setup_workflow_list = {'text': _('Workflows'), 'view': 'document_states:setup_workflow_list', 'icon': 'fa fa-table'}
+from navigation import Link
+
+link_setup_workflow_list = Link(icon='fa fa-table', text=_('Workflows'), view='document_states:setup_workflow_list')
 link_setup_workflow_create = {'text': _('Create'), 'view': 'document_states:setup_workflow_create', 'famfam': 'table_add'}
 link_setup_workflow_delete = {'text': _('Delete'), 'view': 'document_states:setup_workflow_delete', 'args': 'object.pk', 'famfam': 'table_delete'}
 link_setup_workflow_edit = {'text': _('Edit'), 'view': 'document_states:setup_workflow_edit', 'args': 'object.pk', 'famfam': 'table_edit'}
diff --git a/mayan/apps/documents/apps.py b/mayan/apps/documents/apps.py
index e9d6f5f43e..b7683108f8 100644
--- a/mayan/apps/documents/apps.py
+++ b/mayan/apps/documents/apps.py
@@ -9,15 +9,13 @@ from actstream import registry
 
 from acls.api import class_permissions
 from common.classes import ModelAttribute
-from common.menus import menu_facet, menu_object
+from common import menu_facet, menu_object, menu_setup
 from common.utils import encapsulate, validate_path
 from dynamic_search.classes import SearchModel
 from events.permissions import PERMISSION_EVENTS_VIEW
 from main import FrontPageButton, MissingItem
 from main.api import register_maintenance_links
-from navigation.api import register_links, register_model_list_columns
-from navigation.links import link_spacer
-from project_setup.api import register_setup
+from navigation.api import register_model_list_columns
 from rest_api.classes import APIEndPoint
 from statistics.classes import StatisticNamespace
 
@@ -26,7 +24,7 @@ from .links import (
     link_clear_image_cache, link_document_clear_transformations,
     link_document_content, link_document_delete, link_document_document_type_edit,
     link_document_events_view, document_multiple_document_type_edit,
-    link_document_download, link_document_edit, document_list, document_list_recent,
+    link_document_download, link_document_edit, link_document_list, link_document_list_recent,
     document_multiple_delete, document_multiple_clear_transformations,
     document_multiple_download, document_multiple_update_page_count,
     document_page_edit, document_page_navigation_first,
@@ -40,7 +38,7 @@ from .links import (
     link_document_properties, document_type_create, document_type_delete,
     document_type_edit, document_type_filename_create,
     document_type_filename_delete, document_type_filename_edit,
-    document_type_filename_list, document_type_list, document_type_setup,
+    document_type_filename_list, document_type_list, link_document_type_setup,
     link_document_update_page_count, document_version_download,
     link_document_version_list, document_version_revert
 )
@@ -64,11 +62,11 @@ class DocumentsApp(apps.AppConfig):
     verbose_name = _('Documents')
 
     def ready(self):
-        # Register document type links
-        register_links(DocumentType, [document_type_edit, document_type_filename_list, document_type_delete])
-        register_links([DocumentType, 'documents:document_type_create', 'documents:document_type_list'], [document_type_list, document_type_create], menu_name='secondary_menu')
-        register_links(DocumentTypeFilename, [document_type_filename_edit, document_type_filename_delete])
-        register_links([DocumentTypeFilename, 'documents:document_type_filename_list', 'documents:document_type_filename_create'], [document_type_filename_create], menu_name='sidebar')
+        # Document type links
+        #register_links(DocumentType, [document_type_edit, document_type_filename_list, document_type_delete])
+        #register_links([DocumentType, 'documents:document_type_create', 'documents:document_type_list'], [document_type_list, document_type_create], menu_name='secondary_menu')
+        #register_links(DocumentTypeFilename, [document_type_filename_edit, document_type_filename_delete])
+        #register_links([DocumentTypeFilename, 'documents:document_type_filename_list', 'documents:document_type_filename_create'], [document_type_filename_create], menu_name='sidebar')
 
         # Register document facet links
         menu_facet.bind_links(links=[link_document_preview], sources=[Document], position=0)
@@ -79,28 +77,28 @@ class DocumentsApp(apps.AppConfig):
         # Document actions
         menu_object.bind_links(links=[link_document_edit, link_document_document_type_edit, link_document_print, link_document_delete, link_document_download, link_document_clear_transformations, link_document_update_page_count], sources=[Document])
 
-        register_links([Document], [document_multiple_clear_transformations, document_multiple_delete, document_multiple_download, document_multiple_update_page_count, document_multiple_document_type_edit, link_spacer], menu_name='multi_item_links')
+        #register_links([Document], [document_multiple_clear_transformations, document_multiple_delete, document_multiple_download, document_multiple_update_page_count, document_multiple_document_type_edit, link_spacer], menu_name='multi_item_links')
 
         # Document Version links
-        register_links(DocumentVersion, [document_version_revert, document_version_download])
+        #register_links(DocumentVersion, [document_version_revert, document_version_download])
 
         # Document page links
-        register_links(DocumentPage, [
-            document_page_transformation_list, document_page_view,
-            document_page_text, document_page_edit,
-        ])
+        #register_links(DocumentPage, [
+        #    document_page_transformation_list, document_page_view,
+        #    document_page_text, document_page_edit,
+        #])
 
         # Document page navigation links
-        register_links(DocumentPage, [
-            document_page_navigation_first, document_page_navigation_previous,
-            document_page_navigation_next, document_page_navigation_last
-        ], menu_name='sidebar')
+        #register_links(DocumentPage, [
+        #    document_page_navigation_first, document_page_navigation_previous,
+        #    document_page_navigation_next, document_page_navigation_last
+        #], menu_name='sidebar')
 
-        register_links(['documents:document_page_view'], [document_page_rotate_left, document_page_rotate_right, document_page_zoom_in, document_page_zoom_out, document_page_view_reset], menu_name='form_header')
-        register_links(DocumentPageTransformation, [document_page_transformation_edit, document_page_transformation_delete])
-        register_links('documents:document_page_transformation_list', [document_page_transformation_create], menu_name='sidebar')
-        register_links('documents:document_page_transformation_create', [document_page_transformation_create], menu_name='sidebar')
-        register_links(['documents:document_page_transformation_edit', 'documents:document_page_transformation_delete'], [document_page_transformation_create], menu_name='sidebar')
+        #register_links(['documents:document_page_view'], [document_page_rotate_left, document_page_rotate_right, document_page_zoom_in, document_page_zoom_out, document_page_view_reset], menu_name='form_header')
+        #register_links(DocumentPageTransformation, [document_page_transformation_edit, document_page_transformation_delete])
+        #register_links('documents:document_page_transformation_list', [document_page_transformation_create], menu_name='sidebar')
+        #register_links('documents:document_page_transformation_create', [document_page_transformation_create], menu_name='sidebar')
+        #register_links(['documents:document_page_transformation_edit', 'documents:document_page_transformation_delete'], [document_page_transformation_create], menu_name='sidebar')
 
         register_maintenance_links([link_clear_image_cache], namespace='documents', title=_('Documents'))
         register_model_list_columns(Document, [
@@ -116,7 +114,7 @@ class DocumentsApp(apps.AppConfig):
         if (not validate_path(document_settings.CACHE_PATH)) or (not document_settings.CACHE_PATH):
             setattr(document_settings, 'CACHE_PATH', tempfile.mkdtemp())
 
-        register_setup(document_type_setup)
+        menu_setup.bind_links(links=[link_document_type_setup])
 
         class_permissions(Document, [
             PERMISSION_DOCUMENT_DELETE, PERMISSION_DOCUMENT_DOWNLOAD,
@@ -147,8 +145,8 @@ class DocumentsApp(apps.AppConfig):
 
         ModelAttribute(Document, label=_('Label'), name='label', type_name='field')
 
-        FrontPageButton(link=document_list_recent)
-        FrontPageButton(link=document_list)
+        FrontPageButton(link=link_document_list_recent)
+        FrontPageButton(link=link_document_list)
 
         registry.register(Document)
 
diff --git a/mayan/apps/documents/links.py b/mayan/apps/documents/links.py
index 94d9c324b7..b40d3c723b 100644
--- a/mayan/apps/documents/links.py
+++ b/mayan/apps/documents/links.py
@@ -55,8 +55,8 @@ link_document_print = Link(permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Print
 link_document_update_page_count = Link(permissions=[PERMISSION_DOCUMENT_TOOLS], text=_('Reset page count'), view='documents:document_update_page_count', args='object.pk')
 
 # Views
-document_list = {'text': _('All documents'), 'view': 'documents:document_list', 'icon': 'fa fa-file'}
-document_list_recent = {'text': _('Recent documents'), 'view': 'documents:document_list_recent', 'icon': 'fa fa-clock-o'}
+link_document_list = Link(icon='fa fa-file', text=_('All documents'), view='documents:document_list')
+link_document_list_recent = Link(icon='fa fa-clock-o', text=_('Recent documents'), view='documents:document_list_recent')
 document_multiple_delete = {'text': _('Delete'), 'view': 'documents:document_multiple_delete', 'famfam': 'page_delete', 'permissions': [PERMISSION_DOCUMENT_DELETE]}
 document_multiple_document_type_edit = {'text': _('Change type'), 'view': 'documents:document_multiple_document_type_edit', 'famfam': 'layout', 'permissions': [PERMISSION_DOCUMENT_PROPERTIES_EDIT]}
 document_multiple_download = {'text': _('Download'), 'view': 'documents:document_multiple_download', 'famfam': 'page_save', 'permissions': [PERMISSION_DOCUMENT_DOWNLOAD]}
@@ -95,7 +95,7 @@ document_version_revert = {'text': _('Revert'), 'view': 'documents:document_vers
 
 # Document type related links
 document_type_list = {'text': _('Document types'), 'view': 'documents:document_type_list', 'famfam': 'layout', 'permissions': [PERMISSION_DOCUMENT_TYPE_VIEW]}
-document_type_setup = {'text': _('Document types'), 'view': 'documents:document_type_list', 'icon': 'fa fa-file', 'permissions': [PERMISSION_DOCUMENT_TYPE_VIEW]}
+link_document_type_setup = Link(icon='fa fa-file', permissions=[PERMISSION_DOCUMENT_TYPE_VIEW], text=_('Document types'), view='documents:document_type_list')
 document_type_edit = {'text': _('Edit'), 'view': 'documents:document_type_edit', 'args': 'document_type.id', 'famfam': 'layout_edit', 'permissions': [PERMISSION_DOCUMENT_TYPE_EDIT]}
 document_type_delete = {'text': _('Delete'), 'view': 'documents:document_type_delete', 'args': 'document_type.id', 'famfam': 'layout_delete', 'permissions': [PERMISSION_DOCUMENT_TYPE_DELETE]}
 document_type_create = {'text': _('Create document type'), 'view': 'documents:document_type_create', 'famfam': 'layout_add', 'permissions': [PERMISSION_DOCUMENT_TYPE_CREATE]}
diff --git a/mayan/apps/dynamic_search/apps.py b/mayan/apps/dynamic_search/apps.py
index f5327a7ce2..0fb42a0117 100644
--- a/mayan/apps/dynamic_search/apps.py
+++ b/mayan/apps/dynamic_search/apps.py
@@ -3,10 +3,10 @@ from __future__ import unicode_literals
 from django import apps
 from django.utils.translation import ugettext_lazy as _
 
-from navigation.api import register_links
+from common import menu_facet, menu_sidebar
 from rest_api.classes import APIEndPoint
 
-from .links import search, search_advanced, search_again
+from .links import link_search, link_search_advanced, link_search_again
 
 
 class DynamicSearchApp(apps.AppConfig):
@@ -14,7 +14,7 @@ class DynamicSearchApp(apps.AppConfig):
     verbose_name = _('Dynamic search')
 
     def ready(self):
-        register_links(['search:search', 'search:search_advanced', 'search:results'], [search, search_advanced], menu_name='form_header')
-        register_links(['search:results'], [search_again], menu_name='sidebar')
+        menu_facet.bind_links(links=[link_search, link_search_advanced], sources=['search:search', 'search:search_advanced', 'search:results'])
+        menu_sidebar.bind_links(links=[link_search_again], sources=['search:results'])
 
         APIEndPoint('search', app_name='dynamic_search')
diff --git a/mayan/apps/dynamic_search/links.py b/mayan/apps/dynamic_search/links.py
index 23e57d9ce1..3dc3c16d4a 100644
--- a/mayan/apps/dynamic_search/links.py
+++ b/mayan/apps/dynamic_search/links.py
@@ -2,6 +2,8 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-search = {'text': _('Search'), 'view': 'search:search', 'famfam': 'zoom'}
-search_advanced = {'text': _('Advanced search'), 'view': 'search:search_advanced', 'famfam': 'zoom_in'}
-search_again = {'text': _('Search again'), 'view': 'search:search_again', 'famfam': 'arrow_undo'}
+from navigation import Link
+
+link_search = Link(text=_('Search'), view='search:search')
+link_search_advanced = Link(text=_('Advanced search'), view='search:search_advanced')
+link_search_again = Link(text=_('Search again'), view='search:search_again')
diff --git a/mayan/apps/events/apps.py b/mayan/apps/events/apps.py
index 1002a8936c..d71e6d2a79 100644
--- a/mayan/apps/events/apps.py
+++ b/mayan/apps/events/apps.py
@@ -3,9 +3,9 @@ from __future__ import unicode_literals
 from django import apps
 from django.utils.translation import ugettext_lazy as _
 
-from project_tools.api import register_tool
+from common import menu_tools
 
-from .links import events_list
+from .links import link_events_list
 
 
 class EventsApp(apps.AppConfig):
@@ -13,4 +13,4 @@ class EventsApp(apps.AppConfig):
     verbose_name = _('Events')
 
     def ready(self):
-        register_tool(events_list)
+        menu_tools.bind_links(links=[link_events_list])
diff --git a/mayan/apps/events/links.py b/mayan/apps/events/links.py
index 8c6258fa5b..4980f44185 100644
--- a/mayan/apps/events/links.py
+++ b/mayan/apps/events/links.py
@@ -2,4 +2,6 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-events_list = {'text': _('Events'), 'view': 'events:events_list', 'icon': 'fa fa-list-ol'}
+from navigation import Link
+
+link_events_list = Link(icon='fa fa-list-ol', text=_('Events'), view='events:events_list')
diff --git a/mayan/apps/folders/apps.py b/mayan/apps/folders/apps.py
index 3f7e29eddb..1d5e75010c 100644
--- a/mayan/apps/folders/apps.py
+++ b/mayan/apps/folders/apps.py
@@ -5,18 +5,19 @@ from django.utils.translation import ugettext_lazy as _
 
 from acls.api import class_permissions
 from acls.permissions import ACLS_EDIT_ACL, ACLS_VIEW_ACL
-from common.menus import menu_secondary, menu_object, menu_main
+from common.menus import menu_facet, menu_main, menu_object, menu_secondary, menu_sidebar, menu_multi_item
 from common.utils import encapsulate
 from documents.models import Document
-from navigation.api import register_links, register_model_list_columns
-from navigation.links import link_spacer
+from navigation.api import register_model_list_columns
+from navigation import CombinedSource
 from rest_api.classes import APIEndPoint
 
 from .links import (
     link_folder_list,
-    document_folder_list, link_folder_acl_list, folder_add_document,
-    folder_add_multiple_documents, link_folder_create, link_folder_delete,
-    folder_document_multiple_remove, link_folder_edit, link_folder_view
+    link_document_folder_list, link_folder_acl_list, link_folder_add_document,
+    link_folder_add_multiple_documents, link_folder_create,
+    link_folder_delete, link_folder_document_multiple_remove,
+    link_folder_edit, link_folder_view
 )
 from .models import Folder
 from .permissions import (
@@ -31,13 +32,7 @@ class FoldersApp(apps.AppConfig):
     verbose_name = _('Folders')
 
     def ready(self):
-        menu_main.bind_links(links=[link_folder_list])
-        menu_secondary.bind_links(links=[link_folder_list, link_folder_create], sources=[Folder, 'folders:folder_list', 'folders:folder_create'])
-        menu_object.bind_links(links=[link_folder_view, link_folder_edit, link_folder_acl_list, link_folder_delete], sources=[Folder])
-
-        #register_links(['folders:document_folder_list', 'folders:folder_add_document'], [folder_add_document], menu_name="sidebar")
-        #register_links(Document, [document_folder_list], menu_name='form_header')
-        #register_links([Document], [folder_add_multiple_documents, folder_document_multiple_remove, link_spacer], menu_name='multi_item_links')
+        APIEndPoint('folders')
 
         class_permissions(Folder, [
             ACLS_EDIT_ACL, ACLS_VIEW_ACL, PERMISSION_FOLDER_DELETE,
@@ -48,9 +43,15 @@ class FoldersApp(apps.AppConfig):
             PERMISSION_FOLDER_ADD_DOCUMENT, PERMISSION_FOLDER_REMOVE_DOCUMENT
         ])
 
+        menu_facet.bind_links(links=[link_document_folder_list], sources=[Document])
+        menu_main.bind_links(links=[link_folder_list])
+        menu_multi_item.bind_links(links=[link_folder_add_multiple_documents], sources=[Document])
+        menu_multi_item.bind_links(links=[link_folder_document_multiple_remove], sources=[CombinedSource(obj=Document, view='folders:folder_view')])
+        menu_object.bind_links(links=[link_folder_view, link_folder_edit, link_folder_acl_list, link_folder_delete], sources=[Folder])
+        menu_secondary.bind_links(links=[link_folder_list, link_folder_create], sources=[Folder, 'folders:folder_list', 'folders:folder_create'])
+        menu_sidebar.bind_links(links=[link_folder_add_document], sources=['folders:document_folder_list', 'folders:folder_add_document'])
+
         register_model_list_columns(Folder, [
             {'name': _('Created'), 'attribute': 'datetime_created'},
             {'name': _('Documents'), 'attribute': encapsulate(lambda x: x.documents.count())},
         ])
-
-        APIEndPoint('folders')
diff --git a/mayan/apps/folders/links.py b/mayan/apps/folders/links.py
index 53acb8417e..b755c966a2 100644
--- a/mayan/apps/folders/links.py
+++ b/mayan/apps/folders/links.py
@@ -20,8 +20,8 @@ link_folder_delete = Link(permissions=[PERMISSION_FOLDER_DELETE], text=_('Delete
 link_folder_view = Link(permissions=[PERMISSION_FOLDER_VIEW], text=_('Documents'), view='folders:folder_view', args='object.pk')
 link_folder_acl_list = Link(permissions=[ACLS_VIEW_ACL], text=_('ACLs'), view='folders:folder_acl_list', args='object.pk')
 
-folder_document_multiple_remove = {'text': _('Remove from folder'), 'view': 'folders:folder_document_multiple_remove', 'args': 'object.pk', 'famfam': 'folder_delete', 'permissions': [PERMISSION_FOLDER_REMOVE_DOCUMENT]}
-folder_add_document = {'text': _('Add to a folder'), 'view': 'folders:folder_add_document', 'args': 'object.pk', 'famfam': 'folder_add', 'permissions': [PERMISSION_FOLDER_ADD_DOCUMENT]}
-folder_add_multiple_documents = {'text': _('Add to folder'), 'view': 'folders:folder_add_multiple_documents', 'famfam': 'folder_add'}
-document_folder_list = {'text': _('Folders'), 'view': 'folders:document_folder_list', 'args': 'object.pk', 'famfam': 'folder_user', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
+link_folder_document_multiple_remove = Link(permissions=[PERMISSION_FOLDER_REMOVE_DOCUMENT], text=_('Remove from folder'), view='folders:folder_document_multiple_remove', args='object.pk')
+link_folder_add_document = Link(permissions=[PERMISSION_FOLDER_ADD_DOCUMENT], text=_('Add to a folder'), view='folders:folder_add_document', args='object.pk')
+link_folder_add_multiple_documents = Link(text=_('Add to folder'), view='folders:folder_add_multiple_documents')
+link_document_folder_list = Link(permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Folders'), view='folders:document_folder_list', args='object.pk')
 
diff --git a/mayan/apps/installation/apps.py b/mayan/apps/installation/apps.py
index aeb8ada778..c6841f3f35 100644
--- a/mayan/apps/installation/apps.py
+++ b/mayan/apps/installation/apps.py
@@ -3,9 +3,9 @@ from __future__ import unicode_literals
 from django import apps
 from django.utils.translation import ugettext_lazy as _
 
+from common import menu_tools
 from common.utils import encapsulate
-from navigation.api import register_links, register_model_list_columns
-from project_tools.api import register_tool
+from navigation.api import register_model_list_columns
 
 from .classes import Property, PropertyNamespace, PIPNotFound, VirtualEnv
 from .links import link_menu_link, link_namespace_details, link_namespace_list
@@ -38,9 +38,10 @@ class InstallationApp(apps.AppConfig):
             }
         ])
 
-        register_links(PropertyNamespace, [link_namespace_details])
-        register_links(['installation:namespace_list', PropertyNamespace], [link_namespace_list], menu_name='secondary_menu')
-        register_tool(link_menu_link)
+        # TODO: convert
+        #register_links(PropertyNamespace, [link_namespace_details])
+        #register_links(['installation:namespace_list', PropertyNamespace], [link_namespace_list], menu_name='secondary_menu')
+        menu_tools.bind_links(links=[link_menu_link])
 
         # Virtualenv
         namespace = PropertyNamespace('venv', _('VirtualEnv'))
diff --git a/mayan/apps/installation/links.py b/mayan/apps/installation/links.py
index c886010db4..f4f76d270f 100644
--- a/mayan/apps/installation/links.py
+++ b/mayan/apps/installation/links.py
@@ -2,8 +2,10 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
+from navigation import Link
+
 from .permissions import PERMISSION_INSTALLATION_DETAILS
 
-link_menu_link = {'text': _('Installation details'), 'view': 'installation:namespace_list', 'icon': 'fa fa-flag', 'permissions': [PERMISSION_INSTALLATION_DETAILS]}
+link_menu_link = Link(icon='fa fa-flag', permissions=[PERMISSION_INSTALLATION_DETAILS], text=_('Installation details'), view='installation:namespace_list')
 link_namespace_list = {'text': _('Installation property namespaces'), 'view': 'installation:namespace_list', 'famfam': 'layout', 'permissions': [PERMISSION_INSTALLATION_DETAILS]}
 link_namespace_details = {'text': _('Details'), 'view': 'installation:namespace_details', 'args': 'object.id', 'famfam': 'layout_link', 'permissions': [PERMISSION_INSTALLATION_DETAILS]}
diff --git a/mayan/apps/linking/apps.py b/mayan/apps/linking/apps.py
index 336f04c472..841decd582 100644
--- a/mayan/apps/linking/apps.py
+++ b/mayan/apps/linking/apps.py
@@ -5,9 +5,8 @@ from django.utils.translation import ugettext_lazy as _
 
 from acls.api import class_permissions
 from acls.permissions import ACLS_EDIT_ACL, ACLS_VIEW_ACL
+from common import menu_setup
 from documents.models import Document
-from navigation.api import register_links
-from project_setup.api import register_setup
 
 from .classes import ResolvedSmartLink
 from .links import (
@@ -15,7 +14,7 @@ from .links import (
     smart_link_condition_delete, smart_link_condition_edit,
     smart_link_condition_list, smart_link_delete, smart_link_document_types,
     smart_link_edit, smart_link_instance_view,
-    smart_link_instances_for_document, smart_link_list, smart_link_setup
+    smart_link_instances_for_document, smart_link_list, link_smart_link_setup
 )
 from .models import SmartLink, SmartLinkCondition
 from .permissions import (
@@ -29,14 +28,15 @@ class LinkingApp(apps.AppConfig):
     verbose_name = _('Linking')
 
     def ready(self):
-        register_links(Document, [smart_link_instances_for_document], menu_name='form_header')
-        register_links(SmartLink, [smart_link_edit, smart_link_document_types, smart_link_condition_list, smart_link_acl_list, smart_link_delete])
-        register_links([SmartLink, 'linking:smart_link_list', 'linking:smart_link_create'], [smart_link_list, smart_link_create], menu_name='secondary_menu')
-        register_links(SmartLinkCondition, [smart_link_condition_edit, smart_link_condition_delete])
-        register_links(ResolvedSmartLink, [smart_link_instance_view])
-        register_links(['linking:smart_link_condition_list', 'linking:smart_link_condition_create', 'linking:smart_link_condition_edit', 'linking:smart_link_condition_delete'], [smart_link_condition_create], menu_name='sidebar')
+        # TODO: convert
+        #register_links(Document, [smart_link_instances_for_document], menu_name='form_header')
+        #register_links(SmartLink, [smart_link_edit, smart_link_document_types, smart_link_condition_list, smart_link_acl_list, smart_link_delete])
+        #register_links([SmartLink, 'linking:smart_link_list', 'linking:smart_link_create'], [smart_link_list, smart_link_create], menu_name='secondary_menu')
+        #register_links(SmartLinkCondition, [smart_link_condition_edit, smart_link_condition_delete])
+        #register_links(ResolvedSmartLink, [smart_link_instance_view])
+        #register_links(['linking:smart_link_condition_list', 'linking:smart_link_condition_create', 'linking:smart_link_condition_edit', 'linking:smart_link_condition_delete'], [smart_link_condition_create], menu_name='sidebar')
 
-        register_setup(smart_link_setup)
+        menu_setup.bind_links(links=[link_smart_link_setup])
 
         class_permissions(SmartLink, [
             ACLS_EDIT_ACL, ACLS_VIEW_ACL, PERMISSION_SMART_LINK_DELETE,
diff --git a/mayan/apps/linking/links.py b/mayan/apps/linking/links.py
index ad37aa5f67..3baf7cac0f 100644
--- a/mayan/apps/linking/links.py
+++ b/mayan/apps/linking/links.py
@@ -4,13 +4,14 @@ from django.utils.translation import ugettext_lazy as _
 
 from acls.permissions import ACLS_VIEW_ACL
 from documents.permissions import PERMISSION_DOCUMENT_VIEW
+from navigation import Link
 
 from .permissions import (
     PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_DELETE,
     PERMISSION_SMART_LINK_EDIT, PERMISSION_SMART_LINK_VIEW
 )
 
-smart_link_setup = {'text': _('Smart links'), 'view': 'linking:smart_link_list', 'icon': 'fa fa-link', 'permissions': [PERMISSION_SMART_LINK_CREATE]}
+link_smart_link_setup = Link(icon='fa fa-link', permissions=[PERMISSION_SMART_LINK_CREATE], text=_('Smart links'), view='linking:smart_link_list')
 smart_link_list = {'text': _('Smart links'), 'view': 'linking:smart_link_list', 'famfam': 'link', 'permissions': [PERMISSION_SMART_LINK_CREATE]}
 smart_link_create = {'text': _('Create new smart link'), 'view': 'linking:smart_link_create', 'famfam': 'link_add', 'permissions': [PERMISSION_SMART_LINK_CREATE]}
 smart_link_edit = {'text': _('Edit'), 'view': 'linking:smart_link_edit', 'args': 'object.pk', 'famfam': 'link_edit', 'permissions': [PERMISSION_SMART_LINK_EDIT]}
diff --git a/mayan/apps/mailer/apps.py b/mayan/apps/mailer/apps.py
index 1e9fefee99..dca804ba90 100644
--- a/mayan/apps/mailer/apps.py
+++ b/mayan/apps/mailer/apps.py
@@ -4,10 +4,10 @@ from django import apps
 from django.utils.translation import ugettext_lazy as _
 
 from acls.api import class_permissions
+from common import menu_object
 from documents.models import Document
-from navigation.api import register_links
 
-from .links import send_document_link, send_document
+from .links import link_send_document_link, link_send_document
 from .permissions import (
     PERMISSION_MAILING_LINK, PERMISSION_MAILING_SEND_DOCUMENT
 )
@@ -18,7 +18,7 @@ class MailerApp(apps.AppConfig):
     verbose_name = _('Mailer')
 
     def ready(self):
-        register_links([Document], [send_document_link, send_document])
+        menu_object.bind_links(links=[link_send_document_link, link_send_document], sources=[Document])
 
         class_permissions(Document, [
             PERMISSION_MAILING_LINK, PERMISSION_MAILING_SEND_DOCUMENT
diff --git a/mayan/apps/mailer/links.py b/mayan/apps/mailer/links.py
index efff6e070f..587b82f373 100644
--- a/mayan/apps/mailer/links.py
+++ b/mayan/apps/mailer/links.py
@@ -2,7 +2,9 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
+from navigation import Link
+
 from .permissions import PERMISSION_MAILING_LINK, PERMISSION_MAILING_SEND_DOCUMENT
 
-send_document_link = {'text': _('Email link'), 'view': 'mailer:send_document_link', 'args': 'object.pk', 'famfam': 'email_link', 'permissions': [PERMISSION_MAILING_LINK]}
-send_document = {'text': _('Email document'), 'view': 'mailer:send_document', 'args': 'object.pk', 'famfam': 'email_open', 'permissions': [PERMISSION_MAILING_SEND_DOCUMENT]}
+link_send_document_link = Link(permissions=[PERMISSION_MAILING_LINK], text=_('Email link'), view='mailer:send_document_link', args='object.pk')
+link_send_document = Link(permissions=[PERMISSION_MAILING_SEND_DOCUMENT], text=_('Email document'), view='mailer:send_document', args='object.pk')
diff --git a/mayan/apps/main/apps.py b/mayan/apps/main/apps.py
index 914704abfe..cad87fae83 100644
--- a/mayan/apps/main/apps.py
+++ b/mayan/apps/main/apps.py
@@ -3,10 +3,12 @@ from __future__ import unicode_literals
 from django import apps
 from django.utils.translation import ugettext_lazy as _
 
-from project_setup.api import register_setup
-from project_tools.api import register_tool
+from common import menu_main, menu_setup, menu_tools
 
-from .links import admin_site, maintenance_menu
+
+from .links import (
+    link_admin_site, link_maintenance_menu, link_tools, link_setup, link_tools
+)
 
 
 class MainApp(apps.AppConfig):
@@ -14,5 +16,7 @@ class MainApp(apps.AppConfig):
     verbose_name = _('Main')
 
     def ready(self):
-        register_setup(admin_site)
-        register_tool(maintenance_menu)
+        menu_setup.bind_links(links=[link_admin_site])
+        menu_tools.bind_links(links=[link_maintenance_menu])
+        menu_main.bind_links(links=[link_tools], position=-3)
+        menu_main.bind_links(links=[link_setup], position=-2)
diff --git a/mayan/apps/main/links.py b/mayan/apps/main/links.py
index 1081defff4..a62c0c7108 100644
--- a/mayan/apps/main/links.py
+++ b/mayan/apps/main/links.py
@@ -2,10 +2,14 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
+from navigation import Link
+
 
 def is_superuser(context):
     return context['request'].user.is_staff or context['request'].user.is_superuser
 
 
-maintenance_menu = {'text': _('Maintenance'), 'view': 'main:maintenance_menu', 'icon': 'fa fa-wrench'}
-admin_site = {'text': _('Admin site'), 'view': 'admin:index', 'icon': 'fa fa-keyboard-o', 'condition': is_superuser}
+link_maintenance_menu = Link(icon='fa fa-wrench', text=_('Maintenance'), view='main:maintenance_menu')
+link_admin_site = Link(condition=is_superuser, icon='fa fa-keyboard-o', text=_('Admin site'), view='admin:index')
+link_setup = Link(icon='fa fa-gear', text=_('Setup'), view='main:setup_list')
+link_tools = Link(icon='fa fa-wrench', text=_('Tools'), view='main:tools_list')
diff --git a/mayan/apps/main/urls.py b/mayan/apps/main/urls.py
index bd196b72c4..1d5d3ed1ad 100644
--- a/mayan/apps/main/urls.py
+++ b/mayan/apps/main/urls.py
@@ -7,6 +7,8 @@ from django.views.generic import RedirectView
 urlpatterns = patterns('main.views',
     url(r'^$', 'home', (), 'home'),
     url(r'^maintenance_menu/$', 'maintenance_menu', (), 'maintenance_menu'),
+    url(r'^setup/$', 'setup_list', (), 'setup_list'),
+    url(r'^tools/$', 'tools_list', (), 'tools_list'),
 )
 
 urlpatterns += patterns('',
diff --git a/mayan/apps/main/views.py b/mayan/apps/main/views.py
index 3652bd86f6..cdfb033fa6 100644
--- a/mayan/apps/main/views.py
+++ b/mayan/apps/main/views.py
@@ -5,6 +5,7 @@ from django.shortcuts import render_to_response
 from django.template import RequestContext
 from django.utils.translation import ugettext_lazy as _
 
+from common.menus import menu_setup, menu_tools
 from dynamic_search.classes import SearchModel
 from permissions.models import Permission
 
@@ -52,3 +53,23 @@ def maintenance_menu(request):
         'blocks': user_tools,
         'title': _('Maintenance menu')
     }, context_instance=RequestContext(request))
+
+
+def setup_list(request):
+    context = {
+        'object_navigation_links': menu_setup.resolve(context=RequestContext(request)),
+        'title': _('Setup items'),
+    }
+
+    return render_to_response('appearance/generic_list_horizontal.html', context,
+                              context_instance=RequestContext(request))
+
+
+def tools_list(request):
+    context = {
+        'object_navigation_links': menu_tools.resolve(context=RequestContext(request)),
+        'title': _('Tools'),
+    }
+
+    return render_to_response('appearance/generic_list_horizontal.html', context,
+                              context_instance=RequestContext(request))
diff --git a/mayan/apps/metadata/apps.py b/mayan/apps/metadata/apps.py
index 8c85678d92..0b030a2bd9 100644
--- a/mayan/apps/metadata/apps.py
+++ b/mayan/apps/metadata/apps.py
@@ -7,14 +7,12 @@ from django.db.models.signals import post_delete, post_save
 from django.utils.translation import ugettext_lazy as _
 
 from acls.api import class_permissions
+from common import menu_setup, menu_tools
 from common.classes import ModelAttribute
 from common.utils import encapsulate
 from documents.models import Document, DocumentType
 from documents.signals import post_document_type_change
-from navigation.api import register_links, register_model_list_columns
-from navigation.links import link_spacer
-from project_setup.api import register_setup
-from project_tools.api import register_tool
+from navigation.api import register_model_list_columns
 from rest_api.classes import APIEndPoint
 
 from .api import get_metadata_string
@@ -24,7 +22,7 @@ from .links import (
     metadata_multiple_remove, metadata_remove, metadata_view,
     setup_document_type_metadata, setup_document_type_metadata_required,
     setup_metadata_type_create, setup_metadata_type_delete,
-    setup_metadata_type_edit, setup_metadata_type_list,
+    setup_metadata_type_edit, link_setup_metadata_type_list,
     link_documents_missing_required_metadata
 )
 from .models import DocumentMetadata, DocumentTypeMetadataType, MetadataType
@@ -72,15 +70,16 @@ class MetadataApp(apps.AppConfig):
 
         Document.add_to_class('metadata_value_of', DocumentMetadataHelper.constructor)
 
-        register_links(['metadata:metadata_add', 'metadata:metadata_edit', 'metadata:metadata_remove', 'metadata:metadata_view'], [metadata_add, metadata_edit, metadata_remove], menu_name='sidebar')
-        register_links(Document, [metadata_view], menu_name='form_header')
-        register_links([Document], [metadata_multiple_add, metadata_multiple_edit, metadata_multiple_remove, link_spacer], menu_name='multi_item_links')
-        register_links(DocumentType, [setup_document_type_metadata, setup_document_type_metadata_required])
-        register_links(MetadataType, [setup_metadata_type_edit, setup_metadata_type_delete])
-        register_links([MetadataType, 'metadata:setup_metadata_type_list', 'metadata:setup_metadata_type_create'], [setup_metadata_type_list, setup_metadata_type_create], menu_name='secondary_menu')
+        # TODO: convert
+        #register_links(['metadata:metadata_add', 'metadata:metadata_edit', 'metadata:metadata_remove', 'metadata:metadata_view'], [metadata_add, metadata_edit, metadata_remove], menu_name='sidebar')
+        #register_links(Document, [metadata_view], menu_name='form_header')
+        #register_links([Document], [metadata_multiple_add, metadata_multiple_edit, metadata_multiple_remove, link_spacer], menu_name='multi_item_links')
+        #register_links(DocumentType, [setup_document_type_metadata, setup_document_type_metadata_required])
+        #register_links(MetadataType, [setup_metadata_type_edit, setup_metadata_type_delete])
+        #register_links([MetadataType, 'metadata:setup_metadata_type_list', 'metadata:setup_metadata_type_create'], [setup_metadata_type_list, setup_metadata_type_create], menu_name='secondary_menu')
 
-        register_setup(setup_metadata_type_list)
-        register_tool(link_documents_missing_required_metadata)
+        menu_setup.bind_links(links=[link_setup_metadata_type_list])
+        menu_tools.bind_links(links=[link_documents_missing_required_metadata])
 
         class_permissions(Document, [
             PERMISSION_METADATA_DOCUMENT_ADD, PERMISSION_METADATA_DOCUMENT_EDIT,
diff --git a/mayan/apps/metadata/links.py b/mayan/apps/metadata/links.py
index bc7086035c..c65ab9cfbd 100644
--- a/mayan/apps/metadata/links.py
+++ b/mayan/apps/metadata/links.py
@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 from django.utils.translation import ugettext_lazy as _
 
 from documents.permissions import PERMISSION_DOCUMENT_TYPE_EDIT
+from navigation import Link
 
 from .permissions import (
     PERMISSION_METADATA_DOCUMENT_ADD, PERMISSION_METADATA_DOCUMENT_EDIT,
@@ -23,9 +24,9 @@ metadata_multiple_remove = {'text': _('Remove metadata'), 'view': 'metadata:meta
 setup_document_type_metadata = {'text': _('Optional metadata'), 'view': 'metadata:setup_document_type_metadata', 'args': 'document_type.pk', 'famfam': 'xhtml', 'permissions': [PERMISSION_DOCUMENT_TYPE_EDIT]}
 setup_document_type_metadata_required = {'text': _('Required metadata'), 'view': 'metadata:setup_document_type_metadata_required', 'args': 'document_type.pk', 'famfam': 'xhtml', 'permissions': [PERMISSION_DOCUMENT_TYPE_EDIT]}
 
-setup_metadata_type_list = {'text': _('Metadata types'), 'view': 'metadata:setup_metadata_type_list', 'icon': 'fa fa-list', 'permissions': [PERMISSION_METADATA_TYPE_VIEW]}
+link_setup_metadata_type_list = Link(icon='fa fa-list', permissions=[PERMISSION_METADATA_TYPE_VIEW], text=_('Metadata types'), view='metadata:setup_metadata_type_list')
 setup_metadata_type_edit = {'text': _('Edit'), 'view': 'metadata:setup_metadata_type_edit', 'args': 'object.pk', 'famfam': 'xhtml', 'permissions': [PERMISSION_METADATA_TYPE_EDIT]}
 setup_metadata_type_delete = {'text': _('Delete'), 'view': 'metadata:setup_metadata_type_delete', 'args': 'object.pk', 'famfam': 'xhtml_delete', 'permissions': [PERMISSION_METADATA_TYPE_DELETE]}
 setup_metadata_type_create = {'text': _('Create new'), 'view': 'metadata:setup_metadata_type_create', 'famfam': 'xhtml_add', 'permissions': [PERMISSION_METADATA_TYPE_CREATE]}
 
-link_documents_missing_required_metadata = {'text': _('Missing required metadata'), 'view': 'metadata:documents_missing_required_metadata', 'icon': 'fa fa-edit'}
+link_documents_missing_required_metadata = Link(icon='fa fa-edit', text=_('Missing required metadata'), view='metadata:documents_missing_required_metadata')
diff --git a/mayan/apps/navigation/__init__.py b/mayan/apps/navigation/__init__.py
index bd42ff338e..6fda786e46 100644
--- a/mayan/apps/navigation/__init__.py
+++ b/mayan/apps/navigation/__init__.py
@@ -1 +1 @@
-from .classes import Link, Menu  # NOQA
+from .classes import CombinedSource, Link, Menu  # NOQA
diff --git a/mayan/apps/navigation/api.py b/mayan/apps/navigation/api.py
index eaa01ce36a..c0036ea691 100644
--- a/mayan/apps/navigation/api.py
+++ b/mayan/apps/navigation/api.py
@@ -1,32 +1,8 @@
 from __future__ import unicode_literals
 
-object_navigation = {}
 model_list_columns = {}
 
 
-def register_links(src, links, menu_name=None, position=None):
-    """
-    Associate a link to a model a view, or an url
-    """
-
-    object_navigation.setdefault(menu_name, {})
-    if isinstance(src, list):
-        for one_src in src:
-            object_navigation[menu_name].setdefault(one_src, {'links': []})
-            if position is not None:
-                for link in reversed(links):
-                    object_navigation[menu_name][one_src]['links'].insert(position, link)
-            else:
-                object_navigation[menu_name][one_src]['links'].extend(links)
-    else:
-        object_navigation[menu_name].setdefault(src, {'links': []})
-        if position is not None:
-            for link in reversed(links):
-                object_navigation[menu_name][src]['links'].insert(position, link)
-        else:
-            object_navigation[menu_name][src]['links'].extend(links)
-
-
 def register_model_list_columns(model, columns):
     """
     Define which columns will be displayed in the generic list template
diff --git a/mayan/apps/navigation/classes.py b/mayan/apps/navigation/classes.py
index 694fe75d65..b7bc3fd9ae 100644
--- a/mayan/apps/navigation/classes.py
+++ b/mayan/apps/navigation/classes.py
@@ -54,8 +54,22 @@ class Menu(object):
             source_links = self.bound_links.setdefault(None, [])
             source_links.extend(links)
 
-    def resolve(self, context):
+    def resolve_for_source(self, context, source):
+        request = Variable('request').resolve(context)
+        current_path = request.META['PATH_INFO']
+        current_view = resolve(current_path).view_name
+
         result = []
+
+        for link in self.bound_links.get(CombinedSource(obj=(source), view=current_view), []):
+            result.append(link.resolve(context))
+
+        for link in self.bound_links.get(source, []):
+            result.append(link.resolve(context))
+
+        return result
+
+    def resolve(self, context):
         request = Variable('request').resolve(context)
         current_path = request.META['PATH_INFO']
 
@@ -63,6 +77,8 @@ class Menu(object):
         current_view = resolve(current_path).view_name
         resolved_navigation_object_list = []
 
+        result = []
+
         navigation_object_list = context.get('navigation_object_list', [{'object': 'object'}])
 
         # Multiple objects
@@ -72,17 +88,28 @@ class Menu(object):
             except VariableDoesNotExist:
                 pass
 
-        # Main menu links
-        for link in self.bound_links.get(None, []):
-            result.append(link.resolve(context))
-
         for resolved_navigation_object in resolved_navigation_object_list:
             for source, links in self.bound_links.iteritems():
-                if inspect.isclass(source) and isinstance(resolved_navigation_object, source) or Combined(obj=type(resolved_navigation_object), view=current_view) == source:
+                if inspect.isclass(source) and isinstance(resolved_navigation_object, source) or source == CombinedSource(obj=(resolved_navigation_object), view=current_view):
                     for link in links:
-                        result.append(link.resolve(context))
+                        resolved_link = link.resolve(context)
+                        if resolved_link:
+                            result.append(resolved_link)
+
                     #break  # No need for further content object match testing
 
+        # View links
+        for link in self.bound_links.get(current_view, []):
+            resolved_link = link.resolve(context)
+            if resolved_link:
+                result.append(resolved_link)
+
+        # Main menu links
+        for link in self.bound_links.get(None, []):
+            resolved_link = link.resolve(context)
+            if resolved_link:
+                result.append(resolved_link)
+
         return result
 
 
@@ -153,6 +180,7 @@ class Link(object):
         self.conditional_highlight = conditional_highlight  # Used by dynamic sources
 
     def resolve(self, context):
+        # TODO: Check ACLs
         request = Variable('request').resolve(context)
         current_path = request.META['PATH_INFO']
         current_view = resolve(current_path).view_name
@@ -406,7 +434,7 @@ class ModelListColumn(object):
         self.__class__._model_list_columns[model].extend(columns)
 
 
-class Combined(object):
+class CombinedSource(object):
     """
     Class that binds a link to a combination of an object and a view.
     This is used to show links relating to a specific object type but only
diff --git a/mayan/apps/navigation/forms.py b/mayan/apps/navigation/forms.py
index 77c2b51502..bd098de4f8 100644
--- a/mayan/apps/navigation/forms.py
+++ b/mayan/apps/navigation/forms.py
@@ -3,8 +3,6 @@ from __future__ import unicode_literals
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 
-from .links import link_spacer
-
 
 class MultiItemForm(forms.Form):
     def __init__(self, *args, **kwargs):
diff --git a/mayan/apps/navigation/links.py b/mayan/apps/navigation/links.py
deleted file mode 100644
index a1ee10eb68..0000000000
--- a/mayan/apps/navigation/links.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-link_spacer = {'text': ('────────────'), 'url': ''}
diff --git a/mayan/apps/navigation/templatetags/navigation_tags.py b/mayan/apps/navigation/templatetags/navigation_tags.py
index c0ec49b0a2..0e76b042c3 100644
--- a/mayan/apps/navigation/templatetags/navigation_tags.py
+++ b/mayan/apps/navigation/templatetags/navigation_tags.py
@@ -15,7 +15,6 @@ from django.utils.text import unescape_string_literal
 
 from common.utils import urlquote
 
-from ..api import object_navigation
 from ..classes import Menu
 from ..forms import MultiItemForm
 
@@ -23,17 +22,13 @@ register = Library()
 
 
 @register.assignment_tag(takes_context=True)
-def get_top_menu_links(context):
-    return Menu.get('main menu').resolve(context=context)
-
-
-@register.assignment_tag(takes_context=True)
-def get_object_facet_links(context):
-    return Menu.get('object facet').resolve(context=context)
+def get_menu_links(context, name):
+    return Menu.get(name).resolve(context=context)
 
 
 @register.assignment_tag(takes_context=True)
 def get_action_links(context):
+    # TODO: move this logic to template
     result = []
 
     for menu_name in ['object menu', 'sidebar menu', 'secondary menu']:
@@ -46,15 +41,7 @@ def get_action_links(context):
 
 @register.simple_tag(takes_context=True)
 def get_multi_item_links_form(context, object_list):
-    first_object = object_list[0]
-
-    actions = []#(link.url, link.text) for link in Menu.get('multi items').resolve(context=context, obj=first_object)]
+    actions = [(link.url, link.text) for link in Menu.get('multi item menu').resolve_for_source(context=context, source=type(object_list[0]))]
     form = MultiItemForm(actions=actions)
     context.update({'multi_item_form': form, 'multi_item_actions': actions})
     return ''
-
-
-@register.assignment_tag(takes_context=True)
-def get_object_links(context):
-    return Menu.get('object menu').resolve(context=context)
-
diff --git a/mayan/apps/ocr/apps.py b/mayan/apps/ocr/apps.py
index 42b55db130..f57126e0e9 100644
--- a/mayan/apps/ocr/apps.py
+++ b/mayan/apps/ocr/apps.py
@@ -8,15 +8,14 @@ from django import apps
 from django.utils.translation import ugettext_lazy as _
 
 from acls.api import class_permissions
+from common import menu_tools
 from common.utils import encapsulate
 from documents.models import Document, DocumentVersion
 from documents.signals import post_version_upload
 from documents.widgets import document_link
 from installation import PropertyNamespace
 from main.api import register_maintenance_links
-from navigation.api import register_links, register_model_list_columns
-from navigation.links import link_spacer
-from project_tools.api import register_tool
+from navigation.api import register_model_list_columns
 from rest_api.classes import APIEndPoint
 
 from .links import (
@@ -53,12 +52,12 @@ class OCRApp(apps.AppConfig):
     verbose_name = _('OCR')
 
     def ready(self):
-        register_links(Document, [link_document_submit])
-        register_links([Document], [link_document_submit_multiple, link_spacer], menu_name='multi_item_links')
-
-        register_links([DocumentVersionOCRError], [link_entry_re_queue_multiple, link_entry_delete_multiple], menu_name='multi_item_links')
-        register_links([DocumentVersionOCRError], [link_entry_re_queue, link_entry_delete])
-        register_links(['ocr:entry_list', 'ocr:entry_delete_multiple', 'ocr:entry_re_queue_multiple', DocumentVersionOCRError], [link_entry_list], menu_name='secondary_menu')
+        # TODO: convert
+        #register_links(Document, [link_document_submit])
+        #register_links([Document], [link_document_submit_multiple, link_spacer], menu_name='multi_item_links')
+        #register_links([DocumentVersionOCRError], [link_entry_re_queue_multiple, link_entry_delete_multiple], menu_name='multi_item_links')
+        #register_links([DocumentVersionOCRError], [link_entry_re_queue, link_entry_delete])
+        #register_links(['ocr:entry_list', 'ocr:entry_delete_multiple', 'ocr:entry_re_queue_multiple', DocumentVersionOCRError], [link_entry_list], menu_name='secondary_menu')
         register_maintenance_links([link_document_all_ocr_cleanup], namespace='ocr', title=_('OCR'))
 
         post_version_upload.connect(post_version_upload_ocr, dispatch_uid='post_version_upload_ocr', sender=DocumentVersion)
@@ -68,7 +67,7 @@ class OCRApp(apps.AppConfig):
 
         class_permissions(Document, [PERMISSION_OCR_DOCUMENT])
 
-        register_tool(link_entry_list)
+        menu_tools.bind_links(links=[link_entry_list])
 
         APIEndPoint('ocr')
 
diff --git a/mayan/apps/ocr/links.py b/mayan/apps/ocr/links.py
index b7bfef9895..91ad5584a1 100644
--- a/mayan/apps/ocr/links.py
+++ b/mayan/apps/ocr/links.py
@@ -22,4 +22,4 @@ link_document_all_ocr_cleanup = Link(
     text=_('Clean up pages content'), view='ocr:document_all_ocr_cleanup'
 )
 
-link_entry_list = {'text': _('OCR Errors'), 'view': 'ocr:entry_list', 'icon': 'fa fa-file-text-o', 'permissions': [PERMISSION_OCR_DOCUMENT]}
+link_entry_list = Link(icon='fa fa-file-text-o', permissions=[PERMISSION_OCR_DOCUMENT], text=_('OCR Errors'), view='ocr:entry_list')
diff --git a/mayan/apps/permissions/apps.py b/mayan/apps/permissions/apps.py
index 7e59bc0401..4f7c01ea68 100644
--- a/mayan/apps/permissions/apps.py
+++ b/mayan/apps/permissions/apps.py
@@ -6,14 +6,14 @@ from django.core.exceptions import ObjectDoesNotExist
 from django.db.models.signals import post_save
 from django.utils.translation import ugettext_lazy as _
 
-from navigation.api import register_links
-from project_setup.api import register_setup
+from common.menus import menu_setup
 from rest_api.classes import APIEndPoint
 
 from .models import Role
 from .links import (
-    permission_grant, permission_revoke, role_create, role_delete, role_edit,
-    role_list, role_members, role_permissions
+    link_permission_grant, link_permission_revoke, link_role_create,
+    link_role_delete, link_role_edit, link_role_list, link_role_members,
+    link_role_permissions
 )
 from .settings import DEFAULT_ROLES
 
@@ -38,12 +38,13 @@ class PermissionsApp(apps.AppConfig):
     verbose_name = _('Permissions')
 
     def ready(self):
-        register_links(Role, [role_edit, role_members, role_permissions, role_delete])
-        register_links([Role, 'permissions:role_create', 'permissions:role_list'], [role_list, role_create], menu_name='secondary_menu')
-        register_links(['permissions:role_permissions'], [permission_grant, permission_revoke], menu_name='multi_item_links')
+        # TODO: convert
+        #register_links(Role, [role_edit, role_members, role_permissions, role_delete])
+        #register_links([Role, 'permissions:role_create', 'permissions:role_list'], [role_list, role_create], menu_name='secondary_menu')
+        #register_links(['permissions:role_permissions'], [permission_grant, permission_revoke], menu_name='multi_item_links')
 
         post_save.connect(user_post_save, sender=User)
 
-        register_setup(role_list)
+        menu_setup.bind_links(links=[link_role_list])
 
         APIEndPoint('permissions')
diff --git a/mayan/apps/permissions/links.py b/mayan/apps/permissions/links.py
index 34bc6c6286..b5e9f1c776 100644
--- a/mayan/apps/permissions/links.py
+++ b/mayan/apps/permissions/links.py
@@ -2,18 +2,19 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
+from navigation import Link
+
 from .permissions import (
     PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE,
     PERMISSION_ROLE_CREATE, PERMISSION_ROLE_DELETE, PERMISSION_ROLE_EDIT,
     PERMISSION_ROLE_VIEW
 )
 
-permission_grant = {'text': _('Grant'), 'view': 'permissions:permission_multiple_grant', 'famfam': 'key_add', 'permissions': [PERMISSION_PERMISSION_GRANT]}
-permission_revoke = {'text': _('Revoke'), 'view': 'permissions:permission_multiple_revoke', 'famfam': 'key_delete', 'permissions': [PERMISSION_PERMISSION_REVOKE]}
-
-role_create = {'text': _('Create new role'), 'view': 'permissions:role_create', 'famfam': 'medal_gold_add', 'permissions': [PERMISSION_ROLE_CREATE]}
-role_delete = {'text': _('Delete'), 'view': 'permissions:role_delete', 'args': 'object.id', 'famfam': 'medal_gold_delete', 'permissions': [PERMISSION_ROLE_DELETE]}
-role_edit = {'text': _('Edit'), 'view': 'permissions:role_edit', 'args': 'object.id', 'famfam': 'medal_gold_1', 'permissions': [PERMISSION_ROLE_EDIT]}
-role_list = {'text': _('Roles'), 'view': 'permissions:role_list', 'icon': 'fa fa-child', 'permissions': [PERMISSION_ROLE_VIEW]}
-role_members = {'text': _('Members'), 'view': 'permissions:role_members', 'args': 'object.id', 'famfam': 'group_key', 'permissions': [PERMISSION_ROLE_EDIT]}
-role_permissions = {'text': _('Role permissions'), 'view': 'permissions:role_permissions', 'args': 'object.id', 'famfam': 'key_go', 'permissions': [PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE]}
+link_permission_grant = Link(permissions=[PERMISSION_PERMISSION_GRANT], text=_('Grant'), view='permissions:permission_multiple_grant')
+link_permission_revoke = Link(permissions=[PERMISSION_PERMISSION_REVOKE], text=_('Revoke'), view='permissions:permission_multiple_revoke')
+link_role_create = {'text': _('Create new role'), 'view': 'permissions:role_create', 'famfam': 'medal_gold_add', 'permissions': [PERMISSION_ROLE_CREATE]}
+link_role_delete = {'text': _('Delete'), 'view': 'permissions:role_delete', 'args': 'object.id', 'famfam': 'medal_gold_delete', 'permissions': [PERMISSION_ROLE_DELETE]}
+link_role_edit = {'text': _('Edit'), 'view': 'permissions:role_edit', 'args': 'object.id', 'famfam': 'medal_gold_1', 'permissions': [PERMISSION_ROLE_EDIT]}
+link_role_list = Link(icon='fa fa-child', permissions=[PERMISSION_ROLE_VIEW], text=_('Roles'), view='permissions:role_list')
+link_role_members = {'text': _('Members'), 'view': 'permissions:role_members', 'args': 'object.id', 'famfam': 'group_key', 'permissions': [PERMISSION_ROLE_EDIT]}
+link_role_permissions = {'text': _('Role permissions'), 'view': 'permissions:role_permissions', 'args': 'object.id', 'famfam': 'key_go', 'permissions': [PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE]}
diff --git a/mayan/apps/permissions/templatetags/__init__.py b/mayan/apps/permissions/templatetags/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/mayan/apps/permissions/templatetags/permission_tags.py b/mayan/apps/permissions/templatetags/permission_tags.py
deleted file mode 100644
index 8adad8e992..0000000000
--- a/mayan/apps/permissions/templatetags/permission_tags.py
+++ /dev/null
@@ -1,41 +0,0 @@
-from __future__ import absolute_import, unicode_literals
-
-from django.core.exceptions import PermissionDenied
-from django.template import TemplateSyntaxError, Library, Node, Variable
-
-from permissions.models import Permission
-
-register = Library()
-
-
-class CheckPermissionsNode(Node):
-    def __init__(self, requester, permission_list=None, *args, **kwargs):
-        self.requester = requester
-        self.permission_list = permission_list
-
-    def render(self, context):
-        permission_list = Variable(self.permission_list).resolve(context)
-        if not permission_list:
-            # There is no permissions list to check against which means
-            # this link is available for all
-            context['permission'] = True
-            return ''
-        requester = Variable(self.requester).resolve(context)
-        try:
-            Permission.objects.check_permissions(requester, permission_list)
-            context['permission'] = True
-            return ''
-        except PermissionDenied:
-            context['permission'] = False
-            return ''
-
-
-@register.tag
-def check_permissions(parser, token):
-    try:
-        # Splitting by None == splitting by spaces.
-        tag_name, args = token.contents.split(None, 1)
-    except ValueError:
-        raise TemplateSyntaxError('%r tag requires arguments' % token.contents.split()[0])
-
-    return CheckPermissionsNode(*args.split())
diff --git a/mayan/apps/project_setup/__init__.py b/mayan/apps/project_setup/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/mayan/apps/project_setup/api.py b/mayan/apps/project_setup/api.py
deleted file mode 100644
index 424d250915..0000000000
--- a/mayan/apps/project_setup/api.py
+++ /dev/null
@@ -1,5 +0,0 @@
-setup_items = []
-
-
-def register_setup(link):
-    setup_items.append(link)
diff --git a/mayan/apps/project_setup/apps.py b/mayan/apps/project_setup/apps.py
deleted file mode 100644
index 484f49c284..0000000000
--- a/mayan/apps/project_setup/apps.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from __future__ import unicode_literals
-
-from django import apps
-from django.utils.translation import ugettext_lazy as _
-
-from common.menus import menu_main
-
-from .links import link_setup
-
-
-class ProjectSetupApp(apps.AppConfig):
-    name = 'project_setup'
-    verbose_name = _('Project setup')
-
-    def ready(self):
-        menu_main.bind_links(links=[link_setup], position=-2)
diff --git a/mayan/apps/project_setup/links.py b/mayan/apps/project_setup/links.py
deleted file mode 100644
index a955bde748..0000000000
--- a/mayan/apps/project_setup/links.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from __future__ import unicode_literals
-
-from django.utils.translation import ugettext_lazy as _
-
-from navigation import Link
-
-link_setup = Link(icon='fa fa-gear', text=_('Setup'), view='project_setup:setup_list')
diff --git a/mayan/apps/project_setup/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/ar/LC_MESSAGES/django.mo
deleted file mode 100644
index fd38c63bcb..0000000000
Binary files a/mayan/apps/project_setup/locale/ar/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/ar/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/ar/LC_MESSAGES/django.po
deleted file mode 100644
index f11f14edc5..0000000000
--- a/mayan/apps/project_setup/locale/ar/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Mohammed ALDOUB <voulnet@gmail.com>, 2013
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/mayan-edms/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr ""
-
-#: views.py:13
-msgid "Setup items"
-msgstr ""
diff --git a/mayan/apps/project_setup/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/bg/LC_MESSAGES/django.mo
deleted file mode 100644
index 47aebdcfe8..0000000000
Binary files a/mayan/apps/project_setup/locale/bg/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/bg/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/bg/LC_MESSAGES/django.po
deleted file mode 100644
index e6560dfb50..0000000000
--- a/mayan/apps/project_setup/locale/bg/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Pavlin Koldamov <pkoldamov@gmail.com>, 2012
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Bulgarian (http://www.transifex.com/projects/p/mayan-edms/language/bg/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr ""
-
-#: views.py:13
-msgid "Setup items"
-msgstr ""
diff --git a/mayan/apps/project_setup/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/bs_BA/LC_MESSAGES/django.mo
deleted file mode 100644
index 78a9dee774..0000000000
Binary files a/mayan/apps/project_setup/locale/bs_BA/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/bs_BA/LC_MESSAGES/django.po
deleted file mode 100644
index 950b3c83b0..0000000000
--- a/mayan/apps/project_setup/locale/bs_BA/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# www.ping.ba <jomer@ping.ba>, 2013
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/projects/p/mayan-edms/language/bs_BA/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bs_BA\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr ""
-
-#: views.py:13
-msgid "Setup items"
-msgstr ""
diff --git a/mayan/apps/project_setup/locale/da/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/da/LC_MESSAGES/django.mo
deleted file mode 100644
index 0cb712a7d7..0000000000
Binary files a/mayan/apps/project_setup/locale/da/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/da/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/da/LC_MESSAGES/django.po
deleted file mode 100644
index eb3aaf730f..0000000000
--- a/mayan/apps/project_setup/locale/da/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Mads L. Nielsen <sirlundgaard@gmail.com>, 2013
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/mayan-edms/language/da/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr ""
-
-#: views.py:13
-msgid "Setup items"
-msgstr ""
diff --git a/mayan/apps/project_setup/locale/de_CH/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/de_CH/LC_MESSAGES/django.mo
deleted file mode 100644
index a4864c468d..0000000000
Binary files a/mayan/apps/project_setup/locale/de_CH/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/de_CH/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/de_CH/LC_MESSAGES/django.po
deleted file mode 100644
index b07a6f6fd2..0000000000
--- a/mayan/apps/project_setup/locale/de_CH/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/"
-"mayan-edms/language/de_CH/)\n"
-"Language: de_CH\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr ""
-
-#: views.py:13
-msgid "Setup items"
-msgstr ""
diff --git a/mayan/apps/project_setup/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/de_DE/LC_MESSAGES/django.mo
deleted file mode 100644
index 3ed0e7bc7e..0000000000
Binary files a/mayan/apps/project_setup/locale/de_DE/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/de_DE/LC_MESSAGES/django.po
deleted file mode 100644
index 1cf0db07ec..0000000000
--- a/mayan/apps/project_setup/locale/de_DE/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,30 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Mathias Behrle <mbehrle@m9s.biz>, 2014
-# tetjarediske <tetja.rediske@googlemail.com>, 2012
-# tetjarediske <tetja.rediske@googlemail.com>, 2012
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2015-02-07 00:10+0000\n"
-"Last-Translator: Mathias Behrle <mathiasb@m9s.biz>\n"
-"Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-edms/language/de_DE/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de_DE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr "Setup"
-
-#: views.py:13
-msgid "Setup items"
-msgstr "Setupelemente"
diff --git a/mayan/apps/project_setup/locale/en/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/en/LC_MESSAGES/django.mo
deleted file mode 100644
index 27c5ba31bf..0000000000
Binary files a/mayan/apps/project_setup/locale/en/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/en/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/en/LC_MESSAGES/django.po
deleted file mode 100644
index faa9a5d4c9..0000000000
--- a/mayan/apps/project_setup/locale/en/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,29 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2011-09-30 04:42+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
-"language/en/)\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5
-#, fuzzy
-msgid "Setup"
-msgstr "setup"
-
-#: views.py:13
-#, fuzzy
-msgid "Setup items"
-msgstr "setup items"
diff --git a/mayan/apps/project_setup/locale/es/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/es/LC_MESSAGES/django.mo
deleted file mode 100644
index 3da7912b31..0000000000
Binary files a/mayan/apps/project_setup/locale/es/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/es/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/es/LC_MESSAGES/django.po
deleted file mode 100644
index 01ec537870..0000000000
--- a/mayan/apps/project_setup/locale/es/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,29 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Lory977 <helga.carrero@gmail.com>, 2015
-# Roberto Rosario, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2015-01-12 19:29+0000\n"
-"Last-Translator: Lory977 <helga.carrero@gmail.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/mayan-edms/language/es/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr "Configuración"
-
-#: views.py:13
-msgid "Setup items"
-msgstr "Elementos de configuración"
diff --git a/mayan/apps/project_setup/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/fa/LC_MESSAGES/django.mo
deleted file mode 100644
index bd98cc97b5..0000000000
Binary files a/mayan/apps/project_setup/locale/fa/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/fa/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/fa/LC_MESSAGES/django.po
deleted file mode 100644
index cda6b1c92a..0000000000
--- a/mayan/apps/project_setup/locale/fa/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,29 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Mehdi Amani <MehdiAmani@toorintan.com>, 2014
-# Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2013
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-23 06:49+0000\n"
-"Last-Translator: Mehdi Amani <MehdiAmani@toorintan.com>\n"
-"Language-Team: Persian (http://www.transifex.com/projects/p/mayan-edms/language/fa/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fa\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr "نصب"
-
-#: views.py:13
-msgid "Setup items"
-msgstr "اقلام نصب"
diff --git a/mayan/apps/project_setup/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/fr/LC_MESSAGES/django.mo
deleted file mode 100644
index 1cce3ca3c9..0000000000
Binary files a/mayan/apps/project_setup/locale/fr/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/fr/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/fr/LC_MESSAGES/django.po
deleted file mode 100644
index 24ca5b4a6b..0000000000
--- a/mayan/apps/project_setup/locale/fr/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,29 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Christophe kryskool <christophe.chauvet@gmail.com>, 2014
-# Pierre Lhoste <inactive+peterhost@transifex.com>, 2012
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-11-02 08:09+0000\n"
-"Last-Translator: Christophe kryskool <christophe.chauvet@gmail.com>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/mayan-edms/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr "Configuration"
-
-#: views.py:13
-msgid "Setup items"
-msgstr "Paramètres de configuration"
diff --git a/mayan/apps/project_setup/locale/hr_HR/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/hr_HR/LC_MESSAGES/django.mo
deleted file mode 100644
index 28c9038d8b..0000000000
Binary files a/mayan/apps/project_setup/locale/hr_HR/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/hr_HR/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/hr_HR/LC_MESSAGES/django.po
deleted file mode 100644
index 71096dc5d1..0000000000
--- a/mayan/apps/project_setup/locale/hr_HR/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/mayan-edms/language/hr_HR/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hr_HR\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr ""
-
-#: views.py:13
-msgid "Setup items"
-msgstr ""
diff --git a/mayan/apps/project_setup/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/hu/LC_MESSAGES/django.mo
deleted file mode 100644
index 69b71b8d59..0000000000
Binary files a/mayan/apps/project_setup/locale/hu/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/hu/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/hu/LC_MESSAGES/django.po
deleted file mode 100644
index 0d3c166bd8..0000000000
--- a/mayan/apps/project_setup/locale/hu/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Dezső József <dejo60@gmail.com>, 2013
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Hungarian (http://www.transifex.com/projects/p/mayan-edms/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr ""
-
-#: views.py:13
-msgid "Setup items"
-msgstr ""
diff --git a/mayan/apps/project_setup/locale/id/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/id/LC_MESSAGES/django.mo
deleted file mode 100644
index de64f9ff55..0000000000
Binary files a/mayan/apps/project_setup/locale/id/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/id/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/id/LC_MESSAGES/django.po
deleted file mode 100644
index 331178cb14..0000000000
--- a/mayan/apps/project_setup/locale/id/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/mayan-edms/language/id/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: id\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr ""
-
-#: views.py:13
-msgid "Setup items"
-msgstr ""
diff --git a/mayan/apps/project_setup/locale/it/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/it/LC_MESSAGES/django.mo
deleted file mode 100644
index 01eee23710..0000000000
Binary files a/mayan/apps/project_setup/locale/it/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/it/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/it/LC_MESSAGES/django.po
deleted file mode 100644
index 6c7b32e7a5..0000000000
--- a/mayan/apps/project_setup/locale/it/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Pierpaolo Baldan <pierpaolo.baldan@gmail.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/mayan-edms/language/it/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr ""
-
-#: views.py:13
-msgid "Setup items"
-msgstr ""
diff --git a/mayan/apps/project_setup/locale/lv/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/lv/LC_MESSAGES/django.mo
deleted file mode 100644
index 26e4eb9f92..0000000000
Binary files a/mayan/apps/project_setup/locale/lv/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/lv/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/lv/LC_MESSAGES/django.po
deleted file mode 100644
index 878b69573f..0000000000
--- a/mayan/apps/project_setup/locale/lv/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,29 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/mayan-edms/"
-"language/lv/)\n"
-"Language: lv\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2);\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr ""
-
-#: views.py:13
-msgid "Setup items"
-msgstr ""
diff --git a/mayan/apps/project_setup/locale/nb/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/nb/LC_MESSAGES/django.mo
deleted file mode 100644
index 38dcd92185..0000000000
Binary files a/mayan/apps/project_setup/locale/nb/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/nb/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/nb/LC_MESSAGES/django.po
deleted file mode 100644
index f32aa94074..0000000000
--- a/mayan/apps/project_setup/locale/nb/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/mayan-"
-"edms/language/nb/)\n"
-"Language: nb\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr ""
-
-#: views.py:13
-msgid "Setup items"
-msgstr ""
diff --git a/mayan/apps/project_setup/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/nl_NL/LC_MESSAGES/django.mo
deleted file mode 100644
index 1dc1b47ada..0000000000
Binary files a/mayan/apps/project_setup/locale/nl_NL/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/nl_NL/LC_MESSAGES/django.po
deleted file mode 100644
index e4a3b8f8b2..0000000000
--- a/mayan/apps/project_setup/locale/nl_NL/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Lucas Weel <ljj.weel@gmail.com>, 2013
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Dutch (Netherlands) (http://www.transifex.com/projects/p/mayan-edms/language/nl_NL/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: nl_NL\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr ""
-
-#: views.py:13
-msgid "Setup items"
-msgstr ""
diff --git a/mayan/apps/project_setup/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/pl/LC_MESSAGES/django.mo
deleted file mode 100644
index 03b604e533..0000000000
Binary files a/mayan/apps/project_setup/locale/pl/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/pl/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/pl/LC_MESSAGES/django.po
deleted file mode 100644
index 9a0e7f45e0..0000000000
--- a/mayan/apps/project_setup/locale/pl/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,30 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# mic <diveaway12@gmail.com>, 2012
-# mic <winterfall24@gmail.com>, 2012
-# mic <winterfall24@gmail.com>, 2012
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/mayan-edms/language/pl/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr ""
-
-#: views.py:13
-msgid "Setup items"
-msgstr ""
diff --git a/mayan/apps/project_setup/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/pt/LC_MESSAGES/django.mo
deleted file mode 100644
index 2ac5d947f8..0000000000
Binary files a/mayan/apps/project_setup/locale/pt/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/pt/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/pt/LC_MESSAGES/django.po
deleted file mode 100644
index 6474dd5e9a..0000000000
--- a/mayan/apps/project_setup/locale/pt/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,29 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Emerson Soares <on.emersonsoares@gmail.com>, 2011
-# Vítor Figueiró <vfigueiro@gmail.com>, 2012
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/mayan-edms/language/pt/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr ""
-
-#: views.py:13
-msgid "Setup items"
-msgstr ""
diff --git a/mayan/apps/project_setup/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/pt_BR/LC_MESSAGES/django.mo
deleted file mode 100644
index 58f5fa6e3e..0000000000
Binary files a/mayan/apps/project_setup/locale/pt_BR/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/pt_BR/LC_MESSAGES/django.po
deleted file mode 100644
index b116686135..0000000000
--- a/mayan/apps/project_setup/locale/pt_BR/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Emerson Soares <on.emersonsoares@gmail.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/mayan-edms/language/pt_BR/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr ""
-
-#: views.py:13
-msgid "Setup items"
-msgstr ""
diff --git a/mayan/apps/project_setup/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/ro_RO/LC_MESSAGES/django.mo
deleted file mode 100644
index fb471888bf..0000000000
Binary files a/mayan/apps/project_setup/locale/ro_RO/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/ro_RO/LC_MESSAGES/django.po
deleted file mode 100644
index 029e8f8c91..0000000000
--- a/mayan/apps/project_setup/locale/ro_RO/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Badea Gabriel <gcbadea@gmail.com>, 2013
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/mayan-edms/language/ro_RO/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ro_RO\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr ""
-
-#: views.py:13
-msgid "Setup items"
-msgstr ""
diff --git a/mayan/apps/project_setup/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/ru/LC_MESSAGES/django.mo
deleted file mode 100644
index b18c8a42cd..0000000000
Binary files a/mayan/apps/project_setup/locale/ru/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/ru/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/ru/LC_MESSAGES/django.po
deleted file mode 100644
index 64900a76e4..0000000000
--- a/mayan/apps/project_setup/locale/ru/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Sergey Glita <gsv70@mail.ru>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/mayan-edms/language/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr ""
-
-#: views.py:13
-msgid "Setup items"
-msgstr ""
diff --git a/mayan/apps/project_setup/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/sl_SI/LC_MESSAGES/django.mo
deleted file mode 100644
index bae95ae5f8..0000000000
Binary files a/mayan/apps/project_setup/locale/sl_SI/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/sl_SI/LC_MESSAGES/django.po
deleted file mode 100644
index be22debc46..0000000000
--- a/mayan/apps/project_setup/locale/sl_SI/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/mayan-edms/language/sl_SI/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sl_SI\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr ""
-
-#: views.py:13
-msgid "Setup items"
-msgstr ""
diff --git a/mayan/apps/project_setup/locale/sq/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/sq/LC_MESSAGES/django.mo
deleted file mode 100644
index 21ceacfdfb..0000000000
Binary files a/mayan/apps/project_setup/locale/sq/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/sq/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/sq/LC_MESSAGES/django.po
deleted file mode 100644
index cdf6210ba2..0000000000
--- a/mayan/apps/project_setup/locale/sq/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Albanian (http://www.transifex.com/projects/p/mayan-edms/"
-"language/sq/)\n"
-"Language: sq\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr ""
-
-#: views.py:13
-msgid "Setup items"
-msgstr ""
diff --git a/mayan/apps/project_setup/locale/tr_TR/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/tr_TR/LC_MESSAGES/django.mo
deleted file mode 100644
index 4baeab14bd..0000000000
Binary files a/mayan/apps/project_setup/locale/tr_TR/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/tr_TR/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/tr_TR/LC_MESSAGES/django.po
deleted file mode 100644
index 90321d29ca..0000000000
--- a/mayan/apps/project_setup/locale/tr_TR/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/mayan-edms/language/tr_TR/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: tr_TR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr ""
-
-#: views.py:13
-msgid "Setup items"
-msgstr ""
diff --git a/mayan/apps/project_setup/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/vi_VN/LC_MESSAGES/django.mo
deleted file mode 100644
index 4b96c4caee..0000000000
Binary files a/mayan/apps/project_setup/locale/vi_VN/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/vi_VN/LC_MESSAGES/django.po
deleted file mode 100644
index fac5560e55..0000000000
--- a/mayan/apps/project_setup/locale/vi_VN/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Trung Phan Minh <navmobile@gmail.com>, 2013
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/mayan-edms/language/vi_VN/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: vi_VN\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr ""
-
-#: views.py:13
-msgid "Setup items"
-msgstr ""
diff --git a/mayan/apps/project_setup/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/zh_CN/LC_MESSAGES/django.mo
deleted file mode 100644
index 1789af445e..0000000000
Binary files a/mayan/apps/project_setup/locale/zh_CN/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/zh_CN/LC_MESSAGES/django.po
deleted file mode 100644
index b762e53d62..0000000000
--- a/mayan/apps/project_setup/locale/zh_CN/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Ford Guo <agile.guo@gmail.com>, 2014
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mayan-edms/language/zh_CN/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr ""
-
-#: views.py:13
-msgid "Setup items"
-msgstr ""
diff --git a/mayan/apps/project_setup/locale/zh_TW/LC_MESSAGES/django.mo b/mayan/apps/project_setup/locale/zh_TW/LC_MESSAGES/django.mo
deleted file mode 100644
index 8e76fa1772..0000000000
Binary files a/mayan/apps/project_setup/locale/zh_TW/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_setup/locale/zh_TW/LC_MESSAGES/django.po b/mayan/apps/project_setup/locale/zh_TW/LC_MESSAGES/django.po
deleted file mode 100644
index c7e9fbe12a..0000000000
--- a/mayan/apps/project_setup/locale/zh_TW/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/mayan-"
-"edms/language/zh_TW/)\n"
-"Language: zh_TW\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: links.py:5
-msgid "Setup"
-msgstr ""
-
-#: views.py:13
-msgid "Setup items"
-msgstr ""
diff --git a/mayan/apps/project_setup/urls.py b/mayan/apps/project_setup/urls.py
deleted file mode 100644
index 5ff8a557f5..0000000000
--- a/mayan/apps/project_setup/urls.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from __future__ import unicode_literals
-
-from django.conf.urls import patterns, url
-
-urlpatterns = patterns('project_setup.views',
-    url(r'^list/$', 'setup_list', (), 'setup_list'),
-)
diff --git a/mayan/apps/project_setup/views.py b/mayan/apps/project_setup/views.py
deleted file mode 100644
index d57316c27d..0000000000
--- a/mayan/apps/project_setup/views.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from __future__ import unicode_literals
-
-from django.shortcuts import render_to_response
-from django.template import RequestContext
-from django.utils.translation import ugettext_lazy as _
-
-from .api import setup_items
-
-
-def setup_list(request):
-    context = {
-        'object_navigation_links': setup_items,
-        'title': _('Setup items'),
-    }
-
-    return render_to_response('appearance/generic_list_horizontal.html', context,
-                              context_instance=RequestContext(request))
diff --git a/mayan/apps/project_tools/__init__.py b/mayan/apps/project_tools/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/mayan/apps/project_tools/api.py b/mayan/apps/project_tools/api.py
deleted file mode 100644
index 873a901af4..0000000000
--- a/mayan/apps/project_tools/api.py
+++ /dev/null
@@ -1,5 +0,0 @@
-tool_items = []
-
-
-def register_tool(link):
-    tool_items.append(link)
diff --git a/mayan/apps/project_tools/apps.py b/mayan/apps/project_tools/apps.py
deleted file mode 100644
index f01d200c6f..0000000000
--- a/mayan/apps/project_tools/apps.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from __future__ import unicode_literals
-
-from django import apps
-from django.utils.translation import ugettext_lazy as _
-
-from common.menus import menu_main
-
-from .links import link_tools
-
-
-class ProjectToolsApp(apps.AppConfig):
-    name = 'project_tools'
-    verbose_name = _('Project tools')
-
-    def ready(self):
-        menu_main.bind_links(links=[link_tools], position=-3)
diff --git a/mayan/apps/project_tools/links.py b/mayan/apps/project_tools/links.py
deleted file mode 100644
index 630ec37abb..0000000000
--- a/mayan/apps/project_tools/links.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from __future__ import unicode_literals
-
-from django.utils.translation import ugettext_lazy as _
-
-from navigation import Link
-
-link_tools = Link(icon='fa fa-wrench', text=_('Tools'), view='project_tools:tools_list')
diff --git a/mayan/apps/project_tools/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/ar/LC_MESSAGES/django.mo
deleted file mode 100644
index fd38c63bcb..0000000000
Binary files a/mayan/apps/project_tools/locale/ar/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/ar/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/ar/LC_MESSAGES/django.po
deleted file mode 100644
index 6eccdf241e..0000000000
--- a/mayan/apps/project_tools/locale/ar/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Mohammed ALDOUB <voulnet@gmail.com>, 2013
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/mayan-edms/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr ""
diff --git a/mayan/apps/project_tools/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/bg/LC_MESSAGES/django.mo
deleted file mode 100644
index 47aebdcfe8..0000000000
Binary files a/mayan/apps/project_tools/locale/bg/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/bg/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/bg/LC_MESSAGES/django.po
deleted file mode 100644
index fb76803dc3..0000000000
--- a/mayan/apps/project_tools/locale/bg/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Pavlin Koldamov <pkoldamov@gmail.com>, 2012
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Bulgarian (http://www.transifex.com/projects/p/mayan-edms/language/bg/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr ""
diff --git a/mayan/apps/project_tools/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/bs_BA/LC_MESSAGES/django.mo
deleted file mode 100644
index 78a9dee774..0000000000
Binary files a/mayan/apps/project_tools/locale/bs_BA/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/bs_BA/LC_MESSAGES/django.po
deleted file mode 100644
index 28b330d4ee..0000000000
--- a/mayan/apps/project_tools/locale/bs_BA/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# www.ping.ba <jomer@ping.ba>, 2013
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/projects/p/mayan-edms/language/bs_BA/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bs_BA\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr ""
diff --git a/mayan/apps/project_tools/locale/da/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/da/LC_MESSAGES/django.mo
deleted file mode 100644
index 0cb712a7d7..0000000000
Binary files a/mayan/apps/project_tools/locale/da/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/da/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/da/LC_MESSAGES/django.po
deleted file mode 100644
index 83c7a5f525..0000000000
--- a/mayan/apps/project_tools/locale/da/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Mads L. Nielsen <sirlundgaard@gmail.com>, 2013
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/mayan-edms/language/da/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr ""
diff --git a/mayan/apps/project_tools/locale/de_CH/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/de_CH/LC_MESSAGES/django.mo
deleted file mode 100644
index a4864c468d..0000000000
Binary files a/mayan/apps/project_tools/locale/de_CH/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/de_CH/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/de_CH/LC_MESSAGES/django.po
deleted file mode 100644
index 3dcdb3aca9..0000000000
--- a/mayan/apps/project_tools/locale/de_CH/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/"
-"mayan-edms/language/de_CH/)\n"
-"Language: de_CH\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr ""
diff --git a/mayan/apps/project_tools/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/de_DE/LC_MESSAGES/django.mo
deleted file mode 100644
index 128b9a3951..0000000000
Binary files a/mayan/apps/project_tools/locale/de_DE/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/de_DE/LC_MESSAGES/django.po
deleted file mode 100644
index 93835f1da5..0000000000
--- a/mayan/apps/project_tools/locale/de_DE/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,26 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Mathias Behrle <mbehrle@m9s.biz>, 2014
-# tetjarediske <tetja.rediske@googlemail.com>, 2012
-# tetjarediske <tetja.rediske@googlemail.com>, 2012
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2015-02-07 00:10+0000\n"
-"Last-Translator: Mathias Behrle <mathiasb@m9s.biz>\n"
-"Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-edms/language/de_DE/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de_DE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr "Werkzeuge"
diff --git a/mayan/apps/project_tools/locale/en/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/en/LC_MESSAGES/django.mo
deleted file mode 100644
index b7bab58f38..0000000000
Binary files a/mayan/apps/project_tools/locale/en/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/en/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/en/LC_MESSAGES/django.po
deleted file mode 100644
index 1205b7da2a..0000000000
--- a/mayan/apps/project_tools/locale/en/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2011-09-30 04:41+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/"
-"language/en/)\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5 views.py:13
-#, fuzzy
-msgid "Tools"
-msgstr "tools"
diff --git a/mayan/apps/project_tools/locale/es/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/es/LC_MESSAGES/django.mo
deleted file mode 100644
index 0ea43736c7..0000000000
Binary files a/mayan/apps/project_tools/locale/es/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/es/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/es/LC_MESSAGES/django.po
deleted file mode 100644
index 8ef7fdde9c..0000000000
--- a/mayan/apps/project_tools/locale/es/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Lory977 <helga.carrero@gmail.com>, 2015
-# Roberto Rosario, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2015-01-12 19:32+0000\n"
-"Last-Translator: Lory977 <helga.carrero@gmail.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/mayan-edms/language/es/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr "Herramientas"
diff --git a/mayan/apps/project_tools/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/fa/LC_MESSAGES/django.mo
deleted file mode 100644
index 2cee1e932b..0000000000
Binary files a/mayan/apps/project_tools/locale/fa/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/fa/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/fa/LC_MESSAGES/django.po
deleted file mode 100644
index 961f08e146..0000000000
--- a/mayan/apps/project_tools/locale/fa/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Mehdi Amani <MehdiAmani@toorintan.com>, 2014
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-23 06:50+0000\n"
-"Last-Translator: Mehdi Amani <MehdiAmani@toorintan.com>\n"
-"Language-Team: Persian (http://www.transifex.com/projects/p/mayan-edms/language/fa/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fa\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr "ابزار"
diff --git a/mayan/apps/project_tools/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/fr/LC_MESSAGES/django.mo
deleted file mode 100644
index e7f76d9633..0000000000
Binary files a/mayan/apps/project_tools/locale/fr/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/fr/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/fr/LC_MESSAGES/django.po
deleted file mode 100644
index 1074feb9cb..0000000000
--- a/mayan/apps/project_tools/locale/fr/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Christophe kryskool <christophe.chauvet@gmail.com>, 2014
-# Pierre Lhoste <inactive+peterhost@transifex.com>, 2012
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-11-02 08:09+0000\n"
-"Last-Translator: Christophe kryskool <christophe.chauvet@gmail.com>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/mayan-edms/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr "Outils"
diff --git a/mayan/apps/project_tools/locale/hr_HR/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/hr_HR/LC_MESSAGES/django.mo
deleted file mode 100644
index 28c9038d8b..0000000000
Binary files a/mayan/apps/project_tools/locale/hr_HR/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/hr_HR/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/hr_HR/LC_MESSAGES/django.po
deleted file mode 100644
index a494d3582a..0000000000
--- a/mayan/apps/project_tools/locale/hr_HR/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/mayan-edms/language/hr_HR/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hr_HR\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr ""
diff --git a/mayan/apps/project_tools/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/hu/LC_MESSAGES/django.mo
deleted file mode 100644
index 69b71b8d59..0000000000
Binary files a/mayan/apps/project_tools/locale/hu/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/hu/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/hu/LC_MESSAGES/django.po
deleted file mode 100644
index 41647b483c..0000000000
--- a/mayan/apps/project_tools/locale/hu/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Dezső József <dejo60@gmail.com>, 2013
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Hungarian (http://www.transifex.com/projects/p/mayan-edms/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr ""
diff --git a/mayan/apps/project_tools/locale/id/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/id/LC_MESSAGES/django.mo
deleted file mode 100644
index de64f9ff55..0000000000
Binary files a/mayan/apps/project_tools/locale/id/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/id/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/id/LC_MESSAGES/django.po
deleted file mode 100644
index e48f97f121..0000000000
--- a/mayan/apps/project_tools/locale/id/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/mayan-edms/language/id/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: id\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr ""
diff --git a/mayan/apps/project_tools/locale/it/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/it/LC_MESSAGES/django.mo
deleted file mode 100644
index 01eee23710..0000000000
Binary files a/mayan/apps/project_tools/locale/it/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/it/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/it/LC_MESSAGES/django.po
deleted file mode 100644
index 931de2fe02..0000000000
--- a/mayan/apps/project_tools/locale/it/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Pierpaolo Baldan <pierpaolo.baldan@gmail.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/mayan-edms/language/it/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr ""
diff --git a/mayan/apps/project_tools/locale/lv/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/lv/LC_MESSAGES/django.mo
deleted file mode 100644
index 26e4eb9f92..0000000000
Binary files a/mayan/apps/project_tools/locale/lv/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/lv/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/lv/LC_MESSAGES/django.po
deleted file mode 100644
index af858a53ce..0000000000
--- a/mayan/apps/project_tools/locale/lv/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/mayan-edms/"
-"language/lv/)\n"
-"Language: lv\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2);\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr ""
diff --git a/mayan/apps/project_tools/locale/nb/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/nb/LC_MESSAGES/django.mo
deleted file mode 100644
index 38dcd92185..0000000000
Binary files a/mayan/apps/project_tools/locale/nb/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/nb/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/nb/LC_MESSAGES/django.po
deleted file mode 100644
index 68f37402e2..0000000000
--- a/mayan/apps/project_tools/locale/nb/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/mayan-"
-"edms/language/nb/)\n"
-"Language: nb\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr ""
diff --git a/mayan/apps/project_tools/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/nl_NL/LC_MESSAGES/django.mo
deleted file mode 100644
index 1dc1b47ada..0000000000
Binary files a/mayan/apps/project_tools/locale/nl_NL/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/nl_NL/LC_MESSAGES/django.po
deleted file mode 100644
index b5067c0979..0000000000
--- a/mayan/apps/project_tools/locale/nl_NL/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Lucas Weel <ljj.weel@gmail.com>, 2013
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Dutch (Netherlands) (http://www.transifex.com/projects/p/mayan-edms/language/nl_NL/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: nl_NL\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr ""
diff --git a/mayan/apps/project_tools/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/pl/LC_MESSAGES/django.mo
deleted file mode 100644
index 03b604e533..0000000000
Binary files a/mayan/apps/project_tools/locale/pl/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/pl/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/pl/LC_MESSAGES/django.po
deleted file mode 100644
index ad21ee7d3a..0000000000
--- a/mayan/apps/project_tools/locale/pl/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# mic <winterfall24@gmail.com>, 2012
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/mayan-edms/language/pl/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr ""
diff --git a/mayan/apps/project_tools/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/pt/LC_MESSAGES/django.mo
deleted file mode 100644
index 2ac5d947f8..0000000000
Binary files a/mayan/apps/project_tools/locale/pt/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/pt/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/pt/LC_MESSAGES/django.po
deleted file mode 100644
index 099c19668b..0000000000
--- a/mayan/apps/project_tools/locale/pt/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Emerson Soares <on.emersonsoares@gmail.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/mayan-edms/language/pt/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr ""
diff --git a/mayan/apps/project_tools/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/pt_BR/LC_MESSAGES/django.mo
deleted file mode 100644
index 58f5fa6e3e..0000000000
Binary files a/mayan/apps/project_tools/locale/pt_BR/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/pt_BR/LC_MESSAGES/django.po
deleted file mode 100644
index ab12ac2223..0000000000
--- a/mayan/apps/project_tools/locale/pt_BR/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Emerson Soares <on.emersonsoares@gmail.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/mayan-edms/language/pt_BR/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr ""
diff --git a/mayan/apps/project_tools/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/ro_RO/LC_MESSAGES/django.mo
deleted file mode 100644
index fb471888bf..0000000000
Binary files a/mayan/apps/project_tools/locale/ro_RO/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/ro_RO/LC_MESSAGES/django.po
deleted file mode 100644
index 10187c4181..0000000000
--- a/mayan/apps/project_tools/locale/ro_RO/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Badea Gabriel <gcbadea@gmail.com>, 2013
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/mayan-edms/language/ro_RO/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ro_RO\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr ""
diff --git a/mayan/apps/project_tools/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/ru/LC_MESSAGES/django.mo
deleted file mode 100644
index b18c8a42cd..0000000000
Binary files a/mayan/apps/project_tools/locale/ru/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/ru/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/ru/LC_MESSAGES/django.po
deleted file mode 100644
index 4c4ca25349..0000000000
--- a/mayan/apps/project_tools/locale/ru/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Sergey Glita <gsv70@mail.ru>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/mayan-edms/language/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr ""
diff --git a/mayan/apps/project_tools/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/sl_SI/LC_MESSAGES/django.mo
deleted file mode 100644
index bae95ae5f8..0000000000
Binary files a/mayan/apps/project_tools/locale/sl_SI/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/sl_SI/LC_MESSAGES/django.po
deleted file mode 100644
index bd33776e93..0000000000
--- a/mayan/apps/project_tools/locale/sl_SI/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/mayan-edms/language/sl_SI/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sl_SI\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr ""
diff --git a/mayan/apps/project_tools/locale/sq/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/sq/LC_MESSAGES/django.mo
deleted file mode 100644
index 21ceacfdfb..0000000000
Binary files a/mayan/apps/project_tools/locale/sq/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/sq/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/sq/LC_MESSAGES/django.po
deleted file mode 100644
index 8250202c33..0000000000
--- a/mayan/apps/project_tools/locale/sq/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Albanian (http://www.transifex.com/projects/p/mayan-edms/"
-"language/sq/)\n"
-"Language: sq\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr ""
diff --git a/mayan/apps/project_tools/locale/tr_TR/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/tr_TR/LC_MESSAGES/django.mo
deleted file mode 100644
index 4baeab14bd..0000000000
Binary files a/mayan/apps/project_tools/locale/tr_TR/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/tr_TR/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/tr_TR/LC_MESSAGES/django.po
deleted file mode 100644
index e948d886ee..0000000000
--- a/mayan/apps/project_tools/locale/tr_TR/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/mayan-edms/language/tr_TR/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: tr_TR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr ""
diff --git a/mayan/apps/project_tools/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/vi_VN/LC_MESSAGES/django.mo
deleted file mode 100644
index 4b96c4caee..0000000000
Binary files a/mayan/apps/project_tools/locale/vi_VN/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/vi_VN/LC_MESSAGES/django.po
deleted file mode 100644
index aac5fec218..0000000000
--- a/mayan/apps/project_tools/locale/vi_VN/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Trung Phan Minh <navmobile@gmail.com>, 2013
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/mayan-edms/language/vi_VN/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: vi_VN\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr ""
diff --git a/mayan/apps/project_tools/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/zh_CN/LC_MESSAGES/django.mo
deleted file mode 100644
index 1789af445e..0000000000
Binary files a/mayan/apps/project_tools/locale/zh_CN/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/zh_CN/LC_MESSAGES/django.po
deleted file mode 100644
index 5cb3a2a538..0000000000
--- a/mayan/apps/project_tools/locale/zh_CN/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Translators:
-# Ford Guo <agile.guo@gmail.com>, 2014
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mayan-edms/language/zh_CN/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr ""
diff --git a/mayan/apps/project_tools/locale/zh_TW/LC_MESSAGES/django.mo b/mayan/apps/project_tools/locale/zh_TW/LC_MESSAGES/django.mo
deleted file mode 100644
index 8e76fa1772..0000000000
Binary files a/mayan/apps/project_tools/locale/zh_TW/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/mayan/apps/project_tools/locale/zh_TW/LC_MESSAGES/django.po b/mayan/apps/project_tools/locale/zh_TW/LC_MESSAGES/django.po
deleted file mode 100644
index f7d1880574..0000000000
--- a/mayan/apps/project_tools/locale/zh_TW/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Mayan EDMS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 16:53-0400\n"
-"PO-Revision-Date: 2014-10-08 21:14+0000\n"
-"Last-Translator: Roberto Rosario\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/mayan-"
-"edms/language/zh_TW/)\n"
-"Language: zh_TW\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: links.py:5 views.py:13
-msgid "Tools"
-msgstr ""
diff --git a/mayan/apps/project_tools/urls.py b/mayan/apps/project_tools/urls.py
deleted file mode 100644
index 81725db780..0000000000
--- a/mayan/apps/project_tools/urls.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from __future__ import unicode_literals
-
-from django.conf.urls import patterns, url
-
-urlpatterns = patterns('project_tools.views',
-    url(r'^list/$', 'tools_list', (), 'tools_list'),
-)
diff --git a/mayan/apps/project_tools/views.py b/mayan/apps/project_tools/views.py
deleted file mode 100644
index 3f8f446762..0000000000
--- a/mayan/apps/project_tools/views.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from __future__ import unicode_literals
-
-from django.shortcuts import render_to_response
-from django.template import RequestContext
-from django.utils.translation import ugettext_lazy as _
-
-from .api import tool_items
-
-
-def tools_list(request):
-    context = {
-        'object_navigation_links': tool_items,
-        'title': _('Tools'),
-    }
-
-    return render_to_response('appearance/generic_list_horizontal.html', context,
-                              context_instance=RequestContext(request))
diff --git a/mayan/apps/rest_api/apps.py b/mayan/apps/rest_api/apps.py
index 3d1c821128..799c329e77 100644
--- a/mayan/apps/rest_api/apps.py
+++ b/mayan/apps/rest_api/apps.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 from django import apps
 from django.utils.translation import ugettext_lazy as _
 
-from project_tools.api import register_tool
+from common import menu_tools
 
 from .classes import APIEndPoint
 from .links import link_api, link_api_documentation
@@ -16,5 +16,4 @@ class RESTAPIApp(apps.AppConfig):
     def ready(self):
         APIEndPoint('rest_api')
 
-        register_tool(link_api)
-        register_tool(link_api_documentation)
+        menu_tools.bind_links(links=[link_api, link_api_documentation])
diff --git a/mayan/apps/rest_api/links.py b/mayan/apps/rest_api/links.py
index 329b748585..d7116b8a83 100644
--- a/mayan/apps/rest_api/links.py
+++ b/mayan/apps/rest_api/links.py
@@ -2,5 +2,7 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-link_api = {'text': _('REST API'), 'view': 'api-root', 'icon': 'fa fa-plug'}
-link_api_documentation = {'text': _('REST API Documentation'), 'view': 'django.swagger.base.view', 'icon': 'fa fa-book'}
+from navigation import Link
+
+link_api = Link(icon='fa fa-plug', text=_('REST API'), view='api-root')
+link_api_documentation = Link(icon='fa fa-book', text=_('REST API Documentation'), view='django.swagger.base.view')
diff --git a/mayan/apps/smart_settings/apps.py b/mayan/apps/smart_settings/apps.py
index c7bd36ab9f..300159fc8a 100644
--- a/mayan/apps/smart_settings/apps.py
+++ b/mayan/apps/smart_settings/apps.py
@@ -3,9 +3,9 @@ from __future__ import unicode_literals
 from django import apps
 from django.utils.translation import ugettext_lazy as _
 
-from project_setup.api import register_setup
+from common import menu_setup
 
-from .links import check_settings
+from .links import link_check_settings
 
 
 class SmartSettingsApp(apps.AppConfig):
@@ -13,4 +13,4 @@ class SmartSettingsApp(apps.AppConfig):
     verbose_name = _('Smart settings')
 
     def ready(self):
-        register_setup(check_settings)
+        menu_setup.bind_links(links=[link_check_settings])
diff --git a/mayan/apps/smart_settings/links.py b/mayan/apps/smart_settings/links.py
index 56f2267eb1..19188feed2 100644
--- a/mayan/apps/smart_settings/links.py
+++ b/mayan/apps/smart_settings/links.py
@@ -2,9 +2,11 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
+from navigation import Link
+
 
 def is_superuser(context):
     return context['request'].user.is_staff or context['request'].user.is_superuser
 
 
-check_settings = {'text': _('Settings'), 'view': 'settings:setting_list', 'icon': 'fa fa-gear', 'condition': is_superuser}
+link_check_settings = Link(condition=is_superuser, icon='fa fa-gear', text=_('Settings'), view='settings:setting_list')
diff --git a/mayan/apps/sources/apps.py b/mayan/apps/sources/apps.py
index 63ffa559a0..d778b30357 100644
--- a/mayan/apps/sources/apps.py
+++ b/mayan/apps/sources/apps.py
@@ -3,17 +3,16 @@ from __future__ import absolute_import, unicode_literals
 from django import apps
 from django.utils.translation import ugettext_lazy as _
 
+from common import menu_setup
 from common.utils import encapsulate
-from documents.links import document_list_recent, document_list
 from documents.models import Document
 from main import FrontPageButton, MissingItem
-from navigation.api import register_links, register_model_list_columns
-from project_setup.api import register_setup
+from navigation.api import register_model_list_columns
 from rest_api.classes import APIEndPoint
 
 from .classes import StagingFile
 from .links import (
-    document_create_multiple, document_create_siblings, setup_sources,
+    link_document_create_multiple, document_create_siblings, link_setup_sources,
     setup_source_create_imap_email, setup_source_create_pop3_email,
     setup_source_create_watch_folder, setup_source_create_webform,
     setup_source_create_staging_folder, setup_source_delete, setup_source_edit,
@@ -37,18 +36,19 @@ class SourcesApp(apps.AppConfig):
             },
         ])
 
-        register_links([StagingFile], [staging_file_delete])
-        register_links([Source, 'sources:setup_source_list', 'sources:setup_source_create'], [setup_sources, setup_source_create_webform, setup_source_create_staging_folder, setup_source_create_pop3_email, setup_source_create_imap_email, setup_source_create_watch_folder], menu_name='secondary_menu')
-        register_links([Source], [setup_source_edit, setup_source_transformation_list, setup_source_delete])
-        register_links(SourceTransformation, [setup_source_transformation_edit, setup_source_transformation_delete])
-        register_links([SourceTransformation, 'sources:setup_source_transformation_create', 'sources:setup_source_transformation_list'], [setup_source_transformation_create], menu_name='sidebar')
-        register_links(['documents:document_version_list', 'documents:upload_version', 'documents:document_version_revert'], [upload_version], menu_name='sidebar')
-        register_links(Document, [document_create_siblings])
+        # TODO: convert
+        #register_links([StagingFile], [staging_file_delete])
+        #register_links([Source, 'sources:setup_source_list', 'sources:setup_source_create'], [setup_sources, setup_source_create_webform, setup_source_create_staging_folder, setup_source_create_pop3_email, setup_source_create_imap_email, setup_source_create_watch_folder], menu_name='secondary_menu')
+        #register_links([Source], [setup_source_edit, setup_source_transformation_list, setup_source_delete])
+        #register_links(SourceTransformation, [setup_source_transformation_edit, setup_source_transformation_delete])
+        #register_links([SourceTransformation, 'sources:setup_source_transformation_create', 'sources:setup_source_transformation_list'], [setup_source_transformation_create], menu_name='sidebar')
+        #register_links(['documents:document_version_list', 'documents:upload_version', 'documents:document_version_revert'], [upload_version], menu_name='sidebar')
+        #register_links(Document, [document_create_siblings])
 
-        register_setup(setup_sources)
+        menu_setup.bind_links(links=[link_setup_sources])
 
         APIEndPoint('sources')
 
-        FrontPageButton(link=document_create_multiple)
+        FrontPageButton(link=link_document_create_multiple)
 
         MissingItem(label=_('Create a document source'), description=_('Document sources are the way in which new documents are feed to Mayan EDMS, create at least a web form source to be able to upload documents from a browser.'), condition=lambda: not Source.objects.exists(), view='sources:setup_source_list')
diff --git a/mayan/apps/sources/links.py b/mayan/apps/sources/links.py
index 51fd91f230..222b035434 100644
--- a/mayan/apps/sources/links.py
+++ b/mayan/apps/sources/links.py
@@ -5,6 +5,7 @@ from django.utils.translation import ugettext_lazy as _
 from documents.permissions import (
     PERMISSION_DOCUMENT_CREATE, PERMISSION_DOCUMENT_NEW_VERSION
 )
+from navigation import Link
 
 from .literals import (
     SOURCE_CHOICE_WEB_FORM, SOURCE_CHOICE_EMAIL_IMAP, SOURCE_CHOICE_EMAIL_POP3,
@@ -15,12 +16,12 @@ from .permissions import (
     PERMISSION_SOURCES_SETUP_EDIT, PERMISSION_SOURCES_SETUP_VIEW
 )
 
-document_create_multiple = {'text': _('New document'), 'view': 'sources:document_create_multiple', 'icon': 'fa fa-upload', 'permissions': [PERMISSION_DOCUMENT_CREATE]}
+link_document_create_multiple = Link(icon='fa fa-upload', permissions=[PERMISSION_DOCUMENT_CREATE], text=_('New document'), view='sources:document_create_multiple')
 document_create_siblings = {'text': _('Clone'), 'view': 'sources:document_create_siblings', 'args': 'object.id', 'famfam': 'page_copy', 'permissions': [PERMISSION_DOCUMENT_CREATE]}
 
 staging_file_delete = {'text': _('Delete'), 'view': 'sources:staging_file_delete', 'args': ['source.pk', 'object.encoded_filename'], 'famfam': 'delete', 'keep_query': True, 'permissions': [PERMISSION_DOCUMENT_NEW_VERSION, PERMISSION_DOCUMENT_CREATE]}
 
-setup_sources = {'text': _('Sources'), 'view': 'sources:setup_source_list', 'famfam': 'application_form', 'icon': 'fa fa-upload', 'permissions': [PERMISSION_SOURCES_SETUP_VIEW]}
+link_setup_sources = Link(icon='fa fa-upload', permissions=[PERMISSION_SOURCES_SETUP_VIEW], text=_('Sources'), view='sources:setup_source_list')
 setup_source_create_webform = {'text': _('Add new webform source'), 'view': 'sources:setup_source_create', 'args': '"%s"' % SOURCE_CHOICE_WEB_FORM, 'famfam': 'application_form_add', 'permissions': [PERMISSION_SOURCES_SETUP_CREATE], 'conditional_highlight': lambda context: context.get('source_type') == SOURCE_CHOICE_WEB_FORM and 'source' not in context}
 setup_source_create_staging_folder = {'text': _('Add new staging folder'), 'view': 'sources:setup_source_create', 'args': '"%s"' % SOURCE_CHOICE_STAGING, 'famfam': 'folder_camera', 'permissions': [PERMISSION_SOURCES_SETUP_CREATE], 'conditional_highlight': lambda context: context.get('source_type') == SOURCE_CHOICE_STAGING and 'source' not in context}
 setup_source_create_watch_folder = {'text': _('Add new watch folder'), 'view': 'sources:setup_source_create', 'args': '"%s"' % SOURCE_CHOICE_WATCH, 'famfam': 'folder_magnify', 'permissions': [PERMISSION_SOURCES_SETUP_CREATE], 'conditional_highlight': lambda context: context.get('source_type') == SOURCE_CHOICE_WATCH and 'source' not in context}
diff --git a/mayan/apps/statistics/apps.py b/mayan/apps/statistics/apps.py
index fe07d88295..75a81f2c8b 100644
--- a/mayan/apps/statistics/apps.py
+++ b/mayan/apps/statistics/apps.py
@@ -3,9 +3,7 @@ from __future__ import unicode_literals
 from django import apps
 from django.utils.translation import ugettext_lazy as _
 
-from navigation.api import register_links
-
-from project_tools.api import register_tool
+from common import menu_tools
 
 from .classes import Statistic, StatisticNamespace
 from .links import (
@@ -19,7 +17,7 @@ class StatisticsApp(apps.AppConfig):
     verbose_name = _('Statistics')
 
     def ready(self):
-        register_links(StatisticNamespace, [link_namespace_details])
-        register_links([StatisticNamespace, 'statistics:namespace_list', 'statistics:execute'], [link_namespace_list], menu_name='secondary_menu')
-        register_links(Statistic, [link_execute])
-        register_tool(link_statistics)
+        #register_links(StatisticNamespace, [link_namespace_details])
+        #register_links([StatisticNamespace, 'statistics:namespace_list', 'statistics:execute'], [link_namespace_list], menu_name='secondary_menu')
+        #register_links(Statistic, [link_execute])
+        menu_tools.bind_links(links=[link_statistics])
diff --git a/mayan/apps/statistics/links.py b/mayan/apps/statistics/links.py
index 9f6be021a8..9f35919203 100644
--- a/mayan/apps/statistics/links.py
+++ b/mayan/apps/statistics/links.py
@@ -2,6 +2,8 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
+from navigation import Link
+
 
 def is_superuser(context):
     return context['request'].user.is_staff or context['request'].user.is_superuser
@@ -10,4 +12,4 @@ def is_superuser(context):
 link_execute = {'text': _('Execute'), 'view': 'statistics:execute', 'args': 'object.id', 'famfam': 'lightning', 'condition': is_superuser}
 link_namespace_details = {'text': _('Details'), 'view': 'statistics:namespace_details', 'args': 'namespace.id', 'famfam': 'chart_curve_go', 'condition': is_superuser}
 link_namespace_list = {'text': _('Namespace list'), 'view': 'statistics:namespace_list', 'famfam': 'chart_curve', 'condition': is_superuser}
-link_statistics = {'text': _('Statistics'), 'view': 'statistics:namespace_list', 'icon': 'fa fa-sort-numeric-desc', 'condition': is_superuser}
+link_statistics = Link(condition=is_superuser, icon='fa fa-sort-numeric-desc', text=_('Statistics'), view='statistics:namespace_list')
diff --git a/mayan/apps/tags/apps.py b/mayan/apps/tags/apps.py
index ea01ae8ef1..6cc6e3094d 100644
--- a/mayan/apps/tags/apps.py
+++ b/mayan/apps/tags/apps.py
@@ -4,18 +4,22 @@ from django import apps
 from django.utils.translation import ugettext_lazy as _
 
 from acls.api import class_permissions
-from common.menus import menu_secondary, menu_object, menu_main
+from common.menus import (
+    menu_facet, menu_secondary, menu_object, menu_main, menu_multi_item,
+    menu_sidebar
+)
 from common.utils import encapsulate
 from documents.models import Document
-from navigation.api import register_links, register_model_list_columns
-from navigation.links import link_spacer
+from navigation import CombinedSource
+from navigation.api import register_model_list_columns
 from rest_api.classes import APIEndPoint
 
 from .links import (
-    multiple_documents_selection_tag_remove,
-    single_document_multiple_tag_remove, tag_acl_list, tag_attach, tag_create,
-    tag_delete, tag_document_list, tag_edit, link_tag_list, tag_multiple_attach,
-    tag_multiple_delete, tag_tagged_item_list
+    link_multiple_documents_selection_tag_remove,
+    link_single_document_multiple_tag_remove, link_tag_acl_list,
+    link_tag_attach, link_tag_create, link_tag_delete, link_tag_document_list,
+    link_tag_edit, link_tag_list, link_tag_multiple_attach,
+    link_tag_multiple_delete, link_tag_tagged_item_list
 )
 from .models import Tag
 from .permissions import (
@@ -30,6 +34,8 @@ class TagsApp(apps.AppConfig):
     verbose_name = _('Tags')
 
     def ready(self):
+        APIEndPoint('tags')
+
         class_permissions(Document, [
             PERMISSION_TAG_ATTACH, PERMISSION_TAG_REMOVE,
         ])
@@ -37,7 +43,13 @@ class TagsApp(apps.AppConfig):
             PERMISSION_TAG_DELETE, PERMISSION_TAG_EDIT, PERMISSION_TAG_VIEW,
         ])
 
-        APIEndPoint('tags')
+        menu_facet.bind_links(links=[link_tag_document_list], sources=[Document])
+        menu_main.bind_links(links=[link_tag_list])
+        menu_multi_item.bind_links(links=[link_tag_multiple_delete], sources=[Tag])
+        menu_multi_item.bind_links(links=[link_single_document_multiple_tag_remove], sources=[CombinedSource(obj=Tag, view='tags:document_tags')])
+        menu_object.bind_links(links=[link_tag_tagged_item_list, link_tag_edit, link_tag_acl_list, link_tag_delete], sources=[Tag])
+        menu_secondary.bind_links(links=[link_tag_list, link_tag_create], sources=[Tag, 'tags:tag_list', 'tags:tag_create'])
+        menu_sidebar.bind_links(links=[link_tag_attach], sources=['tags:document_tags', 'tags:tag_remove', 'tags:tag_multiple_remove', 'tags:tag_attach'])
 
         register_model_list_columns(Tag, [
             {
@@ -56,14 +68,3 @@ class TagsApp(apps.AppConfig):
                 encapsulate(lambda x: get_tags_inline_widget_simple(x))
             },
         ])
-
-        menu_main.bind_links(links=[link_tag_list])
-
-        register_links(Tag, [tag_tagged_item_list, tag_edit, tag_acl_list, tag_delete])
-        register_links([Tag], [tag_multiple_delete], menu_name='multi_item_links')
-        register_links([Tag, 'tags:tag_list', 'tags:tag_create'], [link_tag_list, tag_create], menu_name='secondary_menu')
-
-        register_links(Document, [tag_document_list], menu_name='form_header')
-        register_links(['tags:document_tags', 'tags:tag_remove', 'tags:tag_multiple_remove', 'tags:tag_attach'], [tag_attach], menu_name='sidebar')
-        register_links(['tags:document_tags'], [single_document_multiple_tag_remove], menu_name='multi_item_links')
-        register_links([Document], [tag_multiple_attach, multiple_documents_selection_tag_remove, link_spacer], menu_name='multi_item_links')
diff --git a/mayan/apps/tags/links.py b/mayan/apps/tags/links.py
index 680a6f25d3..502e7040ce 100644
--- a/mayan/apps/tags/links.py
+++ b/mayan/apps/tags/links.py
@@ -12,17 +12,17 @@ from .permissions import (
 
 link_tag_list = Link(icon='fa fa-tag', text=_('Tags'), view='tags:tag_list')
 
-tag_create = {'text': _('Create new tag'), 'view': 'tags:tag_create', 'famfam': 'tag_blue_add', 'permissions': [PERMISSION_TAG_CREATE]}
+link_tag_create = Link(permissions=[PERMISSION_TAG_CREATE], text=_('Create new tag'), view='tags:tag_create')
 
-tag_attach = {'text': _('Attach tag'), 'view': 'tags:tag_attach', 'args': 'object.pk', 'famfam': 'tag_blue_add', 'permissions': [PERMISSION_TAG_ATTACH]}
-tag_multiple_attach = {'text': _('Attach tag'), 'view': 'tags:tag_multiple_attach', 'famfam': 'tag_blue_add'}
+link_tag_attach = Link(permissions=[PERMISSION_TAG_ATTACH], text=_('Attach tag'), view='tags:tag_attach', args='object.pk')
+link_tag_multiple_attach = Link(text=_('Attach tag'), view='tags:tag_multiple_attach')
 
-multiple_documents_selection_tag_remove = {'text': _('Remove tag'), 'view': 'tags:multiple_documents_selection_tag_remove', 'famfam': 'tag_blue_delete'}
-single_document_multiple_tag_remove = {'text': _('Remove tags'), 'view': 'tags:single_document_multiple_tag_remove', 'args': 'document.id', 'famfam': 'tag_blue_delete', 'permissions': [PERMISSION_TAG_REMOVE]}
+link_multiple_documents_selection_tag_remove = Link(text=_('Remove tag'), view='tags:multiple_documents_selection_tag_remove')
+link_single_document_multiple_tag_remove = Link(permissions=[PERMISSION_TAG_REMOVE], text=_('Remove tags'), view='tags:single_document_multiple_tag_remove', args='document.id')
 
-tag_document_list = {'text': _('Tags'), 'view': 'tags:document_tags', 'args': 'object.pk', 'famfam': 'tag_blue', 'permissions': [PERMISSION_TAG_REMOVE, PERMISSION_TAG_ATTACH]}
-tag_delete = {'text': _('Delete'), 'view': 'tags:tag_delete', 'args': 'object.id', 'famfam': 'tag_blue_delete', 'permissions': [PERMISSION_TAG_DELETE]}
-tag_edit = {'text': _('Edit'), 'view': 'tags:tag_edit', 'args': 'object.id', 'famfam': 'tag_blue_edit', 'permissions': [PERMISSION_TAG_EDIT]}
-tag_tagged_item_list = {'text': _('Documents'), 'view': 'tags:tag_tagged_item_list', 'args': 'object.id', 'famfam': 'page'}
-tag_multiple_delete = {'text': _('Delete'), 'view': 'tags:tag_multiple_delete', 'famfam': 'tag_blue_delete', 'permissions': [PERMISSION_TAG_DELETE]}
-tag_acl_list = {'text': _('ACLs'), 'view': 'tags:tag_acl_list', 'args': 'object.pk', 'famfam': 'lock', 'permissions': [ACLS_VIEW_ACL]}
+link_tag_document_list = Link(permissions=[PERMISSION_TAG_REMOVE, PERMISSION_TAG_ATTACH], text=_('Tags'), view='tags:document_tags', args='object.pk')
+link_tag_delete = Link(permissions=[PERMISSION_TAG_DELETE], text=_('Delete'), view='tags:tag_delete', args='object.id')
+link_tag_edit = Link(permissions=[PERMISSION_TAG_EDIT], text=_('Edit'), view='tags:tag_edit', args='object.id')
+link_tag_tagged_item_list = Link(text=('Documents'), view='tags:tag_tagged_item_list', args='object.id')
+link_tag_multiple_delete = Link(permissions=[PERMISSION_TAG_DELETE], text=_('Delete'), view='tags:tag_multiple_delete')
+link_tag_acl_list = Link(permissions=[ACLS_VIEW_ACL], text=_('ACLs'), view='tags:tag_acl_list', args='object.pk')
diff --git a/mayan/apps/user_management/apps.py b/mayan/apps/user_management/apps.py
index 22d091b1a8..9168ba956d 100644
--- a/mayan/apps/user_management/apps.py
+++ b/mayan/apps/user_management/apps.py
@@ -6,15 +6,14 @@ from django.utils.translation import ugettext_lazy as _
 
 from actstream import registry
 
-from navigation.api import register_links
-from project_setup.api import register_setup
+from common import menu_setup
 from rest_api.classes import APIEndPoint
 
 from .links import (
     group_add, group_delete, group_edit, group_list, group_members,
-    group_multiple_delete, group_setup, user_add, user_delete, user_edit,
+    group_multiple_delete, link_group_setup, user_add, user_delete, user_edit,
     user_groups, user_list, user_multiple_delete, user_multiple_set_password,
-    user_set_password, user_setup
+    user_set_password, link_user_setup
 )
 
 
@@ -23,16 +22,15 @@ class UserManagementApp(apps.AppConfig):
     verbose_name = _('User management')
 
     def ready(self):
-        register_links(User, [user_edit, user_set_password, user_groups, user_delete])
-        register_links([User, 'user_management:user_multiple_set_password', 'user_management:user_multiple_delete', 'user_management:user_list', 'user_management:user_add'], [user_list, user_add], menu_name='secondary_menu')
-        register_links(['user_management:user_list'], [user_multiple_set_password, user_multiple_delete], menu_name='multi_item_links')
+        # TODO: convert
+        #register_links(User, [user_edit, user_set_password, user_groups, user_delete])
+        #register_links([User, 'user_management:user_multiple_set_password', 'user_management:user_multiple_delete', 'user_management:user_list', 'user_management:user_add'], [user_list, user_add], menu_name='secondary_menu')
+        #register_links(['user_management:user_list'], [user_multiple_set_password, user_multiple_delete], menu_name='multi_item_links')
+        #register_links(Group, [group_edit, group_members, group_delete])
+        #register_links(['user_management:group_multiple_delete', 'user_management:group_delete', 'user_management:group_edit', 'user_management:group_list', 'user_management:group_add', 'user_management:group_members'], [group_list, group_add], menu_name='secondary_menu')
+        #register_links(['user_management:group_list'], [group_multiple_delete], menu_name='multi_item_links')
 
-        register_links(Group, [group_edit, group_members, group_delete])
-        register_links(['user_management:group_multiple_delete', 'user_management:group_delete', 'user_management:group_edit', 'user_management:group_list', 'user_management:group_add', 'user_management:group_members'], [group_list, group_add], menu_name='secondary_menu')
-        register_links(['user_management:group_list'], [group_multiple_delete], menu_name='multi_item_links')
-
-        register_setup(user_setup)
-        register_setup(group_setup)
+        menu_setup.bind_links(links=[link_user_setup, link_group_setup])
 
         APIEndPoint('users', app_name='user_management')
 
diff --git a/mayan/apps/user_management/links.py b/mayan/apps/user_management/links.py
index eeca3c817e..52cefa4b57 100644
--- a/mayan/apps/user_management/links.py
+++ b/mayan/apps/user_management/links.py
@@ -2,6 +2,8 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
+from navigation import Link
+
 from .permissions import (
     PERMISSION_GROUP_CREATE, PERMISSION_GROUP_DELETE, PERMISSION_GROUP_EDIT,
     PERMISSION_GROUP_VIEW, PERMISSION_USER_CREATE, PERMISSION_USER_DELETE,
@@ -9,7 +11,7 @@ from .permissions import (
 )
 
 user_list = {'text': _('Users'), 'view': 'user_management:user_list', 'famfam': 'user', 'permissions': [PERMISSION_USER_VIEW]}
-user_setup = {'text': _('Users'), 'view': 'user_management:user_list', 'icon': 'fa fa-user', 'permissions': [PERMISSION_USER_VIEW]}
+link_user_setup = Link(icon='fa fa-user', permissions=[PERMISSION_USER_VIEW], text=_('Users'), view='user_management:user_list')
 user_edit = {'text': _('Edit'), 'view': 'user_management:user_edit', 'args': 'object.id', 'famfam': 'user_edit', 'permissions': [PERMISSION_USER_EDIT]}
 user_add = {'text': _('Create new user'), 'view': 'user_management:user_add', 'famfam': 'user_add', 'permissions': [PERMISSION_USER_CREATE]}
 user_delete = {'text': _('Delete'), 'view': 'user_management:user_delete', 'args': 'object.id', 'famfam': 'user_delete', 'permissions': [PERMISSION_USER_DELETE]}
@@ -19,7 +21,7 @@ user_multiple_set_password = {'text': _('Reset password'), 'view': 'user_managem
 user_groups = {'text': _('Groups'), 'view': 'user_management:user_groups', 'args': 'object.id', 'famfam': 'group_link', 'permissions': [PERMISSION_USER_EDIT]}
 
 group_list = {'text': _('Groups'), 'view': 'user_management:group_list', 'famfam': 'group', 'permissions': [PERMISSION_GROUP_VIEW]}
-group_setup = {'text': _('Groups'), 'view': 'user_management:group_list', 'icon': 'fa fa-group', 'permissions': [PERMISSION_GROUP_VIEW]}
+link_group_setup = Link(icon='fa fa-group', permissions=[PERMISSION_GROUP_VIEW], text=_('Groups'), view='user_management:group_list')
 group_edit = {'text': _('Edit'), 'view': 'user_management:group_edit', 'args': 'object.id', 'famfam': 'group_edit', 'permissions': [PERMISSION_GROUP_EDIT]}
 group_add = {'text': _('Create new group'), 'view': 'user_management:group_add', 'famfam': 'group_add', 'permissions': [PERMISSION_GROUP_CREATE]}
 group_delete = {'text': _('Delete'), 'view': 'user_management:group_delete', 'args': 'object.id', 'famfam': 'group_delete', 'permissions': [PERMISSION_GROUP_DELETE]}
diff --git a/mayan/settings/base.py b/mayan/settings/base.py
index 040d357cae..7b9e8b4f47 100644
--- a/mayan/settings/base.py
+++ b/mayan/settings/base.py
@@ -72,8 +72,6 @@ INSTALLED_APPS = (
     'mimetype.apps.MIMETypesApp',
     'navigation.apps.NavigationApp',
     'permissions.apps.PermissionsApp',
-    'project_setup.apps.ProjectSetupApp',
-    'project_tools.apps.ProjectToolsApp',
     'smart_settings.apps.SmartSettingsApp',
     'user_management.apps.UserManagementApp',
     # Mayan EDMS
diff --git a/mayan/urls.py b/mayan/urls.py
index e44e6f7e31..b4f5dc6a9f 100644
--- a/mayan/urls.py
+++ b/mayan/urls.py
@@ -32,11 +32,9 @@ urlpatterns = patterns('',
     url(r'^permissions/', include('permissions.urls', namespace='permissions')),
     url(r'^search/', include('dynamic_search.urls', namespace='search')),
     url(r'^settings/', include('smart_settings.urls', namespace='settings')),
-    url(r'^setup/', include('project_setup.urls', namespace='project_setup')),
     url(r'^sources/', include('sources.urls', namespace='sources')),
     url(r'^statistics/', include('statistics.urls', namespace='statistics')),
     url(r'^tags/', include('tags.urls', namespace='tags')),
-    url(r'^tools/', include('project_tools.urls', namespace='project_tools')),
 )