diff --git a/mayan/apps/acls/links.py b/mayan/apps/acls/links.py
index dffca74234..b0222cdb4e 100644
--- a/mayan/apps/acls/links.py
+++ b/mayan/apps/acls/links.py
@@ -12,7 +12,7 @@ acl_grant = {'text': _('Grant'), 'view': 'acls:acl_multiple_grant', 'famfam': 'k
 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]}
 
-acl_setup_valid_classes = {'text': _('Default ACLs'), 'view': 'acls:acl_setup_valid_classes', 'icon': 'main/icons/lock.png', 'permissions': [ACLS_CLASS_VIEW_ACL]}
+acl_setup_valid_classes = {'text': _('Default ACLs'), 'view': 'acls:acl_setup_valid_classes', 'icon': 'appearance/icons/lock.png', '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]}
diff --git a/mayan/apps/acls/views.py b/mayan/apps/acls/views.py
index 66ca796d86..b6e8d7d604 100644
--- a/mayan/apps/acls/views.py
+++ b/mayan/apps/acls/views.py
@@ -62,7 +62,7 @@ def acl_list_for(request, obj, extra_context=None):
     if extra_context:
         context.update(extra_context)
 
-    return render_to_response('main/generic_list.html', context,
+    return render_to_response('appearance/generic_list.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -93,7 +93,7 @@ def acl_detail_for(request, actor, obj):
     # TODO : get all globally assigned permission, new function get_permissions_for_holder (roles aware)
     subtemplates_list = [
         {
-            'name': 'main/generic_list_subtemplate.html',
+            'name': 'appearance/generic_list_subtemplate.html',
             'context': {
                 'title': _('Permissions available to: %(actor)s for %(obj)s' % {
                     'actor': actor,
@@ -129,7 +129,7 @@ def acl_detail_for(request, actor, obj):
         ],
     }
 
-    return render_to_response('main/generic_detail.html', context,
+    return render_to_response('appearance/generic_detail.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -220,7 +220,7 @@ def acl_grant(request):
     if navigation_object_count == 1:
         context['object'] = navigation_object.source_object
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -311,7 +311,7 @@ def acl_revoke(request):
     if navigation_object_count == 1:
         context['object'] = navigation_object.source_object
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -357,7 +357,7 @@ def acl_new_holder_for(request, obj, extra_context=None, navigation_object=None)
     if extra_context:
         context.update(extra_context)
 
-    return render_to_response('main/generic_form.html', context,
+    return render_to_response('appearance/generic_form.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -383,7 +383,7 @@ def acl_setup_valid_classes(request):
         'hide_object': True,
     }
 
-    return render_to_response('main/generic_list.html', context,
+    return render_to_response('appearance/generic_list.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -407,7 +407,7 @@ def acl_class_acl_list(request, access_object_class_gid):
         'object': access_object_class,
     }
 
-    return render_to_response('main/generic_list.html', context,
+    return render_to_response('appearance/generic_list.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -423,7 +423,7 @@ def acl_class_acl_detail(request, access_object_class_gid, holder_object_gid):
     # TODO : get all globally assigned permission, new function get_permissions_for_holder (roles aware)
     subtemplates_list = [
         {
-            'name': 'main/generic_list_subtemplate.html',
+            'name': 'appearance/generic_list_subtemplate.html',
             'context': {
                 'title': _('Permissions available to: %(actor)s for class %(class)s' % {
                     'actor': actor,
@@ -443,7 +443,7 @@ def acl_class_acl_detail(request, access_object_class_gid, holder_object_gid):
         },
     ]
 
-    return render_to_response('main/generic_detail.html', {
+    return render_to_response('appearance/generic_detail.html', {
         'object': access_object_class,
         'subtemplates_list': subtemplates_list,
         'multi_select_item_properties': {
@@ -478,7 +478,7 @@ def acl_class_new_holder_for(request, access_object_class_gid):
         'submit_icon_famfam': 'tick'
     }
 
-    return render_to_response('main/generic_form.html', context,
+    return render_to_response('appearance/generic_form.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -555,7 +555,7 @@ def acl_class_multiple_grant(request):
     if navigation_object_count == 1:
         context['object'] = navigation_object
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -632,5 +632,5 @@ def acl_class_multiple_revoke(request):
     if navigation_object_count == 1:
         context['object'] = navigation_object
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
diff --git a/mayan/apps/appearance/__init__.py b/mayan/apps/appearance/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/mayan/apps/appearance/models.py b/mayan/apps/appearance/models.py
new file mode 100644
index 0000000000..beeb308265
--- /dev/null
+++ b/mayan/apps/appearance/models.py
@@ -0,0 +1,2 @@
+from django.db import models
+
diff --git a/mayan/apps/common/static/css/famfamfam-silk-sprite.css b/mayan/apps/appearance/static/appearance/css/famfamfam-silk-sprite.css
similarity index 100%
rename from mayan/apps/common/static/css/famfamfam-silk-sprite.css
rename to mayan/apps/appearance/static/appearance/css/famfamfam-silk-sprite.css
diff --git a/mayan/apps/common/static/css/override.css b/mayan/apps/appearance/static/appearance/css/override.css
similarity index 100%
rename from mayan/apps/common/static/css/override.css
rename to mayan/apps/appearance/static/appearance/css/override.css
diff --git a/mayan/apps/main/static/main/icons/application_form.png b/mayan/apps/appearance/static/appearance/icons/application_form.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/application_form.png
rename to mayan/apps/appearance/static/appearance/icons/application_form.png
diff --git a/mayan/apps/main/static/main/icons/blackboard_sum.png b/mayan/apps/appearance/static/appearance/icons/blackboard_sum.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/blackboard_sum.png
rename to mayan/apps/appearance/static/appearance/icons/blackboard_sum.png
diff --git a/mayan/apps/main/static/main/icons/book.png b/mayan/apps/appearance/static/appearance/icons/book.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/book.png
rename to mayan/apps/appearance/static/appearance/icons/book.png
diff --git a/mayan/apps/main/static/main/icons/cog.png b/mayan/apps/appearance/static/appearance/icons/cog.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/cog.png
rename to mayan/apps/appearance/static/appearance/icons/cog.png
diff --git a/mayan/apps/main/static/main/icons/disconnect.png b/mayan/apps/appearance/static/appearance/icons/disconnect.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/disconnect.png
rename to mayan/apps/appearance/static/appearance/icons/disconnect.png
diff --git a/mayan/apps/main/static/main/icons/group.png b/mayan/apps/appearance/static/appearance/icons/group.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/group.png
rename to mayan/apps/appearance/static/appearance/icons/group.png
diff --git a/mayan/apps/main/static/main/icons/hourglass.png b/mayan/apps/appearance/static/appearance/icons/hourglass.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/hourglass.png
rename to mayan/apps/appearance/static/appearance/icons/hourglass.png
diff --git a/mayan/apps/main/static/main/icons/interface_preferences.png b/mayan/apps/appearance/static/appearance/icons/interface_preferences.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/interface_preferences.png
rename to mayan/apps/appearance/static/appearance/icons/interface_preferences.png
diff --git a/mayan/apps/main/static/main/icons/key.png b/mayan/apps/appearance/static/appearance/icons/key.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/key.png
rename to mayan/apps/appearance/static/appearance/icons/key.png
diff --git a/mayan/apps/main/static/main/icons/keyboard.png b/mayan/apps/appearance/static/appearance/icons/keyboard.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/keyboard.png
rename to mayan/apps/appearance/static/appearance/icons/keyboard.png
diff --git a/mayan/apps/main/static/main/icons/layout.png b/mayan/apps/appearance/static/appearance/icons/layout.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/layout.png
rename to mayan/apps/appearance/static/appearance/icons/layout.png
diff --git a/mayan/apps/main/static/main/icons/link.png b/mayan/apps/appearance/static/appearance/icons/link.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/link.png
rename to mayan/apps/appearance/static/appearance/icons/link.png
diff --git a/mayan/apps/main/static/main/icons/lock.png b/mayan/apps/appearance/static/appearance/icons/lock.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/lock.png
rename to mayan/apps/appearance/static/appearance/icons/lock.png
diff --git a/mayan/apps/main/static/main/icons/medal_gold_red.png b/mayan/apps/appearance/static/appearance/icons/medal_gold_red.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/medal_gold_red.png
rename to mayan/apps/appearance/static/appearance/icons/medal_gold_red.png
diff --git a/mayan/apps/main/static/main/icons/page.png b/mayan/apps/appearance/static/appearance/icons/page.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/page.png
rename to mayan/apps/appearance/static/appearance/icons/page.png
diff --git a/mayan/apps/main/static/main/icons/page_add.png b/mayan/apps/appearance/static/appearance/icons/page_add.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/page_add.png
rename to mayan/apps/appearance/static/appearance/icons/page_add.png
diff --git a/mayan/apps/main/static/main/icons/question.png b/mayan/apps/appearance/static/appearance/icons/question.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/question.png
rename to mayan/apps/appearance/static/appearance/icons/question.png
diff --git a/mayan/apps/main/static/main/icons/tab.png b/mayan/apps/appearance/static/appearance/icons/tab.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/tab.png
rename to mayan/apps/appearance/static/appearance/icons/tab.png
diff --git a/mayan/apps/main/static/main/icons/table.png b/mayan/apps/appearance/static/appearance/icons/table.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/table.png
rename to mayan/apps/appearance/static/appearance/icons/table.png
diff --git a/mayan/apps/main/static/main/icons/text.png b/mayan/apps/appearance/static/appearance/icons/text.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/text.png
rename to mayan/apps/appearance/static/appearance/icons/text.png
diff --git a/mayan/apps/main/static/main/icons/to_do_list.png b/mayan/apps/appearance/static/appearance/icons/to_do_list.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/to_do_list.png
rename to mayan/apps/appearance/static/appearance/icons/to_do_list.png
diff --git a/mayan/apps/main/static/main/icons/user.png b/mayan/apps/appearance/static/appearance/icons/user.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/user.png
rename to mayan/apps/appearance/static/appearance/icons/user.png
diff --git a/mayan/apps/main/static/main/icons/wrench.png b/mayan/apps/appearance/static/appearance/icons/wrench.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/wrench.png
rename to mayan/apps/appearance/static/appearance/icons/wrench.png
diff --git a/mayan/apps/main/static/main/icons/xhtml.png b/mayan/apps/appearance/static/appearance/icons/xhtml.png
similarity index 100%
rename from mayan/apps/main/static/main/icons/xhtml.png
rename to mayan/apps/appearance/static/appearance/icons/xhtml.png
diff --git a/mayan/apps/common/static/images/famfamfam-silk-sprites/famfam-active.png b/mayan/apps/appearance/static/appearance/images/famfamfam-silk-sprites/famfam-active.png
similarity index 100%
rename from mayan/apps/common/static/images/famfamfam-silk-sprites/famfam-active.png
rename to mayan/apps/appearance/static/appearance/images/famfamfam-silk-sprites/famfam-active.png
diff --git a/mayan/apps/common/static/images/famfamfam-silk-sprites/famfam-hover.png b/mayan/apps/appearance/static/appearance/images/famfamfam-silk-sprites/famfam-hover.png
similarity index 100%
rename from mayan/apps/common/static/images/famfamfam-silk-sprites/famfam-hover.png
rename to mayan/apps/appearance/static/appearance/images/famfamfam-silk-sprites/famfam-hover.png
diff --git a/mayan/apps/common/static/images/famfamfam-silk-sprites/famfam-inactive.png b/mayan/apps/appearance/static/appearance/images/famfamfam-silk-sprites/famfam-inactive.png
similarity index 100%
rename from mayan/apps/common/static/images/famfamfam-silk-sprites/famfam-inactive.png
rename to mayan/apps/appearance/static/appearance/images/famfamfam-silk-sprites/famfam-inactive.png
diff --git a/mayan/apps/main/static/main/images/favicon.ico b/mayan/apps/appearance/static/appearance/images/favicon.ico
similarity index 100%
rename from mayan/apps/main/static/main/images/favicon.ico
rename to mayan/apps/appearance/static/appearance/images/favicon.ico
diff --git a/mayan/apps/main/static/main/images/mayan_logo_landscape_rough.png b/mayan/apps/appearance/static/appearance/images/mayan_logo_landscape_rough.png
similarity index 100%
rename from mayan/apps/main/static/main/images/mayan_logo_landscape_rough.png
rename to mayan/apps/appearance/static/appearance/images/mayan_logo_landscape_rough.png
diff --git a/mayan/apps/common/static/packages/animate-custom.css b/mayan/apps/appearance/static/appearance/packages/animate-custom.css
similarity index 100%
rename from mayan/apps/common/static/packages/animate-custom.css
rename to mayan/apps/appearance/static/appearance/packages/animate-custom.css
diff --git a/mayan/apps/common/static/packages/fancyBox-master/.gitattributes b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/.gitattributes
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/.gitattributes
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/.gitattributes
diff --git a/mayan/apps/common/static/packages/fancyBox-master/CHANGELOG.md b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/CHANGELOG.md
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/CHANGELOG.md
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/CHANGELOG.md
diff --git a/mayan/apps/common/static/packages/fancyBox-master/README.md b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/README.md
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/README.md
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/README.md
diff --git a/mayan/apps/common/static/packages/fancyBox-master/bower.json b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/bower.json
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/bower.json
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/bower.json
diff --git a/mayan/apps/common/static/packages/fancyBox-master/demo/1_b.jpg b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/1_b.jpg
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/demo/1_b.jpg
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/1_b.jpg
diff --git a/mayan/apps/common/static/packages/fancyBox-master/demo/1_s.jpg b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/1_s.jpg
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/demo/1_s.jpg
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/1_s.jpg
diff --git a/mayan/apps/common/static/packages/fancyBox-master/demo/2_b.jpg b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/2_b.jpg
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/demo/2_b.jpg
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/2_b.jpg
diff --git a/mayan/apps/common/static/packages/fancyBox-master/demo/2_s.jpg b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/2_s.jpg
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/demo/2_s.jpg
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/2_s.jpg
diff --git a/mayan/apps/common/static/packages/fancyBox-master/demo/3_b.jpg b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/3_b.jpg
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/demo/3_b.jpg
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/3_b.jpg
diff --git a/mayan/apps/common/static/packages/fancyBox-master/demo/3_s.jpg b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/3_s.jpg
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/demo/3_s.jpg
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/3_s.jpg
diff --git a/mayan/apps/common/static/packages/fancyBox-master/demo/4_b.jpg b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/4_b.jpg
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/demo/4_b.jpg
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/4_b.jpg
diff --git a/mayan/apps/common/static/packages/fancyBox-master/demo/4_s.jpg b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/4_s.jpg
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/demo/4_s.jpg
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/4_s.jpg
diff --git a/mayan/apps/common/static/packages/fancyBox-master/demo/5_b.jpg b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/5_b.jpg
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/demo/5_b.jpg
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/5_b.jpg
diff --git a/mayan/apps/common/static/packages/fancyBox-master/demo/5_s.jpg b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/5_s.jpg
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/demo/5_s.jpg
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/5_s.jpg
diff --git a/mayan/apps/common/static/packages/fancyBox-master/demo/ajax.txt b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/ajax.txt
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/demo/ajax.txt
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/ajax.txt
diff --git a/mayan/apps/common/static/packages/fancyBox-master/demo/iframe.html b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/iframe.html
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/demo/iframe.html
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/iframe.html
diff --git a/mayan/apps/common/static/packages/fancyBox-master/demo/index.html b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/index.html
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/demo/index.html
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/demo/index.html
diff --git a/mayan/apps/common/static/packages/fancyBox-master/fancybox.jquery.json b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/fancybox.jquery.json
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/fancybox.jquery.json
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/fancybox.jquery.json
diff --git a/mayan/apps/common/static/packages/fancyBox-master/lib/jquery-1.10.2.min.js b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/lib/jquery-1.10.2.min.js
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/lib/jquery-1.10.2.min.js
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/lib/jquery-1.10.2.min.js
diff --git a/mayan/apps/common/static/packages/fancyBox-master/lib/jquery.mousewheel.pack.js b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/lib/jquery.mousewheel.pack.js
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/lib/jquery.mousewheel.pack.js
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/lib/jquery.mousewheel.pack.js
diff --git a/mayan/apps/common/static/packages/fancyBox-master/source/blank.gif b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/blank.gif
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/source/blank.gif
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/blank.gif
diff --git a/mayan/apps/common/static/packages/fancyBox-master/source/fancybox_loading.gif b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/fancybox_loading.gif
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/source/fancybox_loading.gif
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/fancybox_loading.gif
diff --git a/mayan/apps/common/static/packages/fancyBox-master/source/fancybox_loading@2x.gif b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/fancybox_loading@2x.gif
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/source/fancybox_loading@2x.gif
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/fancybox_loading@2x.gif
diff --git a/mayan/apps/common/static/packages/fancyBox-master/source/fancybox_overlay.png b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/fancybox_overlay.png
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/source/fancybox_overlay.png
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/fancybox_overlay.png
diff --git a/mayan/apps/common/static/packages/fancyBox-master/source/fancybox_sprite.png b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/fancybox_sprite.png
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/source/fancybox_sprite.png
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/fancybox_sprite.png
diff --git a/mayan/apps/common/static/packages/fancyBox-master/source/fancybox_sprite@2x.png b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/fancybox_sprite@2x.png
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/source/fancybox_sprite@2x.png
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/fancybox_sprite@2x.png
diff --git a/mayan/apps/common/static/packages/fancyBox-master/source/helpers/fancybox_buttons.png b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/helpers/fancybox_buttons.png
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/source/helpers/fancybox_buttons.png
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/helpers/fancybox_buttons.png
diff --git a/mayan/apps/common/static/packages/fancyBox-master/source/helpers/jquery.fancybox-buttons.css b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/helpers/jquery.fancybox-buttons.css
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/source/helpers/jquery.fancybox-buttons.css
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/helpers/jquery.fancybox-buttons.css
diff --git a/mayan/apps/common/static/packages/fancyBox-master/source/helpers/jquery.fancybox-buttons.js b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/helpers/jquery.fancybox-buttons.js
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/source/helpers/jquery.fancybox-buttons.js
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/helpers/jquery.fancybox-buttons.js
diff --git a/mayan/apps/common/static/packages/fancyBox-master/source/helpers/jquery.fancybox-media.js b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/helpers/jquery.fancybox-media.js
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/source/helpers/jquery.fancybox-media.js
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/helpers/jquery.fancybox-media.js
diff --git a/mayan/apps/common/static/packages/fancyBox-master/source/helpers/jquery.fancybox-thumbs.css b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/helpers/jquery.fancybox-thumbs.css
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/source/helpers/jquery.fancybox-thumbs.css
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/helpers/jquery.fancybox-thumbs.css
diff --git a/mayan/apps/common/static/packages/fancyBox-master/source/helpers/jquery.fancybox-thumbs.js b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/helpers/jquery.fancybox-thumbs.js
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/source/helpers/jquery.fancybox-thumbs.js
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/helpers/jquery.fancybox-thumbs.js
diff --git a/mayan/apps/common/static/packages/fancyBox-master/source/jquery.fancybox.css b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/jquery.fancybox.css
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/source/jquery.fancybox.css
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/jquery.fancybox.css
diff --git a/mayan/apps/common/static/packages/fancyBox-master/source/jquery.fancybox.js b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/jquery.fancybox.js
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/source/jquery.fancybox.js
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/jquery.fancybox.js
diff --git a/mayan/apps/common/static/packages/fancyBox-master/source/jquery.fancybox.pack.js b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/jquery.fancybox.pack.js
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/source/jquery.fancybox.pack.js
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/source/jquery.fancybox.pack.js
diff --git a/mayan/apps/common/static/packages/fancyBox-master/sprite.psd b/mayan/apps/appearance/static/appearance/packages/fancyBox-master/sprite.psd
similarity index 100%
rename from mayan/apps/common/static/packages/fancyBox-master/sprite.psd
rename to mayan/apps/appearance/static/appearance/packages/fancyBox-master/sprite.psd
diff --git a/mayan/apps/common/static/packages/jquery-2.1.1.min.js b/mayan/apps/appearance/static/appearance/packages/jquery-2.1.1.min.js
similarity index 100%
rename from mayan/apps/common/static/packages/jquery-2.1.1.min.js
rename to mayan/apps/appearance/static/appearance/packages/jquery-2.1.1.min.js
diff --git a/mayan/apps/common/static/packages/jquery.printElement.min.js b/mayan/apps/appearance/static/appearance/packages/jquery.printElement.min.js
similarity index 100%
rename from mayan/apps/common/static/packages/jquery.printElement.min.js
rename to mayan/apps/appearance/static/appearance/packages/jquery.printElement.min.js
diff --git a/mayan/apps/common/static/packages/jquery.scrollview.js b/mayan/apps/appearance/static/appearance/packages/jquery.scrollview.js
similarity index 100%
rename from mayan/apps/common/static/packages/jquery.scrollview.js
rename to mayan/apps/appearance/static/appearance/packages/jquery.scrollview.js
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/.gitignore b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/.gitignore
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/.gitignore
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/.gitignore
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/.jshintrc b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/.jshintrc
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/.jshintrc
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/.jshintrc
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/CONTRIBUTING.markdown b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/CONTRIBUTING.markdown
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/CONTRIBUTING.markdown
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/CONTRIBUTING.markdown
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/Gruntfile.js b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/Gruntfile.js
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/Gruntfile.js
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/Gruntfile.js
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/README.textile b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/README.textile
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/README.textile
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/README.textile
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/bower.json b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/bower.json
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/bower.json
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/bower.json
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/disabled.html b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/disabled.html
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/disabled.html
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/disabled.html
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/enabled.html b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/enabled.html
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/enabled.html
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/enabled.html
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/enabled_ajax.html b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/enabled_ajax.html
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/enabled_ajax.html
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/enabled_ajax.html
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/enabled_background.html b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/enabled_background.html
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/enabled_background.html
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/enabled_background.html
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/enabled_container.html b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/enabled_container.html
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/enabled_container.html
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/enabled_container.html
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/enabled_fadein.html b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/enabled_fadein.html
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/enabled_fadein.html
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/enabled_fadein.html
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/enabled_gazillion.html b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/enabled_gazillion.html
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/enabled_gazillion.html
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/enabled_gazillion.html
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/enabled_noscript.html b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/enabled_noscript.html
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/enabled_noscript.html
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/enabled_noscript.html
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/enabled_timeout.html b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/enabled_timeout.html
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/enabled_timeout.html
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/enabled_timeout.html
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/enabled_wide.html b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/enabled_wide.html
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/enabled_wide.html
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/enabled_wide.html
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/enabled_wide_container.html b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/enabled_wide_container.html
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/enabled_wide_container.html
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/enabled_wide_container.html
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/img/bmw_m1_hood.jpg b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/img/bmw_m1_hood.jpg
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/img/bmw_m1_hood.jpg
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/img/bmw_m1_hood.jpg
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/img/bmw_m1_side.jpg b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/img/bmw_m1_side.jpg
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/img/bmw_m1_side.jpg
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/img/bmw_m1_side.jpg
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/img/bmw_m3_gt.jpg b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/img/bmw_m3_gt.jpg
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/img/bmw_m3_gt.jpg
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/img/bmw_m3_gt.jpg
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/img/corvette_pitstop.jpg b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/img/corvette_pitstop.jpg
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/img/corvette_pitstop.jpg
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/img/corvette_pitstop.jpg
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/img/grey.gif b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/img/grey.gif
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/img/grey.gif
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/img/grey.gif
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/img/transparent.gif b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/img/transparent.gif
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/img/transparent.gif
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/img/transparent.gif
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/img/viper_1.jpg b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/img/viper_1.jpg
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/img/viper_1.jpg
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/img/viper_1.jpg
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/img/viper_corner.jpg b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/img/viper_corner.jpg
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/img/viper_corner.jpg
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/img/viper_corner.jpg
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/img/white.gif b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/img/white.gif
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/img/white.gif
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/img/white.gif
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/jquery.lazyload.js b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/jquery.lazyload.js
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/jquery.lazyload.js
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/jquery.lazyload.js
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/jquery.lazyload.min.js b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/jquery.lazyload.min.js
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/jquery.lazyload.min.js
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/jquery.lazyload.min.js
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/jquery.scrollstop.js b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/jquery.scrollstop.js
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/jquery.scrollstop.js
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/jquery.scrollstop.js
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/jquery.scrollstop.min.js b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/jquery.scrollstop.min.js
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/jquery.scrollstop.min.js
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/jquery.scrollstop.min.js
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/lazyload.jquery.json b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/lazyload.jquery.json
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/lazyload.jquery.json
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/lazyload.jquery.json
diff --git a/mayan/apps/common/static/packages/jquery_lazyload-master/package.json b/mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/package.json
similarity index 100%
rename from mayan/apps/common/static/packages/jquery_lazyload-master/package.json
rename to mayan/apps/appearance/static/appearance/packages/jquery_lazyload-master/package.json
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/HISTORY.md b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/HISTORY.md
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/HISTORY.md
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/HISTORY.md
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/LICENSE.md b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/LICENSE.md
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/LICENSE.md
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/LICENSE.md
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/README.md b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/README.md
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/README.md
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/README.md
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/base-context-min.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/base-context-min.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/base-context-min.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/base-context-min.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/base-context.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/base-context.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/base-context.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/base-context.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/base-min.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/base-min.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/base-min.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/base-min.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/base.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/base.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/base.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/base.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/bower.json b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/bower.json
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/bower.json
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/bower.json
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/buttons-core-min.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/buttons-core-min.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/buttons-core-min.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/buttons-core-min.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/buttons-core.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/buttons-core.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/buttons-core.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/buttons-core.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/buttons-min.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/buttons-min.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/buttons-min.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/buttons-min.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/buttons.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/buttons.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/buttons.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/buttons.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/forms-min.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/forms-min.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/forms-min.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/forms-min.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/forms-nr-min.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/forms-nr-min.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/forms-nr-min.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/forms-nr-min.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/forms-nr.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/forms-nr.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/forms-nr.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/forms-nr.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/forms.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/forms.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/forms.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/forms.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/grids-core-min.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/grids-core-min.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/grids-core-min.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/grids-core-min.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/grids-core.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/grids-core.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/grids-core.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/grids-core.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/grids-min.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/grids-min.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/grids-min.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/grids-min.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/grids-responsive-min.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/grids-responsive-min.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/grids-responsive-min.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/grids-responsive-min.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/grids-responsive-old-ie-min.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/grids-responsive-old-ie-min.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/grids-responsive-old-ie-min.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/grids-responsive-old-ie-min.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/grids-responsive-old-ie.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/grids-responsive-old-ie.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/grids-responsive-old-ie.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/grids-responsive-old-ie.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/grids-responsive.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/grids-responsive.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/grids-responsive.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/grids-responsive.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/grids-units-min.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/grids-units-min.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/grids-units-min.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/grids-units-min.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/grids-units.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/grids-units.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/grids-units.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/grids-units.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/grids.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/grids.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/grids.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/grids.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/menus-core-min.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/menus-core-min.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/menus-core-min.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/menus-core-min.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/menus-core.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/menus-core.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/menus-core.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/menus-core.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/menus-min.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/menus-min.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/menus-min.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/menus-min.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/menus-nr-min.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/menus-nr-min.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/menus-nr-min.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/menus-nr-min.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/menus-nr.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/menus-nr.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/menus-nr.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/menus-nr.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/menus-paginator-min.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/menus-paginator-min.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/menus-paginator-min.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/menus-paginator-min.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/menus-paginator.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/menus-paginator.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/menus-paginator.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/menus-paginator.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/menus.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/menus.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/menus.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/menus.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/pure-min.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/pure-min.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/pure-min.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/pure-min.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/pure-nr-min.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/pure-nr-min.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/pure-nr-min.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/pure-nr-min.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/pure-nr.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/pure-nr.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/pure-nr.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/pure-nr.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/pure.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/pure.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/pure.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/pure.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/tables-min.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/tables-min.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/tables-min.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/tables-min.css
diff --git a/mayan/apps/common/static/common/packages/pure-release-0.5.0/tables.css b/mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/tables.css
similarity index 100%
rename from mayan/apps/common/static/common/packages/pure-release-0.5.0/tables.css
rename to mayan/apps/appearance/static/appearance/packages/pure-release-0.5.0/tables.css
diff --git a/mayan/apps/common/static/web_theme_media/LICENSE b/mayan/apps/appearance/static/appearance/packages/web_theme_media/LICENSE
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/LICENSE
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/LICENSE
diff --git a/mayan/apps/common/static/web_theme_media/README.md b/mayan/apps/appearance/static/appearance/packages/web_theme_media/README.md
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/README.md
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/README.md
diff --git a/mayan/apps/common/static/web_theme_media/VERSION b/mayan/apps/appearance/static/appearance/packages/web_theme_media/VERSION
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/VERSION
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/VERSION
diff --git a/mayan/apps/common/static/web_theme_media/images/avatar.png b/mayan/apps/appearance/static/appearance/packages/web_theme_media/images/avatar.png
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/images/avatar.png
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/images/avatar.png
diff --git a/mayan/apps/common/static/web_theme_media/images/icons/application_edit.png b/mayan/apps/appearance/static/appearance/packages/web_theme_media/images/icons/application_edit.png
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/images/icons/application_edit.png
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/images/icons/application_edit.png
diff --git a/mayan/apps/common/static/web_theme_media/images/icons/cross.png b/mayan/apps/appearance/static/appearance/packages/web_theme_media/images/icons/cross.png
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/images/icons/cross.png
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/images/icons/cross.png
diff --git a/mayan/apps/common/static/web_theme_media/images/icons/key.png b/mayan/apps/appearance/static/appearance/packages/web_theme_media/images/icons/key.png
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/images/icons/key.png
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/images/icons/key.png
diff --git a/mayan/apps/common/static/web_theme_media/images/icons/tick.png b/mayan/apps/appearance/static/appearance/packages/web_theme_media/images/icons/tick.png
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/images/icons/tick.png
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/images/icons/tick.png
diff --git a/mayan/apps/common/static/web_theme_media/javascripts/jquery.localscroll.js b/mayan/apps/appearance/static/appearance/packages/web_theme_media/javascripts/jquery.localscroll.js
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/javascripts/jquery.localscroll.js
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/javascripts/jquery.localscroll.js
diff --git a/mayan/apps/common/static/web_theme_media/javascripts/jquery.scrollTo.js b/mayan/apps/appearance/static/appearance/packages/web_theme_media/javascripts/jquery.scrollTo.js
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/javascripts/jquery.scrollTo.js
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/javascripts/jquery.scrollTo.js
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/base.css b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/base.css
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/base.css
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/base.css
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/override.css b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/override.css
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/override.css
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/override.css
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/activo/images/arrow.png b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/activo/images/arrow.png
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/activo/images/arrow.png
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/activo/images/arrow.png
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/activo/images/boxbar-background.png b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/activo/images/boxbar-background.png
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/activo/images/boxbar-background.png
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/activo/images/boxbar-background.png
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/activo/images/button-background-active.png b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/activo/images/button-background-active.png
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/activo/images/button-background-active.png
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/activo/images/button-background-active.png
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/activo/images/button-background.png b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/activo/images/button-background.png
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/activo/images/button-background.png
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/activo/images/button-background.png
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/activo/images/menubar-background.png b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/activo/images/menubar-background.png
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/activo/images/menubar-background.png
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/activo/images/menubar-background.png
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/activo/style.css b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/activo/style.css
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/activo/style.css
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/activo/style.css
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/amro/style.css b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/amro/style.css
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/amro/style.css
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/amro/style.css
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/bec-green/style.css b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/bec-green/style.css
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/bec-green/style.css
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/bec-green/style.css
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/bec/style.css b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/bec/style.css
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/bec/style.css
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/bec/style.css
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/blue/style.css b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/blue/style.css
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/blue/style.css
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/blue/style.css
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.eot b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.eot
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.eot
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.eot
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.svg b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.svg
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.svg
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.svg
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.ttf b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.ttf
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.ttf
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.ttf
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.woff b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.woff
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.woff
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.woff
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.eot b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.eot
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.eot
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.eot
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.svg b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.svg
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.svg
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.svg
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.ttf b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.ttf
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.ttf
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.ttf
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.woff b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.woff
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.woff
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.woff
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.eot b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.eot
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.eot
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.eot
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.svg b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.svg
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.svg
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.svg
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.ttf b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.ttf
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.ttf
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.ttf
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.woff b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.woff
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.woff
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.woff
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/default/images/arrow.png b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/images/arrow.png
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/default/images/arrow.png
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/images/arrow.png
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/default/images/bgd.jpg b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/images/bgd.jpg
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/default/images/bgd.jpg
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/images/bgd.jpg
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/default/images/boxbar-background.png b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/images/boxbar-background.png
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/default/images/boxbar-background.png
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/images/boxbar-background.png
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/default/images/button-background-active.png b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/images/button-background-active.png
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/default/images/button-background-active.png
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/images/button-background-active.png
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/default/images/button-background.png b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/images/button-background.png
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/default/images/button-background.png
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/images/button-background.png
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/default/images/menubar-background.png b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/images/menubar-background.png
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/default/images/menubar-background.png
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/images/menubar-background.png
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/default/images/messages/error.png b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/images/messages/error.png
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/default/images/messages/error.png
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/images/messages/error.png
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/default/images/messages/notice.png b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/images/messages/notice.png
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/default/images/messages/notice.png
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/images/messages/notice.png
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/default/images/messages/warning.png b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/images/messages/warning.png
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/default/images/messages/warning.png
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/images/messages/warning.png
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/default/style.css b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/style.css
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/default/style.css
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/default/style.css
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/djime-cerulean/style.css b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/djime-cerulean/style.css
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/djime-cerulean/style.css
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/djime-cerulean/style.css
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/drastic-dark/style.css b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/drastic-dark/style.css
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/drastic-dark/style.css
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/drastic-dark/style.css
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/kathleene/style.css b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/kathleene/style.css
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/kathleene/style.css
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/kathleene/style.css
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/olive/style.css b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/olive/style.css
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/olive/style.css
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/olive/style.css
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/orange/style.css b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/orange/style.css
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/orange/style.css
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/orange/style.css
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/red/style.css b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/red/style.css
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/red/style.css
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/red/style.css
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/reidb-greenish/style.css b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/reidb-greenish/style.css
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/reidb-greenish/style.css
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/reidb-greenish/style.css
diff --git a/mayan/apps/common/static/web_theme_media/stylesheets/themes/warehouse/style.css b/mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/warehouse/style.css
similarity index 100%
rename from mayan/apps/common/static/web_theme_media/stylesheets/themes/warehouse/style.css
rename to mayan/apps/appearance/static/appearance/packages/web_theme_media/stylesheets/themes/warehouse/style.css
diff --git a/mayan/apps/main/templates/main/403.html b/mayan/apps/appearance/templates/appearance/403.html
similarity index 92%
rename from mayan/apps/main/templates/main/403.html
rename to mayan/apps/appearance/templates/appearance/403.html
index 152d67d8b3..21301bef86 100644
--- a/mayan/apps/main/templates/main/403.html
+++ b/mayan/apps/appearance/templates/appearance/403.html
@@ -1,4 +1,4 @@
-{% extends 'main/base.html' %}
+{% extends 'appearance/base.html' %}
 
 {% load i18n %}
 
diff --git a/mayan/apps/main/templates/main/404.html b/mayan/apps/appearance/templates/appearance/404.html
similarity index 91%
rename from mayan/apps/main/templates/main/404.html
rename to mayan/apps/appearance/templates/appearance/404.html
index ab427c7472..72821b3d56 100644
--- a/mayan/apps/main/templates/main/404.html
+++ b/mayan/apps/appearance/templates/appearance/404.html
@@ -1,4 +1,4 @@
-{% extends 'main/base.html' %}
+{% extends 'appearance/base.html' %}
 
 {% load i18n %}
 
diff --git a/mayan/apps/main/templates/main/500.html b/mayan/apps/appearance/templates/appearance/500.html
similarity index 100%
rename from mayan/apps/main/templates/main/500.html
rename to mayan/apps/appearance/templates/appearance/500.html
diff --git a/mayan/apps/main/templates/main/about.html b/mayan/apps/appearance/templates/appearance/about.html
similarity index 89%
rename from mayan/apps/main/templates/main/about.html
rename to mayan/apps/appearance/templates/appearance/about.html
index 3f2ea7b4e4..97f1838c4c 100644
--- a/mayan/apps/main/templates/main/about.html
+++ b/mayan/apps/appearance/templates/appearance/about.html
@@ -1,4 +1,4 @@
-{% extends 'main/base.html' %}
+{% extends 'appearance/base.html' %}
 
 {% load i18n %}
 {% load static %}
@@ -31,7 +31,7 @@
             {% trans 'Released under the Apache 2.0 License' %}
         </p>
         <p>
-            <img src="{% static 'main/images/mayan_logo_landscape_rough.png' %}"/>
+            <img src="{% static 'appearance/images/mayan_logo_landscape_rough.png' %}"/>
         </p>
     </div>
 
diff --git a/mayan/apps/main/templates/main/base.html b/mayan/apps/appearance/templates/appearance/base.html
similarity index 87%
rename from mayan/apps/main/templates/main/base.html
rename to mayan/apps/appearance/templates/appearance/base.html
index 475b18d544..9d08b3a0fc 100644
--- a/mayan/apps/main/templates/main/base.html
+++ b/mayan/apps/appearance/templates/appearance/base.html
@@ -30,18 +30,18 @@
         {% endif %}
 
         {% compress css %}
-            <link rel="stylesheet" href="{% static 'web_theme_media/stylesheets/base.css' %}" type="text/css" media="screen" />
-            <link rel="stylesheet" href="{% static 'web_theme_media/stylesheets/themes/activo/style.css' %}" type="text/css" media="screen" />
-            <link rel="stylesheet" href="{% static 'packages/animate-custom.css' %}" type="text/css" media="screen" />
-            <link rel="stylesheet" href="{% static 'css/famfamfam-silk-sprite.css' %}" type="text/css" media="screen" />
-            <link rel="stylesheet" href="{% static 'css/override.css' %}" type="text/css" media="screen" />
-            <link rel="stylesheet" href="{% static 'packages/fancyBox-master/source/jquery.fancybox.css' %}" type="text/css" media="screen" />
+            <link rel="stylesheet" href="{% static 'appearance/packages/web_theme_media/stylesheets/base.css' %}" type="text/css" media="screen" />
+            <link rel="stylesheet" href="{% static 'appearance/packages/web_theme_media/stylesheets/themes/activo/style.css' %}" type="text/css" media="screen" />
+            <link rel="stylesheet" href="{% static 'appearance/packages/animate-custom.css' %}" type="text/css" media="screen" />
+            <link rel="stylesheet" href="{% static 'appearance/css/famfamfam-silk-sprite.css' %}" type="text/css" media="screen" />
+            <link rel="stylesheet" href="{% static 'appearance/css/override.css' %}" type="text/css" media="screen" />
+            <link rel="stylesheet" href="{% static 'appearance/packages/fancyBox-master/source/jquery.fancybox.css' %}" type="text/css" media="screen" />
 
-            <link rel="stylesheet" href="{% static 'common/packages/pure-release-0.5.0/base-min.css' %}" type="text/css" media="screen" />
-            <link rel="stylesheet" href="{% static 'common/packages/pure-release-0.5.0/grids-core-min.css' %}" type="text/css" media="screen" />
-            <link rel="stylesheet" href="{% static 'common/packages/pure-release-0.5.0/grids-min.css' %}" type="text/css" media="screen" />
-            <link rel="stylesheet" href="{% static 'common/packages/pure-release-0.5.0/forms-nr-min.css' %}" type="text/css" media="screen" />
-            <link rel="stylesheet" href="{% static 'common/packages/pure-release-0.5.0/buttons-min.css' %}" type="text/css" media="screen" />
+            <link rel="stylesheet" href="{% static 'appearance/packages/pure-release-0.5.0/base-min.css' %}" type="text/css" media="screen" />
+            <link rel="stylesheet" href="{% static 'appearance/packages/pure-release-0.5.0/grids-core-min.css' %}" type="text/css" media="screen" />
+            <link rel="stylesheet" href="{% static 'appearance/packages/pure-release-0.5.0/grids-min.css' %}" type="text/css" media="screen" />
+            <link rel="stylesheet" href="{% static 'appearance/packages/pure-release-0.5.0/forms-nr-min.css' %}" type="text/css" media="screen" />
+            <link rel="stylesheet" href="{% static 'appearance/packages/pure-release-0.5.0/buttons-min.css' %}" type="text/css" media="screen" />
 
             <style type="text/css">
                 #fancybox-left-ico {
@@ -204,7 +204,7 @@
                                     {% with 'true' as hide_active_anchor %}
                                     {% with 'active' as li_class_active %}
                                     {% with 'first' as li_class_first %}
-                                        {% include 'generic_subnavigation.html' %}
+                                        {% include 'navigation/generic_subnavigation.html' %}
                                     {% endwith %}
                                     {% endwith %}
                                     {% endwith %}
@@ -258,7 +258,7 @@
                                                         {% with 'true' as hide_active_anchor %}
                                                         {% with 'active' as li_class_active %}
                                                         {% with 'first' as li_class_first %}
-                                                            {% include 'generic_navigation.html' %}
+                                                            {% include 'navigation/generic_navigation.html' %}
                                                         {% endwith %}
                                                         {% endwith %}
                                                         {% endwith %}
@@ -278,7 +278,7 @@
                                                     {% with 'true' as hide_active_anchor %}
                                                     {% with 'active' as li_class_active %}
                                                     {% with 'first' as li_class_first %}
-                                                        {% include 'generic_navigation.html' %}
+                                                        {% include 'navigation/generic_navigation.html' %}
                                                     {% endwith %}
                                                     {% endwith %}
                                                     {% endwith %}
@@ -302,7 +302,7 @@
                                         <h3>{% trans "Secondary menu" %}</h3>
                                         <ul class="navigation">
                                             {% with 'true' as as_li %}
-                                                {% include 'generic_navigation.html' %}
+                                                {% include 'navigation/generic_navigation.html' %}
                                             {% endwith %}
                                         </ul>
                                     </div>
@@ -315,7 +315,7 @@
                                     <h3>{% trans "Secondary menu" %}</h3>
                                     <ul class="navigation">
                                         {% with 'true' as as_li %}
-                                            {% include 'generic_navigation.html' %}
+                                            {% include 'navigation/generic_navigation.html' %}
                                         {% endwith %}
                                     </ul>
                                 </div>
@@ -339,7 +339,7 @@
                                         {% endif %}
                                         <ul class="navigation">
                                             {% with 'true' as as_li %}
-                                                {% include 'generic_navigation.html' %}
+                                                {% include 'navigation/generic_navigation.html' %}
                                             {% endwith %}
                                         </ul>
                                     </div>
@@ -350,7 +350,7 @@
                                     <h3>{% trans 'Other available actions' %}</h3>
                                     <ul class="navigation">
                                         {% with 'true' as as_li %}
-                                            {% include 'generic_navigation.html' %}
+                                            {% include 'navigation/generic_navigation.html' %}
                                         {% endwith %}
                                     </ul>
                                 </div>
@@ -367,7 +367,7 @@
                                     {% endif %}
                                     <ul class="navigation">
                                         {% with 'true' as as_li %}
-                                            {% include 'generic_navigation.html' %}
+                                            {% include 'navigation/generic_navigation.html' %}
                                         {% endwith %}
                                     </ul>
                                 </div>
@@ -378,7 +378,7 @@
                                     <h3>{% trans "Other available actions" %}</h3>
                                     <ul class="navigation">
                                         {% with 'true' as as_li %}
-                                            {% include 'generic_navigation.html' %}
+                                            {% include 'navigation/generic_navigation.html' %}
                                         {% endwith %}
                                     </ul>
                                 </div>
@@ -392,11 +392,11 @@
         </div><!--end #container-->
 
         {% compress js %}
-        <script type="text/javascript" charset="utf-8" src="{% static 'packages/jquery-2.1.1.min.js' %}"></script>
-        <script type="text/javascript" src="{% static 'packages/jquery.scrollview.js' %}"></script>
-        <script type="text/javascript" src="{% static 'packages/jquery_lazyload-master/jquery.lazyload.min.js' %}"></script>
-        <script type="text/javascript" src="{% static 'packages/fancyBox-master/source/jquery.fancybox.pack.js' %}"></script>
-        <script type="text/javascript" src="{% static 'packages/fancyBox-master/lib/jquery.mousewheel.pack.js' %}"></script>
+        <script type="text/javascript" src="{% static 'appearance/packages/jquery-2.1.1.min.js' %}"></script>
+        <script type="text/javascript" src="{% static 'appearance/packages/jquery.scrollview.js' %}"></script>
+        <script type="text/javascript" src="{% static 'appearance/packages/jquery_lazyload-master/jquery.lazyload.min.js' %}"></script>
+        <script type="text/javascript" src="{% static 'appearance/packages/fancyBox-master/source/jquery.fancybox.pack.js' %}"></script>
+        <script type="text/javascript" src="{% static 'appearance/packages/fancyBox-master/lib/jquery.mousewheel.pack.js' %}"></script>
 
         <script type="text/javascript">
             jQuery(document).ready(function() {
diff --git a/mayan/apps/main/templates/main/calculate_form_title.html b/mayan/apps/appearance/templates/appearance/calculate_form_title.html
similarity index 100%
rename from mayan/apps/main/templates/main/calculate_form_title.html
rename to mayan/apps/appearance/templates/appearance/calculate_form_title.html
diff --git a/mayan/apps/main/templates/main/diagnostics.html b/mayan/apps/appearance/templates/appearance/diagnostics.html
similarity index 82%
rename from mayan/apps/main/templates/main/diagnostics.html
rename to mayan/apps/appearance/templates/appearance/diagnostics.html
index 6e323f3e26..410cc41b81 100644
--- a/mayan/apps/main/templates/main/diagnostics.html
+++ b/mayan/apps/appearance/templates/appearance/diagnostics.html
@@ -1,4 +1,4 @@
-{% extends 'main/base.html' %}
+{% extends 'appearance/base.html' %}
 
 {% block title %} :: {{ title }}{% endblock %}
 
@@ -11,7 +11,7 @@
             <ul class="undecorated_list">
                 {% with value.links as object_navigation_links %}
                 {% with 'true' as as_li %}
-                    {% include 'generic_navigation.html' %}
+                    {% include 'navigation/generic_navigation.html' %}
                 {% endwith %}
                 {% endwith %}
             </ul>
diff --git a/mayan/apps/main/templates/main/generic_confirm.html b/mayan/apps/appearance/templates/appearance/generic_confirm.html
similarity index 95%
rename from mayan/apps/main/templates/main/generic_confirm.html
rename to mayan/apps/appearance/templates/appearance/generic_confirm.html
index a1a423f15a..e7c70971f9 100644
--- a/mayan/apps/main/templates/main/generic_confirm.html
+++ b/mayan/apps/appearance/templates/appearance/generic_confirm.html
@@ -1,4 +1,4 @@
-{% extends 'main/base.html' %}
+{% extends 'appearance/base.html' %}
 
 {% load i18n %}
 {% load static %}
@@ -31,7 +31,7 @@
                 {% endif %}
 
                 <div style="float: left; margin-right: 10px;">
-                    <img style="margin-top: 12px;" src="{% static 'main/icons/question.png' %}" alt="{% trans 'question bubble' %}" />
+                    <img style="margin-top: 12px;" src="{% static 'appearance/icons/question.png' %}" alt="{% trans 'question bubble' %}" />
                 </div>
                 <div style="float: left; width: 90%;">
                 {% if title %}
diff --git a/mayan/apps/main/templates/main/generic_detail.html b/mayan/apps/appearance/templates/appearance/generic_detail.html
similarity index 91%
rename from mayan/apps/main/templates/main/generic_detail.html
rename to mayan/apps/appearance/templates/appearance/generic_detail.html
index e261dd8376..896ad298ed 100644
--- a/mayan/apps/main/templates/main/generic_detail.html
+++ b/mayan/apps/appearance/templates/appearance/generic_detail.html
@@ -1,10 +1,10 @@
-{% extends 'main/base.html' %}
+{% extends 'appearance/base.html' %}
 
 {% load i18n %}
 
 {% load subtemplates_tags %}
 
-{% block title %} :: {% with 'true' as read_only %}{% include 'main/calculate_form_title.html' %}{% endwith %}{% endblock %}
+{% block title %} :: {% with 'true' as read_only %}{% include 'appearance/calculate_form_title.html' %}{% endwith %}{% endblock %}
 
 {% block sidebar %}
     {% for subtemplate in sidebar_subtemplates %}
@@ -49,7 +49,7 @@
         {% with 'true' as read_only %}
             <div class="">
                 <div class="generic_subform">
-                    {% include 'main/generic_form_subtemplate.html' %}
+                    {% include 'appearance/generic_form_subtemplate.html' %}
                 </div>
             </div>
             {% if grid_clear or not grid %}
diff --git a/mayan/apps/main/templates/main/generic_detail_subtemplate.html b/mayan/apps/appearance/templates/appearance/generic_detail_subtemplate.html
similarity index 87%
rename from mayan/apps/main/templates/main/generic_detail_subtemplate.html
rename to mayan/apps/appearance/templates/appearance/generic_detail_subtemplate.html
index e4d71da5bc..cef63cd7c5 100644
--- a/mayan/apps/main/templates/main/generic_detail_subtemplate.html
+++ b/mayan/apps/appearance/templates/appearance/generic_detail_subtemplate.html
@@ -14,7 +14,7 @@
     {% if form %}
         {% with 'true' as read_only %}
             <div class="generic_subform">
-                {% include 'main/generic_form_subtemplate.html' %}
+                {% include 'appearance/generic_form_subtemplate.html' %}
             </div>
         {% endwith %}
     {% endif %}
diff --git a/mayan/apps/main/templates/main/generic_form.html b/mayan/apps/appearance/templates/appearance/generic_form.html
similarity index 90%
rename from mayan/apps/main/templates/main/generic_form.html
rename to mayan/apps/appearance/templates/appearance/generic_form.html
index c15d3687fa..877f4d78fc 100644
--- a/mayan/apps/main/templates/main/generic_form.html
+++ b/mayan/apps/appearance/templates/appearance/generic_form.html
@@ -1,8 +1,8 @@
-{% extends 'main/base.html' %}
+{% extends 'appearance/base.html' %}
 
 {% load subtemplates_tags %}
 
-{% block title %} :: {% include 'main/calculate_form_title.html' %}{% endblock %}
+{% block title %} :: {% include 'appearance/calculate_form_title.html' %}{% endblock %}
 
 {% block sidebar %}
     {% for subtemplate in sidebar_subtemplates_list %}
@@ -29,7 +29,7 @@
 
     {% if form %}
         <div class="generic_subform">
-            {% include "main/generic_form_subtemplate.html" %}
+            {% include "appearance/generic_form_subtemplate.html" %}
         </div>
     {% endif %}
 
diff --git a/mayan/apps/main/templates/main/generic_form_instance.html b/mayan/apps/appearance/templates/appearance/generic_form_instance.html
similarity index 100%
rename from mayan/apps/main/templates/main/generic_form_instance.html
rename to mayan/apps/appearance/templates/appearance/generic_form_instance.html
diff --git a/mayan/apps/main/templates/main/generic_form_subtemplate.html b/mayan/apps/appearance/templates/appearance/generic_form_subtemplate.html
similarity index 94%
rename from mayan/apps/main/templates/main/generic_form_subtemplate.html
rename to mayan/apps/appearance/templates/appearance/generic_form_subtemplate.html
index 074a02cc08..b60193c973 100644
--- a/mayan/apps/main/templates/main/generic_form_subtemplate.html
+++ b/mayan/apps/appearance/templates/appearance/generic_form_subtemplate.html
@@ -9,7 +9,7 @@
     <h2 class="title">
 {% endif %}
 
-{% include 'main/calculate_form_title.html' %}
+{% include 'appearance/calculate_form_title.html' %}
 
 {% if side_bar %}
     </h3>
@@ -64,7 +64,7 @@
                 {% endif %}
 
                 {% for form in formset.forms %}
-                    {% include 'main/generic_form_instance.html' %}
+                    {% include 'appearance/generic_form_instance.html' %}
                 {% endfor %}
                 {% if form_display_mode_table %}
                     </tbody>
@@ -72,7 +72,7 @@
                 {% endif %}
             {% endwith %}
         {% else %}
-            {% include 'main/generic_form_instance.html' %}
+            {% include 'appearance/generic_form_instance.html' %}
         {% endif %}
         {% if not read_only %}
         <div class="group navform wat-cf">
diff --git a/mayan/apps/main/templates/main/generic_list.html b/mayan/apps/appearance/templates/appearance/generic_list.html
similarity index 77%
rename from mayan/apps/main/templates/main/generic_list.html
rename to mayan/apps/appearance/templates/appearance/generic_list.html
index e600033d71..15929fb7cc 100644
--- a/mayan/apps/main/templates/main/generic_list.html
+++ b/mayan/apps/appearance/templates/appearance/generic_list.html
@@ -1,11 +1,11 @@
-{% extends 'main/base.html' %}
+{% extends 'appearance/base.html' %}
 
 {% load i18n %}
 
 {% load navigation_tags %}
 {% load subtemplates_tags %}
 
-{% block title %} :: {% include 'main/calculate_form_title.html' %}{% endblock %}
+{% block title %} :: {% include 'appearance/calculate_form_title.html' %}{% endblock %}
 
 {% block sidebar %}
     {% for subtemplate in sidebar_subtemplates_list %}
@@ -23,6 +23,6 @@
 {% endblock %}
 
 {% block content %}
-    {% include 'main/generic_list_subtemplate.html' %}
+    {% include 'appearance/generic_list_subtemplate.html' %}
 {% endblock %}
 
diff --git a/mayan/apps/main/templates/main/generic_list_horizontal.html b/mayan/apps/appearance/templates/appearance/generic_list_horizontal.html
similarity index 56%
rename from mayan/apps/main/templates/main/generic_list_horizontal.html
rename to mayan/apps/appearance/templates/appearance/generic_list_horizontal.html
index fec2b46ec1..bd94459ce8 100644
--- a/mayan/apps/main/templates/main/generic_list_horizontal.html
+++ b/mayan/apps/appearance/templates/appearance/generic_list_horizontal.html
@@ -1,4 +1,4 @@
-{% extends 'main/base.html' %}
+{% extends 'appearance/base.html' %}
 
 {% load navigation_tags %}
 {% load subtemplates_tags %}
@@ -6,6 +6,6 @@
 {% block title %} :: {{ title }}{% endblock %}
 
 {% block content %}
-    {% include 'main/generic_list_horizontal_subtemplate.html' %}
+    {% include 'appearance/generic_list_horizontal_subtemplate.html' %}
 {% endblock %}
 
diff --git a/mayan/apps/main/templates/main/generic_list_horizontal_subtemplate.html b/mayan/apps/appearance/templates/appearance/generic_list_horizontal_subtemplate.html
similarity index 77%
rename from mayan/apps/main/templates/main/generic_list_horizontal_subtemplate.html
rename to mayan/apps/appearance/templates/appearance/generic_list_horizontal_subtemplate.html
index 38cb82d0b6..cc609117d1 100644
--- a/mayan/apps/main/templates/main/generic_list_horizontal_subtemplate.html
+++ b/mayan/apps/appearance/templates/appearance/generic_list_horizontal_subtemplate.html
@@ -6,6 +6,6 @@
 
 <div class="pure-g tc">
     {% with 'navigation/large_button_link.html' as link_template %}
-        {% include 'generic_navigation.html' %}
+        {% include 'navigation/generic_navigation.html' %}
     {% endwith %}
 </div>
diff --git a/mayan/apps/main/templates/main/generic_list_subtemplate.html b/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html
similarity index 100%
rename from mayan/apps/main/templates/main/generic_list_subtemplate.html
rename to mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html
diff --git a/mayan/apps/main/templates/main/generic_multi_subtemplates.html b/mayan/apps/appearance/templates/appearance/generic_multi_subtemplates.html
similarity index 93%
rename from mayan/apps/main/templates/main/generic_multi_subtemplates.html
rename to mayan/apps/appearance/templates/appearance/generic_multi_subtemplates.html
index f2299d7f35..7d94d2763b 100644
--- a/mayan/apps/main/templates/main/generic_multi_subtemplates.html
+++ b/mayan/apps/appearance/templates/appearance/generic_multi_subtemplates.html
@@ -1,8 +1,8 @@
-{% extends 'main/base.html' %}
+{% extends 'appearance/base.html' %}
 
 {% load subtemplates_tags %}
 
-{% block title %} :: {% include 'main/calculate_form_title.html' %}{% endblock %}
+{% block title %} :: {% include 'appearance/calculate_form_title.html' %}{% endblock %}
 
 {% block sidebar %}
     {% for subtemplate in sidebar_subtemplates_list %}
diff --git a/mayan/apps/main/templates/main/generic_multiform_subtemplate.html b/mayan/apps/appearance/templates/appearance/generic_multiform_subtemplate.html
similarity index 93%
rename from mayan/apps/main/templates/main/generic_multiform_subtemplate.html
rename to mayan/apps/appearance/templates/appearance/generic_multiform_subtemplate.html
index cf547b711d..01d70a6b0d 100644
--- a/mayan/apps/main/templates/main/generic_multiform_subtemplate.html
+++ b/mayan/apps/appearance/templates/appearance/generic_multiform_subtemplate.html
@@ -3,7 +3,7 @@
 
 <div class="content">
     <h2 class="title">
-        {% include 'main/calculate_form_title.html' %}
+        {% include 'appearance/calculate_form_title.html' %}
     </h2>
     <div class="inner">
         {% if is_multipart %}
@@ -46,7 +46,7 @@
                     {% endif %}
 
                     {% for form in formset.forms %}
-                        {% include 'main/generic_form_instance.html' %}
+                        {% include 'appearance/generic_form_instance.html' %}
                     {% endfor %}
                     {% if form_display_mode_table %}
                         </tbody>
@@ -54,7 +54,7 @@
                     {% endif %}
                 {% endwith %}
             {% else %}
-                {% include 'main/generic_form_instance.html' %}
+                {% include 'appearance/generic_form_instance.html' %}
             {% endif %}
         {% endfor %}
         {% if not read_only %}
diff --git a/mayan/apps/main/templates/main/generic_subtemplate.html b/mayan/apps/appearance/templates/appearance/generic_subtemplate.html
similarity index 100%
rename from mayan/apps/main/templates/main/generic_subtemplate.html
rename to mayan/apps/appearance/templates/appearance/generic_subtemplate.html
diff --git a/mayan/apps/appearance/templates/appearance/generic_template.html b/mayan/apps/appearance/templates/appearance/generic_template.html
new file mode 100644
index 0000000000..08a3f85d1f
--- /dev/null
+++ b/mayan/apps/appearance/templates/appearance/generic_template.html
@@ -0,0 +1,7 @@
+{% extends 'appearance/base.html' %}
+
+{% block title %} :: {{ title }}{% endblock %}
+
+{% block content %}
+    {% include 'appearance/generic_subtemplate.html' %}
+{% endblock %}
diff --git a/mayan/apps/main/templates/main/generic_wizard.html b/mayan/apps/appearance/templates/appearance/generic_wizard.html
similarity index 74%
rename from mayan/apps/main/templates/main/generic_wizard.html
rename to mayan/apps/appearance/templates/appearance/generic_wizard.html
index a535e50ff0..03cf5af830 100644
--- a/mayan/apps/main/templates/main/generic_wizard.html
+++ b/mayan/apps/appearance/templates/appearance/generic_wizard.html
@@ -1,4 +1,4 @@
-{% extends 'main/base.html' %}
+{% extends 'appearance/base.html' %}
 
 {% load i18n %}
 
@@ -16,12 +16,12 @@
 
             {% with wizard.form as form %}
             {% with 'true' as form_display_mode_table %}
-                {% include 'main/generic_form_subtemplate.html' %}
+                {% include 'appearance/generic_form_subtemplate.html' %}
             {% endwith %}
             {% endwith %}
         {% else %}
             {% with wizard.form as form %}
-                {% include 'main/generic_form_subtemplate.html' %}
+                {% include 'appearance/generic_form_subtemplate.html' %}
             {% endwith %}
         {% endif %}
     {% endwith %}
diff --git a/mayan/apps/main/templates/main/home.html b/mayan/apps/appearance/templates/appearance/home.html
similarity index 83%
rename from mayan/apps/main/templates/main/home.html
rename to mayan/apps/appearance/templates/appearance/home.html
index c971590008..7e277dd1a3 100644
--- a/mayan/apps/main/templates/main/home.html
+++ b/mayan/apps/appearance/templates/appearance/home.html
@@ -1,4 +1,4 @@
-{% extends 'main/base.html' %}
+{% extends 'appearance/base.html' %}
 
 {% load i18n %}
 {% load static %}
@@ -12,7 +12,7 @@
     <div class="pure-g tc">
         {% with 'navigation/large_button_link.html' as link_template %}
         {% with 8 as button_link_columns %}
-            {% include 'generic_navigation.html' %}
+            {% include 'navigation/generic_navigation.html' %}
         {% endwith %}
         {% endwith %}
 
@@ -28,6 +28,6 @@
         </div>
     </div>
     {% if query_string %}
-        {% include 'main/generic_list_subtemplate.html' %}
+        {% include 'appearance/generic_list_subtemplate.html' %}
     {% endif %}
 {% endblock %}
diff --git a/mayan/apps/main/templates/main/login.html b/mayan/apps/appearance/templates/appearance/login.html
similarity index 94%
rename from mayan/apps/main/templates/main/login.html
rename to mayan/apps/appearance/templates/appearance/login.html
index 9324aae531..37e3e1c0a5 100644
--- a/mayan/apps/main/templates/main/login.html
+++ b/mayan/apps/appearance/templates/appearance/login.html
@@ -1,4 +1,4 @@
-{% extends 'main/base.html' %}
+{% extends 'appearance/base.html' %}
 
 {% load i18n %}
 {% load static %}
@@ -56,7 +56,7 @@
                     <div class="content login">
                         <form action="." method="post" class="form login">{% csrf_token %}
                             <div class="group wat-cf">
-                                {% include 'main/generic_form_instance.html' %}
+                                {% include 'appearance/generic_form_instance.html' %}
                                 <input type="hidden" name="next" value="{{ next|escape }}" />
                                 <div class="group navform wat-cf">
                                 <button class="button" type="submit">
diff --git a/mayan/apps/main/templates/main/password_change_done.html b/mayan/apps/appearance/templates/appearance/password_change_done.html
similarity index 83%
rename from mayan/apps/main/templates/main/password_change_done.html
rename to mayan/apps/appearance/templates/appearance/password_change_done.html
index 38f6eb92af..b6fac87e47 100644
--- a/mayan/apps/main/templates/main/password_change_done.html
+++ b/mayan/apps/appearance/templates/appearance/password_change_done.html
@@ -1,4 +1,4 @@
-{% extends 'main/base.html' %}
+{% extends 'appearance/base.html' %}
 
 {% load i18n %}
 
diff --git a/mayan/apps/main/templates/main/password_change_form.html b/mayan/apps/appearance/templates/appearance/password_change_form.html
similarity index 76%
rename from mayan/apps/main/templates/main/password_change_form.html
rename to mayan/apps/appearance/templates/appearance/password_change_form.html
index 8e7cd11cd0..8a9031f7f8 100644
--- a/mayan/apps/main/templates/main/password_change_form.html
+++ b/mayan/apps/appearance/templates/appearance/password_change_form.html
@@ -1,4 +1,4 @@
-{% extends 'main/generic_form.html' %}
+{% extends 'appearance/generic_form.html' %}
 
 {% load i18n %}
 
diff --git a/mayan/apps/main/templates/main/statistics.html b/mayan/apps/appearance/templates/appearance/statistics.html
similarity index 72%
rename from mayan/apps/main/templates/main/statistics.html
rename to mayan/apps/appearance/templates/appearance/statistics.html
index ce3633075a..67bdc7d79e 100644
--- a/mayan/apps/main/templates/main/statistics.html
+++ b/mayan/apps/appearance/templates/appearance/statistics.html
@@ -1,4 +1,4 @@
-{% extends 'main/base.html' %}
+{% extends 'appearance/base.html' %}
 
 {% block title %} :: {{ title }}{% endblock %}
 
@@ -6,7 +6,7 @@
     {% for block in blocks %}
         {% with block.title as title %}
         {% with block.paragraphs as paragraphs %}
-            {% include 'main/generic_subtemplate.html' %}
+            {% include 'appearance/generic_subtemplate.html' %}
         {% endwith %}
         {% endwith %}
     {% endfor %}
diff --git a/mayan/apps/main/templates/main/tools.html b/mayan/apps/appearance/templates/appearance/tools.html
similarity index 73%
rename from mayan/apps/main/templates/main/tools.html
rename to mayan/apps/appearance/templates/appearance/tools.html
index 26f0c2d4a9..1283a24196 100644
--- a/mayan/apps/main/templates/main/tools.html
+++ b/mayan/apps/appearance/templates/appearance/tools.html
@@ -1,4 +1,4 @@
-{% extends 'main/base.html' %}
+{% extends 'appearance/base.html' %}
 
 {% block title %} :: {{ title }}{% endblock %}
 
@@ -11,7 +11,7 @@
             <ul class="undecorated_list">
                 {% for link in value.links %}
                     <li>
-                        {% include 'generic_subnavigation.html' %}{% if link.description %} - {{ link.description }}{% endif %}
+                        {% include 'navigation/generic_subnavigation.html' %}{% if link.description %} - {{ link.description }}{% endif %}
                     </li>
                 {% endfor %}
             </ul>
diff --git a/mayan/apps/navigation/templates/generic_link_instance.html b/mayan/apps/appearance/templates/navigation/generic_link_instance.html
similarity index 100%
rename from mayan/apps/navigation/templates/generic_link_instance.html
rename to mayan/apps/appearance/templates/navigation/generic_link_instance.html
diff --git a/mayan/apps/appearance/templates/navigation/generic_navigation.html b/mayan/apps/appearance/templates/navigation/generic_navigation.html
new file mode 100644
index 0000000000..5f5ff5fc34
--- /dev/null
+++ b/mayan/apps/appearance/templates/navigation/generic_navigation.html
@@ -0,0 +1,3 @@
+{% for link in object_navigation_links %}
+    {% include 'navigation/generic_subnavigation.html' %}
+{% endfor %}
diff --git a/mayan/apps/navigation/templates/generic_subnavigation.html b/mayan/apps/appearance/templates/navigation/generic_subnavigation.html
similarity index 86%
rename from mayan/apps/navigation/templates/generic_subnavigation.html
rename to mayan/apps/appearance/templates/navigation/generic_subnavigation.html
index 7956fbad62..2d12c42403 100644
--- a/mayan/apps/navigation/templates/generic_subnavigation.html
+++ b/mayan/apps/appearance/templates/navigation/generic_subnavigation.html
@@ -11,7 +11,7 @@
             <li class="{% if forloop.first and li_class_first %}{{ li_class_first }} {% endif %}{% if link.active and li_class_active %}{{ li_class_active }}{% endif %}">
         {% endif %}
 
-            {% include link_template|default:'generic_link_instance.html' %}
+            {% include link_template|default:'navigation/generic_link_instance.html' %}
 
         {% if as_li %}
             </li>
diff --git a/mayan/apps/main/templates/navigation/large_button_link.html b/mayan/apps/appearance/templates/navigation/large_button_link.html
similarity index 100%
rename from mayan/apps/main/templates/navigation/large_button_link.html
rename to mayan/apps/appearance/templates/navigation/large_button_link.html
diff --git a/mayan/apps/main/templates/pagination/pagination.html b/mayan/apps/appearance/templates/pagination/pagination.html
similarity index 100%
rename from mayan/apps/main/templates/pagination/pagination.html
rename to mayan/apps/appearance/templates/pagination/pagination.html
diff --git a/mayan/apps/checkouts/views.py b/mayan/apps/checkouts/views.py
index 1106f39ff3..b6774288c4 100644
--- a/mayan/apps/checkouts/views.py
+++ b/mayan/apps/checkouts/views.py
@@ -56,7 +56,7 @@ def checkout_info(request, document_pk):
         paragraphs.append(_('Check out expiration: %s') % checkout_info.expiration_datetime)
         paragraphs.append(_('New versions allowed: %s') % (_('Yes') if not checkout_info.block_new_version else _('No')))
 
-    return render_to_response('main/generic_template.html', {
+    return render_to_response('appearance/generic_template.html', {
         'paragraphs': paragraphs,
         'object': document,
         'title': _('Check out details for document: %s') % document
@@ -89,7 +89,7 @@ def checkout_document(request, document_pk):
     else:
         form = DocumentCheckoutForm(initial={'document': document})
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'form': form,
         'object': document,
         'title': _('Check out document: %s') % document
@@ -144,5 +144,5 @@ def checkin_document(request, document_pk):
     else:
         context['title'] = _('Are you sure you wish to check in document: %s?') % document
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
diff --git a/mayan/apps/common/templates/generic_help.html b/mayan/apps/common/templates/generic_help.html
deleted file mode 100644
index 99c250a2c4..0000000000
--- a/mayan/apps/common/templates/generic_help.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{% load i18n %}
-
-<div class="block notice">
-<h4>{% block help_title %}{% endblock %}</h4>
-<div>{% block help_text %}{% endblock %}</div>
-</div>
diff --git a/mayan/apps/common/urls.py b/mayan/apps/common/urls.py
index 4790c87841..b835e07682 100644
--- a/mayan/apps/common/urls.py
+++ b/mayan/apps/common/urls.py
@@ -1,11 +1,11 @@
 from __future__ import unicode_literals
 
 from django.conf.urls import patterns, url
-from django.views.generic import TemplateView
+from .views import AboutView
 
 
 urlpatterns = patterns('common.views',
-    url(r'^about/$', TemplateView.as_view(template_name='main/about.html'), name='about_view'),
+    url(r'^about/$', AboutView.as_view(), name='about_view'),
     url(r'^license/$', 'license_view', (), name='license_view'),
     url(r'^password/change/done/$', 'password_change_done', (), name='password_change_done'),
     url(r'^object/multiple/action/$', 'multi_object_action_view', (), name='multi_object_action_view'),
@@ -23,10 +23,10 @@ urlpatterns = patterns('common.views',
 urlpatterns += patterns('',
     url(r'^logout/$', 'django.contrib.auth.views.logout', {'next_page': 'main:home'}, name='logout_view'),
 
-    url(r'^password/reset/$', 'django.contrib.auth.views.password_reset', {'email_template_name': 'main/password_reset_email.html', 'template_name': 'main/password_reset_form.html', 'post_reset_redirect': '/password/reset/done'}, name='password_reset_view'),
-    url(r'^password/reset/confirm/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$', 'django.contrib.auth.views.password_reset_confirm', {'template_name': 'main/password_reset_confirm.html', 'post_reset_redirect': '/password/reset/complete/'}, name='password_reset_confirm_view'),
-    url(r'^password/reset/complete/$', 'django.contrib.auth.views.password_reset_complete', {'template_name': 'main/password_reset_complete.html'}, name='password_reset_complete_view'),
-    url(r'^password/reset/done/$', 'django.contrib.auth.views.password_reset_done', {'template_name': 'main/password_reset_done.html'}, name='password_reset_done_view'),
+    url(r'^password/reset/$', 'django.contrib.auth.views.password_reset', {'email_template_name': 'appearance/password_reset_email.html', 'template_name': 'appearance/password_reset_form.html', 'post_reset_redirect': '/password/reset/done'}, name='password_reset_view'),
+    url(r'^password/reset/confirm/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$', 'django.contrib.auth.views.password_reset_confirm', {'template_name': 'appearance/password_reset_confirm.html', 'post_reset_redirect': '/password/reset/complete/'}, name='password_reset_confirm_view'),
+    url(r'^password/reset/complete/$', 'django.contrib.auth.views.password_reset_complete', {'template_name': 'appearance/password_reset_complete.html'}, name='password_reset_complete_view'),
+    url(r'^password/reset/done/$', 'django.contrib.auth.views.password_reset_done', {'template_name': 'appearance/password_reset_done.html'}, name='password_reset_done_view'),
 )
 
 urlpatterns += patterns('',
diff --git a/mayan/apps/common/views.py b/mayan/apps/common/views.py
index 9c16ed543a..011bdaee79 100644
--- a/mayan/apps/common/views.py
+++ b/mayan/apps/common/views.py
@@ -13,7 +13,7 @@ from django.shortcuts import redirect, render_to_response
 from django.template import RequestContext
 from django.utils.http import urlencode
 from django.utils.translation import ugettext_lazy as _
-from django.views.generic import FormView
+from django.views.generic import FormView, TemplateView
 from django.views.generic.edit import CreateView, DeleteView, UpdateView
 from django.views.generic.list import ListView
 
@@ -28,6 +28,10 @@ from .mixins import (
 from .settings import LOGIN_METHOD
 
 
+class AboutView(TemplateView):
+    template_name = 'appearance/about.html'
+
+
 def multi_object_action_view(request):
     """
     Proxy view called first when using a multi object action, which
@@ -130,7 +134,7 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef
     context = {
         'subtemplates_list': [
             {
-                'name': 'main/generic_form_subtemplate.html',
+                'name': 'appearance/generic_form_subtemplate.html',
                 'grid': 12,
                 'context': {
                     'form': unselected_list,
@@ -140,7 +144,7 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef
                 }
             },
             {
-                'name': 'main/generic_form_subtemplate.html',
+                'name': 'appearance/generic_form_subtemplate.html',
                 'grid': 12,
                 'grid_clear': True,
                 'context': {
@@ -156,7 +160,7 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef
     if extra_context:
         context.update(extra_context)
 
-    return render_to_response('main/generic_form.html', context,
+    return render_to_response('appearance/generic_form.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -167,7 +171,7 @@ def current_user_details(request):
     form = UserForm_view(instance=request.user)
 
     return render_to_response(
-        'main/generic_form.html', {
+        'appearance/generic_form.html', {
             'form': form,
             'title': _('Current user details'),
             'read_only': True,
@@ -182,7 +186,7 @@ def current_user_locale_profile_details(request):
     form = LocaleProfileForm_view(instance=request.user.locale_profile)
 
     return render_to_response(
-        'main/generic_form.html', {
+        'appearance/generic_form.html', {
             'form': form,
             'title': _('Current user locale profile details'),
             'read_only': True,
@@ -210,7 +214,7 @@ def current_user_edit(request):
         form = UserForm(instance=request.user)
 
     return render_to_response(
-        'main/generic_form.html', {
+        'appearance/generic_form.html', {
             'form': form,
             'next': next,
             'title': _('Edit current user details'),
@@ -242,7 +246,7 @@ def current_user_locale_profile_edit(request):
         form = LocaleProfileForm(instance=request.user.locale_profile)
 
     return render_to_response(
-        'main/generic_form.html', {
+        'appearance/generic_form.html', {
             'form': form,
             'next': next,
             'title': _('Edit current user locale profile details'),
@@ -255,7 +259,7 @@ def login_view(request):
     Control how the use is to be authenticated, options are 'email' and
     'username'
     """
-    kwargs = {'template_name': 'main/login.html'}
+    kwargs = {'template_name': 'appearance/login.html'}
 
     if LOGIN_METHOD == 'email':
         kwargs['authentication_form'] = EmailAuthenticationForm
@@ -274,7 +278,7 @@ def license_view(request):
     """
     form = LicenseForm()
     return render_to_response(
-        'main/generic_detail.html', {
+        'appearance/generic_detail.html', {
             'form': form,
             'title': _('License'),
         },
@@ -290,7 +294,7 @@ def password_change_view(request):
     return password_change(
         request,
         extra_context=context,
-        template_name='main/password_change_form.html',
+        template_name='appearance/password_change_form.html',
         post_change_redirect=reverse('common:password_change_done'),
     )
 
@@ -305,7 +309,7 @@ def password_change_done(request):
 
 
 class SingleObjectEditView(ViewPermissionCheckMixin, ObjectPermissionCheckMixin, ExtraContextMixin, RedirectionMixin, UpdateView):
-    template_name = 'main/generic_form.html'
+    template_name = 'appearance/generic_form.html'
 
     def form_invalid(self, form):
         result = super(SingleObjectEditView, self).form_invalid(form)
@@ -329,7 +333,7 @@ class SingleObjectEditView(ViewPermissionCheckMixin, ObjectPermissionCheckMixin,
 
 
 class SingleObjectCreateView(ViewPermissionCheckMixin, ExtraContextMixin, RedirectionMixin, CreateView):
-    template_name = 'main/generic_form.html'
+    template_name = 'appearance/generic_form.html'
 
     def form_invalid(self, form):
         result = super(SingleObjectCreateView, self).form_invalid(form)
@@ -352,7 +356,7 @@ class SingleObjectCreateView(ViewPermissionCheckMixin, ExtraContextMixin, Redire
 
 
 class SingleObjectDeleteView(ViewPermissionCheckMixin, ObjectPermissionCheckMixin, ExtraContextMixin, RedirectionMixin, DeleteView):
-    template_name = 'main/generic_confirm.html'
+    template_name = 'appearance/generic_confirm.html'
 
     def get_context_data(self, **kwargs):
         context = super(SingleObjectDeleteView, self).get_context_data(**kwargs)
@@ -379,7 +383,7 @@ class SingleObjectDeleteView(ViewPermissionCheckMixin, ObjectPermissionCheckMixi
 
 
 class SingleObjectListView(ViewPermissionCheckMixin, ObjectListPermissionFilterMixin, ExtraContextMixin, RedirectionMixin, ListView):
-    template_name = 'main/generic_list.html'
+    template_name = 'appearance/generic_list.html'
 
 
 class MultiFormView(FormView):
diff --git a/mayan/apps/django_gpg/links.py b/mayan/apps/django_gpg/links.py
index a83846a334..12ab5edbed 100644
--- a/mayan/apps/django_gpg/links.py
+++ b/mayan/apps/django_gpg/links.py
@@ -7,9 +7,9 @@ from .permissions import (
     PERMISSION_KEYSERVER_QUERY
 )
 
-private_keys = {'text': _('Private keys'), 'view': 'django_gpg:key_private_list', 'args': 'object.pk', 'famfam': 'key', 'icon': 'main/icons/key.png', 'permissions': [PERMISSION_KEY_VIEW]}
-public_keys = {'text': _('Public keys'), 'view': 'django_gpg:key_public_list', 'args': 'object.pk', 'famfam': 'key', 'icon': 'main/icons/key.png', 'permissions': [PERMISSION_KEY_VIEW]}
+private_keys = {'text': _('Private keys'), 'view': 'django_gpg:key_private_list', 'args': 'object.pk', 'famfam': 'key', 'icon': 'appearance/icons/key.png', 'permissions': [PERMISSION_KEY_VIEW]}
+public_keys = {'text': _('Public keys'), 'view': 'django_gpg:key_public_list', 'args': 'object.pk', 'famfam': 'key', 'icon': 'appearance/icons/key.png', 'permissions': [PERMISSION_KEY_VIEW]}
 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', 'famfam': 'key', 'icon': 'main/icons/key.png', 'permissions': [PERMISSION_KEY_VIEW]}
+key_setup = {'text': _('Key management'), 'view': 'django_gpg:key_public_list', 'args': 'object.pk', 'famfam': 'key', 'icon': 'appearance/icons/key.png', 'permissions': [PERMISSION_KEY_VIEW]}
diff --git a/mayan/apps/django_gpg/views.py b/mayan/apps/django_gpg/views.py
index 43f2931b65..9e4263d3f6 100644
--- a/mayan/apps/django_gpg/views.py
+++ b/mayan/apps/django_gpg/views.py
@@ -50,7 +50,7 @@ def key_receive(request, key_id):
             )
             return HttpResponseRedirect(previous)
 
-    return render_to_response('main/generic_confirm.html', {
+    return render_to_response('appearance/generic_confirm.html', {
         'title': _('Import key'),
         'message': _('Are you sure you wish to import key id: %s?') % key_id,
         'next': next,
@@ -70,7 +70,7 @@ def key_list(request, secret=True):
         object_list = Key.get_all(gpg)
         title = _('Public keys')
 
-    return render_to_response('main/generic_list.html', {
+    return render_to_response('appearance/generic_list.html', {
         'object_list': object_list,
         'title': title,
         'hide_object': True,
@@ -106,7 +106,7 @@ def key_delete(request, fingerprint, key_type):
             messages.error(request, exception)
             return HttpResponseRedirect(previous)
 
-    return render_to_response('main/generic_confirm.html', {
+    return render_to_response('appearance/generic_confirm.html', {
         'title': _('Delete key'),
         'delete_view': True,
         'message': _('Are you sure you wish to delete key: %s?  If you try to delete a public key that is part of a public/private pair the private key will be deleted as well.') % key,
@@ -124,7 +124,7 @@ def key_query(request):
     form = KeySearchForm(initial={'term': term})
     subtemplates_list.append(
         {
-            'name': 'main/generic_form_subtemplate.html',
+            'name': 'appearance/generic_form_subtemplate.html',
             'context': {
                 'title': _('Query key server'),
                 'form': form,
@@ -137,7 +137,7 @@ def key_query(request):
         results = gpg.query(term)
         subtemplates_list.append(
             {
-                'name': 'main/generic_list_subtemplate.html',
+                'name': 'appearance/generic_list_subtemplate.html',
                 'context': {
                     'title': _('results'),
                     'object_list': results,
@@ -185,6 +185,6 @@ def key_query(request):
             }
         )
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'subtemplates_list': subtemplates_list,
     }, context_instance=RequestContext(request))
diff --git a/mayan/apps/document_comments/views.py b/mayan/apps/document_comments/views.py
index ab12bebb40..0c3f0aed90 100644
--- a/mayan/apps/document_comments/views.py
+++ b/mayan/apps/document_comments/views.py
@@ -65,7 +65,7 @@ def comment_delete(request, comment_id=None, comment_id_list=None):
     elif len(comments) > 1:
         context['title'] = _('Are you sure you wish to delete the comments: %s?') % ', '.join([unicode(d) for d in comments])
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -102,7 +102,7 @@ def comment_add(request, document_id):
     else:
         form = CommentForm()
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'form': form,
         'title': _('Add comment to document: %s') % document,
         'next': next,
@@ -121,7 +121,7 @@ def comments_for_document(request, document_id):
     except PermissionDenied:
         AccessEntry.objects.check_access(PERMISSION_COMMENT_VIEW, request.user, document)
 
-    return render_to_response('main/generic_list.html', {
+    return render_to_response('appearance/generic_list.html', {
         'object': document,
         'access_object': document,
         'title': _('Comments for document: %s') % document,
diff --git a/mayan/apps/document_indexing/links.py b/mayan/apps/document_indexing/links.py
index dcc4183e6c..e2a00b5437 100644
--- a/mayan/apps/document_indexing/links.py
+++ b/mayan/apps/document_indexing/links.py
@@ -20,7 +20,7 @@ def is_not_root_node(context):
     return not context['node'].is_root_node()
 
 
-index_setup = {'text': _('Indexes'), 'view': 'indexing:index_setup_list', 'icon': 'main/icons/tab.png', 'permissions': [PERMISSION_DOCUMENT_INDEXING_SETUP]}
+index_setup = {'text': _('Indexes'), 'view': 'indexing:index_setup_list', 'icon': 'appearance/icons/tab.png', 'permissions': [PERMISSION_DOCUMENT_INDEXING_SETUP]}
 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_indexing/views.py b/mayan/apps/document_indexing/views.py
index 671c8973d2..be306918a9 100644
--- a/mayan/apps/document_indexing/views.py
+++ b/mayan/apps/document_indexing/views.py
@@ -54,7 +54,7 @@ def index_setup_list(request):
 
     context['object_list'] = queryset
 
-    return render_to_response('main/generic_list.html', context,
+    return render_to_response('appearance/generic_list.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -71,7 +71,7 @@ def index_setup_create(request):
     else:
         form = IndexForm()
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'title': _('Create index'),
         'form': form,
     }, context_instance=RequestContext(request))
@@ -94,7 +94,7 @@ def index_setup_edit(request, index_pk):
     else:
         form = IndexForm(instance=index)
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'title': _('Edit index: %s') % index,
         'form': form,
         'index': index,
@@ -134,7 +134,7 @@ def index_setup_delete(request, index_pk):
         'title': _('Are you sure you with to delete the index: %s?') % index,
     }
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -162,7 +162,7 @@ def index_setup_view(request, index_pk):
         ],
     }
 
-    return render_to_response('main/generic_list.html', context,
+    return render_to_response('appearance/generic_list.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -208,7 +208,7 @@ def template_node_create(request, parent_pk):
     else:
         form = IndexTemplateNodeForm(initial={'index': parent_node.index, 'parent': parent_node})
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'title': _('Create child node'),
         'form': form,
         'index': parent_node.index,
@@ -233,7 +233,7 @@ def template_node_edit(request, node_pk):
     else:
         form = IndexTemplateNodeForm(instance=node)
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'title': _('Edit index template node: %s') % node,
         'form': form,
         'index': node.index,
@@ -283,7 +283,7 @@ def template_node_delete(request, node_pk):
         ],
     }
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -310,7 +310,7 @@ def index_list(request):
 
     context['object_list'] = queryset
 
-    return render_to_response('main/generic_list.html', context,
+    return render_to_response('appearance/generic_list.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -342,7 +342,7 @@ def index_instance_node_view(request, index_instance_node_pk):
                 }
             )
 
-    return render_to_response('main/generic_list.html', {
+    return render_to_response('appearance/generic_list.html', {
         'object_list': index_instance_list,
         'extra_columns': [
             {
@@ -372,7 +372,7 @@ def rebuild_index_instances(request):
     next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', None)))
 
     if request.method != 'POST':
-        return render_to_response('main/generic_confirm.html', {
+        return render_to_response('appearance/generic_confirm.html', {
             'previous': previous,
             'next': next,
             'title': _('Are you sure you wish to rebuild all indexes?'),
@@ -401,7 +401,7 @@ def document_index_list(request, document_id):
     for index_instance in queryset:
         object_list.append(get_breadcrumbs(index_instance, single_link=True, include_count=True))
 
-    return render_to_response('main/generic_list.html', {
+    return render_to_response('appearance/generic_list.html', {
         'object_list': object_list,
         'object': document,
         'hide_link': True,
diff --git a/mayan/apps/document_signatures/views.py b/mayan/apps/document_signatures/views.py
index ac5c20a139..b9e7594dec 100644
--- a/mayan/apps/document_signatures/views.py
+++ b/mayan/apps/document_signatures/views.py
@@ -67,7 +67,7 @@ def document_verify(request, document_pk):
             ]
         )
 
-    return render_to_response('main/generic_template.html', {
+    return render_to_response('appearance/generic_template.html', {
         'document': document,
         'object': document,
         'paragraphs': paragraphs,
@@ -102,7 +102,7 @@ def document_signature_upload(request, document_pk):
     else:
         form = DetachedSignatureForm()
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'form': form,
         'next': next,
         'object': document,
@@ -158,7 +158,7 @@ def document_signature_delete(request, document_pk):
             messages.error(request, _('Error while deleting the detached signature; %s') % exception)
             return HttpResponseRedirect(previous)
 
-    return render_to_response('main/generic_confirm.html', {
+    return render_to_response('appearance/generic_confirm.html', {
         'title': _('Are you sure you wish to delete the detached signature from document: %s?') % document,
         'next': next,
         'previous': previous,
diff --git a/mayan/apps/document_states/links.py b/mayan/apps/document_states/links.py
index 97d9758c88..2823c7e526 100644
--- a/mayan/apps/document_states/links.py
+++ b/mayan/apps/document_states/links.py
@@ -2,7 +2,7 @@ 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', 'famfam': 'table', 'icon': 'main/icons/table.png'}
+link_setup_workflow_list = {'text': _('Workflows'), 'view': 'document_states:setup_workflow_list', 'famfam': 'table', 'icon': 'appearance/icons/table.png'}
 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/document_states/views.py b/mayan/apps/document_states/views.py
index 2fbcac1b84..7aa695b7c9 100644
--- a/mayan/apps/document_states/views.py
+++ b/mayan/apps/document_states/views.py
@@ -61,7 +61,7 @@ class DocumentWorkflowInstanceListView(SingleObjectListView):
 
 
 class WorkflowInstanceDetailView(SingleObjectListView):
-    template_name = 'main/generic_multi_subtemplates.html'
+    template_name = 'appearance/generic_multi_subtemplates.html'
 
     def dispatch(self, request, *args, **kwargs):
         try:
@@ -97,13 +97,13 @@ class WorkflowInstanceDetailView(SingleObjectListView):
             },
             'subtemplates_list': [
                 {
-                    'name': 'main/generic_detail_subtemplate.html',
+                    'name': 'appearance/generic_detail_subtemplate.html',
                     'context': {
                         'form': form,
                     }
                 },
                 {
-                    'name': 'main/generic_list_subtemplate.html',
+                    'name': 'appearance/generic_list_subtemplate.html',
                     'context': {
                         'object_list': self.get_queryset(),
                         'title': _('Log entries'),
@@ -118,7 +118,7 @@ class WorkflowInstanceDetailView(SingleObjectListView):
 
 class WorkflowInstanceTransitionView(FormView):
     form_class = WorkflowInstanceTransitionForm
-    template_name = 'main/generic_form.html'
+    template_name = 'appearance/generic_form.html'
 
     def dispatch(self, request, *args, **kwargs):
         try:
diff --git a/mayan/apps/documents/links.py b/mayan/apps/documents/links.py
index ecddb93d1d..7f2d87347e 100644
--- a/mayan/apps/documents/links.py
+++ b/mayan/apps/documents/links.py
@@ -37,8 +37,8 @@ def is_current_version(context):
     return context['object'].document.latest_version.timestamp == context['object'].timestamp
 
 
-document_list = {'text': _('All documents'), 'view': 'documents:document_list', 'famfam': 'page', 'icon': 'main/icons/page.png'}
-document_list_recent = {'text': _('Recent documents'), 'view': 'documents:document_list_recent', 'famfam': 'page', 'icon': 'main/icons/page.png'}
+document_list = {'text': _('All documents'), 'view': 'documents:document_list', 'famfam': 'page', 'icon': 'appearance/icons/page.png'}
+document_list_recent = {'text': _('Recent documents'), 'view': 'documents:document_list_recent', 'famfam': 'page', 'icon': 'appearance/icons/page.png'}
 document_preview = {'text': _('Preview'), 'view': 'documents:document_preview', 'args': 'object.id', 'famfam': 'page', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
 document_content = {'text': _('Content'), 'view': 'documents:document_content', 'args': 'object.id', 'famfam': 'page_white_text', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
 document_properties = {'text': _('Properties'), 'view': 'documents:document_properties', 'args': 'object.id', 'famfam': 'page_gear', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
@@ -85,7 +85,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', 'famfam': 'layout', 'icon': 'main/icons/layout.png', 'permissions': [PERMISSION_DOCUMENT_TYPE_VIEW]}
+document_type_setup = {'text': _('Document types'), 'view': 'documents:document_type_list', 'famfam': 'layout', 'icon': 'appearance/icons/layout.png', 'permissions': [PERMISSION_DOCUMENT_TYPE_VIEW]}
 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/documents/templates/document_print.html b/mayan/apps/documents/templates/documents/document_print.html
similarity index 100%
rename from mayan/apps/documents/templates/document_print.html
rename to mayan/apps/documents/templates/documents/document_print.html
diff --git a/mayan/apps/documents/views.py b/mayan/apps/documents/views.py
index 2c097d0be7..81876a5cac 100644
--- a/mayan/apps/documents/views.py
+++ b/mayan/apps/documents/views.py
@@ -92,7 +92,7 @@ def document_list(request, object_list=None, title=None, extra_context=None):
     if extra_context:
         context.update(extra_context)
 
-    return render_to_response('main/generic_list.html', context,
+    return render_to_response('appearance/generic_list.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -124,7 +124,7 @@ def document_properties(request, document_id):
 
     document_properties_form = DocumentPropertiesForm(instance=document, extra_fields=document_fields)
 
-    return render_to_response('main/generic_detail.html', {
+    return render_to_response('appearance/generic_detail.html', {
         'form': document_properties_form,
         'document': document,
         'object': document,
@@ -144,7 +144,7 @@ def document_preview(request, document_id):
 
     preview_form = DocumentPreviewForm(document=document)
 
-    return render_to_response('main/generic_detail.html', {
+    return render_to_response('appearance/generic_detail.html', {
         'document': document,
         'form': preview_form,
         'hide_labels': True,
@@ -165,7 +165,7 @@ def document_content(request, document_id):
 
     content_form = DocumentContentForm(document=document)
 
-    return render_to_response('main/generic_detail.html', {
+    return render_to_response('appearance/generic_detail.html', {
         'document': document,
         'form': content_form,
         'hide_labels': True,
@@ -220,7 +220,7 @@ def document_delete(request, document_id=None, document_id_list=None):
     if len(documents) == 1:
         context['object'] = documents[0]
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -258,7 +258,7 @@ def document_edit(request, document_id):
     else:
         form = DocumentForm(instance=document)
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'form': form,
         'object': document,
         'title': _('Edit properties of document: %s') % document,
@@ -314,7 +314,7 @@ def document_document_type_edit(request, document_id=None, document_id_list=None
     if len(documents) == 1:
         context['object'] = documents[0]
 
-    return render_to_response('main/generic_form.html', context,
+    return render_to_response('appearance/generic_form.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -368,7 +368,7 @@ def document_download(request, document_id=None, document_id_list=None, document
     subtemplates_list = []
     subtemplates_list.append(
         {
-            'name': 'main/generic_list_subtemplate.html',
+            'name': 'appearance/generic_list_subtemplate.html',
             'context': {
                 'title': _('Documents to be downloaded'),
                 'object_list': document_versions,
@@ -447,7 +447,7 @@ def document_download(request, document_id=None, document_id_list=None, document
         context['object'] = document_versions[0].document
 
     return render_to_response(
-        'main/generic_form.html',
+        'appearance/generic_form.html',
         context,
         context_instance=RequestContext(request)
     )
@@ -501,7 +501,7 @@ def document_update_page_count(request, document_id=None, document_id_list=None)
     if len(documents) == 1:
         context['object'] = documents[0]
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -556,7 +556,7 @@ def document_clear_transformations(request, document_id=None, document_id_list=N
     if len(documents) == 1:
         context['object'] = documents[0]
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -588,7 +588,7 @@ def document_page_view(request, document_page_id):
     else:
         rotation_text = ''
 
-    return render_to_response('main/generic_detail.html', {
+    return render_to_response('appearance/generic_detail.html', {
         'page': document_page,
         'access_object': document_page.document,
         'navigation_object_name': 'page',
@@ -613,7 +613,7 @@ def document_page_text(request, document_page_id):
 
     document_page_form = DocumentPageForm_text(instance=document_page)
 
-    return render_to_response('main/generic_detail.html', {
+    return render_to_response('appearance/generic_detail.html', {
         'page': document_page,
         'navigation_object_name': 'page',
         'web_theme_hide_menus': True,
@@ -642,7 +642,7 @@ def document_page_edit(request, document_page_id):
     else:
         form = DocumentPageForm_edit(instance=document_page)
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'form': form,
         'page': document_page,
         'navigation_object_name': 'page',
@@ -822,7 +822,7 @@ def document_print(request, document_id):
     else:
         form = PrintForm()
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'form': form,
         'object': document,
         'title': _('Print: %s') % document,
@@ -851,7 +851,7 @@ def document_hard_copy(request, document_id):
     else:
         pages = document.pages.all()
 
-    return render_to_response('document_print.html', {
+    return render_to_response('documents/document_print.html', {
         'object': document,
         'page_range': page_range,
         'pages': pages,
@@ -872,7 +872,7 @@ def document_type_list(request):
         ]
     }
 
-    return render_to_response('main/generic_list.html', context,
+    return render_to_response('appearance/generic_list.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -894,7 +894,7 @@ def document_type_edit(request, document_type_id):
     else:
         form = DocumentTypeForm(instance=document_type)
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'title': _('Edit document type: %s') % document_type,
         'form': form,
         'navigation_object_name': 'document_type',
@@ -932,7 +932,7 @@ def document_type_delete(request, document_type_id):
         'message': _('All documents of this type will be deleted too.'),
     }
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -952,7 +952,7 @@ def document_type_create(request):
     else:
         form = DocumentTypeForm()
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'title': _('Create document type'),
         'form': form,
     }, context_instance=RequestContext(request))
@@ -977,7 +977,7 @@ def document_type_filename_list(request, document_type_id):
         ]
     }
 
-    return render_to_response('main/generic_list.html', context,
+    return render_to_response('appearance/generic_list.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -1001,7 +1001,7 @@ def document_type_filename_edit(request, document_type_filename_id):
     else:
         form = DocumentTypeFilenameForm(instance=document_type_filename)
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'title': _('Edit filename "%(filename)s" from document type "%(document_type)s"') % {
             'document_type': document_type_filename.document_type, 'filename': document_type_filename
         },
@@ -1050,7 +1050,7 @@ def document_type_filename_delete(request, document_type_filename_id):
         },
     }
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -1077,7 +1077,7 @@ def document_type_filename_create(request, document_type_id):
     else:
         form = DocumentTypeFilenameForm_create()
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'title': _('Create filename for document type: %s') % document_type,
         'form': form,
         'document_type': document_type,
@@ -1098,7 +1098,7 @@ def document_clear_image_cache(request):
 
         return HttpResponseRedirect(previous)
 
-    return render_to_response('main/generic_confirm.html', {
+    return render_to_response('appearance/generic_confirm.html', {
         'previous': previous,
         'title': _('Are you sure you wish to clear the document image cache?'),
     }, context_instance=RequestContext(request))
@@ -1140,7 +1140,7 @@ def document_version_list(request, document_pk):
         'title': _('Versions of document: %s') % document,
     }
 
-    return render_to_response('main/generic_list.html', context,
+    return render_to_response('appearance/generic_list.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -1163,7 +1163,7 @@ def document_version_revert(request, document_version_pk):
 
         return HttpResponseRedirect(previous)
 
-    return render_to_response('main/generic_confirm.html', {
+    return render_to_response('appearance/generic_confirm.html', {
         'previous': previous,
         'object': document_version.document,
         'title': _('Are you sure you wish to revert to this version?'),
@@ -1198,7 +1198,7 @@ def document_page_transformation_list(request, document_page_id):
         'hide_object': True,
     }
     return render_to_response(
-        'main/generic_list.html', context, context_instance=RequestContext(request)
+        'appearance/generic_list.html', context, context_instance=RequestContext(request)
     )
 
 
@@ -1220,7 +1220,7 @@ def document_page_transformation_create(request, document_page_id):
     else:
         form = DocumentPageTransformationForm(initial={'document_page': document_page})
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'form': form,
         'page': document_page,
         'navigation_object_name': 'page',
@@ -1248,7 +1248,7 @@ def document_page_transformation_edit(request, document_page_transformation_id):
     else:
         form = DocumentPageTransformationForm(instance=document_page_transformation)
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'form': form,
         'transformation': document_page_transformation,
         'page': document_page_transformation.document_page,
@@ -1279,7 +1279,7 @@ def document_page_transformation_delete(request, document_page_transformation_id
         messages.success(request, _('Document page transformation deleted successfully.'))
         return HttpResponseRedirect(redirect_view)
 
-    return render_to_response('main/generic_confirm.html', {
+    return render_to_response('appearance/generic_confirm.html', {
         'delete_view': True,
         'page': document_page_transformation.document_page,
         'transformation': document_page_transformation,
diff --git a/mayan/apps/documents/widgets.py b/mayan/apps/documents/widgets.py
index 6563cad974..f2bf8cd579 100644
--- a/mayan/apps/documents/widgets.py
+++ b/mayan/apps/documents/widgets.py
@@ -119,7 +119,7 @@ def document_html_widget(document, click_view=None, click_view_arguments=None, p
     if nolazyload:
         result.append('<img class="img-nolazyload" src="%s" alt="%s" />' % (preview_view, alt_text))
     else:
-        result.append('<img class="thin_border %s" data-src="%s" data-post-load-class="%s" src="%s" alt="%s" />' % (image_class, preview_view, post_load_class, static('main/icons/hourglass.png'), alt_text))
+        result.append('<img class="thin_border %s" data-src="%s" data-post-load-class="%s" src="%s" alt="%s" />' % (image_class, preview_view, post_load_class, static('appearance/icons/hourglass.png'), alt_text))
 
     if click_view:
         result.append('</a>')
diff --git a/mayan/apps/dynamic_search/templates/dynamic_search/search_results.html b/mayan/apps/dynamic_search/templates/dynamic_search/search_results.html
index 6345f16827..b2866e06e9 100644
--- a/mayan/apps/dynamic_search/templates/dynamic_search/search_results.html
+++ b/mayan/apps/dynamic_search/templates/dynamic_search/search_results.html
@@ -1,4 +1,4 @@
-{% extends 'main/base.html' %}
+{% extends 'appearance/base.html' %}
 {% load i18n %}
 {% block title %} :: {% trans 'Search results' %}{% endblock %}
 
@@ -7,10 +7,10 @@
             {% include 'dynamic_search/search_results_subtemplate.html' %}
     {% endif %}
     {% if query_string %}
-        {% include 'main/generic_list_subtemplate.html' %}
+        {% include 'appearance/generic_list_subtemplate.html' %}
     {% endif %}
     {% if not form and not query_string %}
-        {% include 'main/generic_list_subtemplate.html' %}
+        {% include 'appearance/generic_list_subtemplate.html' %}
     {% endif %}
 {% endblock %}
 
diff --git a/mayan/apps/dynamic_search/templates/dynamic_search/search_results_subtemplate.html b/mayan/apps/dynamic_search/templates/dynamic_search/search_results_subtemplate.html
index 3e9454dad2..daf4c2379c 100644
--- a/mayan/apps/dynamic_search/templates/dynamic_search/search_results_subtemplate.html
+++ b/mayan/apps/dynamic_search/templates/dynamic_search/search_results_subtemplate.html
@@ -1,5 +1,5 @@
 {% with 'get' as submit_method %}
 {% with form_title as title %}
-    {% include 'main/generic_form_subtemplate.html' %}
+    {% include 'appearance/generic_form_subtemplate.html' %}
 {% endwith %}
 {% endwith %}
diff --git a/mayan/apps/dynamic_search/templatetags/search_tags.py b/mayan/apps/dynamic_search/templatetags/search_tags.py
index 452514384e..57d4e29f34 100644
--- a/mayan/apps/dynamic_search/templatetags/search_tags.py
+++ b/mayan/apps/dynamic_search/templatetags/search_tags.py
@@ -11,7 +11,7 @@ from ..settings import RECENT_COUNT
 register = Library()
 
 
-@register.inclusion_tag('search_results_subtemplate.html', takes_context=True)
+@register.inclusion_tag('dynamic_search/search_results_subtemplate.html', takes_context=True)
 def search_form(context):
     context.update({
         'form': SearchForm(initial={'q': context.get('query_string', {}).get('q'), 'source': 'sidebar'}),
@@ -24,7 +24,7 @@ def search_form(context):
     return context
 
 
-@register.inclusion_tag('main/generic_subtemplate.html', takes_context=True)
+@register.inclusion_tag('appearance/generic_subtemplate.html', takes_context=True)
 def recent_searches_template(context):
     if not context['user'].is_anonymous():
         recent_searches = RecentSearch.objects.filter(user=context['user'])
diff --git a/mayan/apps/dynamic_search/views.py b/mayan/apps/dynamic_search/views.py
index 19e02de713..0e2d2370f4 100644
--- a/mayan/apps/dynamic_search/views.py
+++ b/mayan/apps/dynamic_search/views.py
@@ -56,7 +56,7 @@ def search(request, advanced=False):
     if advanced:
         form = AdvancedSearchForm(data=request.GET, search_model=document_search)
         return render_to_response(
-            'main/generic_form.html',
+            'appearance/generic_form.html',
             {
                 'form': form,
                 'title': _('Advanced search'),
diff --git a/mayan/apps/events/links.py b/mayan/apps/events/links.py
index 907ffcb6f5..0a8c867ff2 100644
--- a/mayan/apps/events/links.py
+++ b/mayan/apps/events/links.py
@@ -2,4 +2,4 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-events_list = {'text': _('Events'), 'view': 'events:events_list', 'famfam': 'book', 'icon': 'main/icons/book.png'}
+events_list = {'text': _('Events'), 'view': 'events:events_list', 'famfam': 'book', 'icon': 'appearance/icons/book.png'}
diff --git a/mayan/apps/events/views.py b/mayan/apps/events/views.py
index b23198dc09..cab4843aea 100644
--- a/mayan/apps/events/views.py
+++ b/mayan/apps/events/views.py
@@ -84,5 +84,5 @@ def events_list(request, app_label=None, module_name=None, object_id=None, verb=
                 'attribute': encapsulate(lambda entry: event_object_link(entry))
             }
         )
-    return render_to_response('main/generic_list.html', context,
+    return render_to_response('appearance/generic_list.html', context,
                               context_instance=RequestContext(request))
diff --git a/mayan/apps/folders/templatetags/folder_tags.py b/mayan/apps/folders/templatetags/folder_tags.py
index f32ac4672e..15c12f49e7 100644
--- a/mayan/apps/folders/templatetags/folder_tags.py
+++ b/mayan/apps/folders/templatetags/folder_tags.py
@@ -8,7 +8,7 @@ from folders.forms import AddDocumentForm
 register = Library()
 
 
-@register.inclusion_tag('main/generic_form_subtemplate.html', takes_context=True)
+@register.inclusion_tag('appearance/generic_form_subtemplate.html', takes_context=True)
 def get_add_document_to_folder_form(context):
     context.update({
         'form': AddDocumentForm(user=context['request'].user),
diff --git a/mayan/apps/folders/views.py b/mayan/apps/folders/views.py
index b62c1a629d..2e120b8a2a 100644
--- a/mayan/apps/folders/views.py
+++ b/mayan/apps/folders/views.py
@@ -57,7 +57,7 @@ def folder_create(request):
     else:
         form = FolderForm()
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'title': _('Create folder'),
         'form': form,
     }, context_instance=RequestContext(request))
@@ -83,7 +83,7 @@ def folder_edit(request, folder_id):
     else:
         form = FolderForm(instance=folder)
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'title': _('Edit folder: %s') % folder,
         'form': form,
         'object': folder,
@@ -121,7 +121,7 @@ def folder_delete(request, folder_id):
         'title': _('Are you sure you with to delete the folder: %s?') % folder,
     }
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -198,7 +198,7 @@ def folder_add_document(request, document_id=None, document_id_list=None):
         len(documents)
     )
 
-    return render_to_response('main/generic_form.html', context,
+    return render_to_response('appearance/generic_form.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -225,7 +225,7 @@ def document_folder_list(request, document_id):
 
     context['object_list'] = queryset
 
-    return render_to_response('main/generic_list.html', context,
+    return render_to_response('appearance/generic_list.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -278,7 +278,7 @@ def folder_document_remove(request, folder_id, document_id=None, document_id_lis
     if len(folder_documents) == 1:
         context['object'] = folder_documents[0]
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
 
 
diff --git a/mayan/apps/installation/links.py b/mayan/apps/installation/links.py
index 2ad2628028..7148ad7b70 100644
--- a/mayan/apps/installation/links.py
+++ b/mayan/apps/installation/links.py
@@ -4,6 +4,6 @@ from django.utils.translation import ugettext_lazy as _
 
 from .permissions import PERMISSION_INSTALLATION_DETAILS
 
-link_menu_link = {'text': _('Installation details'), 'view': 'installation:namespace_list', 'icon': 'main/icons/interface_preferences.png', 'permissions': [PERMISSION_INSTALLATION_DETAILS]}
+link_menu_link = {'text': _('Installation details'), 'view': 'installation:namespace_list', 'icon': 'appearance/icons/interface_preferences.png', 'permissions': [PERMISSION_INSTALLATION_DETAILS]}
 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/installation/views.py b/mayan/apps/installation/views.py
index 97f3cce40c..8ce851588b 100644
--- a/mayan/apps/installation/views.py
+++ b/mayan/apps/installation/views.py
@@ -16,7 +16,7 @@ def namespace_list(request):
 
     Installation().get_properties()
 
-    return render_to_response('main/generic_list.html', {
+    return render_to_response('appearance/generic_list.html', {
         'object_list': PropertyNamespace.get_all(),
         'title': _('Installation property namespaces'),
         'hide_object': True,
@@ -32,7 +32,7 @@ def namespace_details(request, namespace_id):
     object_list = namespace.get_properties()
     title = _('Installation namespace details for: %s') % namespace.label
 
-    return render_to_response('main/generic_list.html', {
+    return render_to_response('appearance/generic_list.html', {
         'object_list': object_list,
         'hide_object': True,
         'title': title,
diff --git a/mayan/apps/linking/links.py b/mayan/apps/linking/links.py
index 38b6be2ba0..cd128b63ef 100644
--- a/mayan/apps/linking/links.py
+++ b/mayan/apps/linking/links.py
@@ -10,7 +10,7 @@ from .permissions import (
     PERMISSION_SMART_LINK_EDIT, PERMISSION_SMART_LINK_VIEW
 )
 
-smart_link_setup = {'text': _('Smart links'), 'view': 'linking:smart_link_list', 'icon': 'main/icons/link.png', 'permissions': [PERMISSION_SMART_LINK_CREATE]}
+smart_link_setup = {'text': _('Smart links'), 'view': 'linking:smart_link_list', 'icon': 'appearance/icons/link.png', 'permissions': [PERMISSION_SMART_LINK_CREATE]}
 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/linking/views.py b/mayan/apps/linking/views.py
index 0cfdf8db6c..05243c4ea9 100644
--- a/mayan/apps/linking/views.py
+++ b/mayan/apps/linking/views.py
@@ -97,7 +97,7 @@ def smart_link_instances_for_document(request, document_id):
         'title': _('Smart links for document: %s') % document,
     }
 
-    return render_to_response('main/generic_list.html', context,
+    return render_to_response('appearance/generic_list.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -109,7 +109,7 @@ def smart_link_list(request):
     except PermissionDenied:
         qs = AccessEntry.objects.filter_objects_by_access(PERMISSION_SMART_LINK_VIEW, request.user, qs)
 
-    return render_to_response('main/generic_list.html', {
+    return render_to_response('appearance/generic_list.html', {
         'title': _('Smart links'),
         'object_list': qs,
         'extra_columns': [
@@ -135,7 +135,7 @@ def smart_link_create(request):
     else:
         form = SmartLinkForm()
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'form': form,
         'title': _('Create new smart link')
     }, context_instance=RequestContext(request))
@@ -158,7 +158,7 @@ def smart_link_edit(request, smart_link_pk):
     else:
         form = SmartLinkForm(instance=smart_link)
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'object': smart_link,
         'form': form,
         'title': _('Edit smart link: %s') % smart_link
@@ -187,7 +187,7 @@ def smart_link_delete(request, smart_link_pk):
             })
         return HttpResponseRedirect(next)
 
-    return render_to_response('main/generic_confirm.html', {
+    return render_to_response('appearance/generic_confirm.html', {
         'delete_view': True,
         'object': smart_link,
         'title': _('Are you sure you wish to delete smart link: %s?') % smart_link,
@@ -226,7 +226,7 @@ def smart_link_condition_list(request, smart_link_pk):
     except PermissionDenied:
         AccessEntry.objects.check_accesses([PERMISSION_SMART_LINK_EDIT], request.user, smart_link)
 
-    return render_to_response('main/generic_list.html', {
+    return render_to_response('appearance/generic_list.html', {
         'title': _('Conditions for smart link: %s') % smart_link,
         'object_list': smart_link.conditions.all(),
         'extra_columns': [
@@ -257,7 +257,7 @@ def smart_link_condition_create(request, smart_link_pk):
     else:
         form = SmartLinkConditionForm()
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'form': form,
         'title': _('Add new conditions to smart link: "%s"') % smart_link,
         'object': smart_link,
@@ -284,7 +284,7 @@ def smart_link_condition_edit(request, smart_link_condition_pk):
     else:
         form = SmartLinkConditionForm(instance=smart_link_condition)
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'form': form,
         'title': _('Edit smart link condition'),
         'next': next,
@@ -321,7 +321,7 @@ def smart_link_condition_delete(request, smart_link_condition_pk):
             })
         return HttpResponseRedirect(next)
 
-    return render_to_response('main/generic_confirm.html', {
+    return render_to_response('appearance/generic_confirm.html', {
         'delete_view': True,
         'condition': smart_link_condition,
         'object': smart_link_condition.smart_link,
diff --git a/mayan/apps/mailer/views.py b/mayan/apps/mailer/views.py
index 30ebc5f0c4..c417dc5df9 100644
--- a/mayan/apps/mailer/views.py
+++ b/mayan/apps/mailer/views.py
@@ -90,5 +90,5 @@ def send_document_link(request, document_id=None, document_id_list=None, as_atta
         else:
             context['title'] = _('Email links for documents: %s') % ', '.join([unicode(d) for d in documents])
 
-    return render_to_response('main/generic_form.html', context,
+    return render_to_response('appearance/generic_form.html', context,
                               context_instance=RequestContext(request))
diff --git a/mayan/apps/main/links.py b/mayan/apps/main/links.py
index 23b6d29548..83ea4c320e 100644
--- a/mayan/apps/main/links.py
+++ b/mayan/apps/main/links.py
@@ -7,5 +7,5 @@ def is_superuser(context):
     return context['request'].user.is_staff or context['request'].user.is_superuser
 
 
-maintenance_menu = {'text': _('Maintenance'), 'view': 'main:maintenance_menu', 'famfam': 'wrench', 'icon': 'main/icons/wrench.png'}
-admin_site = {'text': _('Admin site'), 'view': 'admin:index', 'famfam': 'keyboard', 'icon': 'main/icons/keyboard.png', 'condition': is_superuser}
+maintenance_menu = {'text': _('Maintenance'), 'view': 'main:maintenance_menu', 'famfam': 'wrench', 'icon': 'appearance/icons/wrench.png'}
+admin_site = {'text': _('Admin site'), 'view': 'admin:index', 'famfam': 'keyboard', 'icon': 'appearance/icons/keyboard.png', 'condition': is_superuser}
diff --git a/mayan/apps/main/templates/main/generic_template.html b/mayan/apps/main/templates/main/generic_template.html
deleted file mode 100644
index 2b0820d149..0000000000
--- a/mayan/apps/main/templates/main/generic_template.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends 'main/base.html' %}
-
-{% block title %} :: {{ title }}{% endblock %}
-
-{% block content %}
-    {% include 'main/generic_subtemplate.html' %}
-{% endblock %}
diff --git a/mayan/apps/main/urls.py b/mayan/apps/main/urls.py
index da01eb515d..7feaf872a9 100644
--- a/mayan/apps/main/urls.py
+++ b/mayan/apps/main/urls.py
@@ -11,5 +11,5 @@ urlpatterns = patterns('main.views',
 )
 
 urlpatterns += patterns('',
-    (r'^favicon\.ico$', RedirectView.as_view(url=static('main/images/favicon.ico'))),
+    (r'^favicon\.ico$', RedirectView.as_view(url=static('appearance/images/favicon.ico'))),
 )
diff --git a/mayan/apps/main/views.py b/mayan/apps/main/views.py
index 9054f42996..83fda4df8d 100644
--- a/mayan/apps/main/views.py
+++ b/mayan/apps/main/views.py
@@ -32,7 +32,7 @@ def home(request):
             'title': _('Results'),
         })
 
-    return render_to_response('main/home.html', context, context_instance=RequestContext(request))
+    return render_to_response('appearance/home.html', context, context_instance=RequestContext(request))
 
 
 def maintenance_menu(request):
@@ -50,14 +50,14 @@ def maintenance_menu(request):
             except PermissionDenied:
                 pass
 
-    return render_to_response('main/tools.html', {
+    return render_to_response('appearance/tools.html', {
         'blocks': user_tools,
         'title': _('Maintenance menu')
     }, context_instance=RequestContext(request))
 
 
 def diagnostics_view(request):
-    return render_to_response('main/diagnostics.html', {
+    return render_to_response('appearance/diagnostics.html', {
         'blocks': diagnostics,
         'title': _('Diagnostics')
     }, context_instance=RequestContext(request))
diff --git a/mayan/apps/metadata/links.py b/mayan/apps/metadata/links.py
index bbf5334fdf..85989f2930 100644
--- a/mayan/apps/metadata/links.py
+++ b/mayan/apps/metadata/links.py
@@ -23,9 +23,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', 'famfam': 'xhtml_go', 'icon': 'main/icons/xhtml.png', 'permissions': [PERMISSION_METADATA_TYPE_VIEW]}
+setup_metadata_type_list = {'text': _('Metadata types'), 'view': 'metadata:setup_metadata_type_list', 'famfam': 'xhtml_go', 'icon': 'appearance/icons/xhtml.png', 'permissions': [PERMISSION_METADATA_TYPE_VIEW]}
 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': 'main/icons/to_do_list.png'}
+link_documents_missing_required_metadata = {'text': _('Missing required metadata'), 'view': 'metadata:documents_missing_required_metadata', 'icon': 'appearance/icons/to_do_list.png'}
diff --git a/mayan/apps/metadata/views.py b/mayan/apps/metadata/views.py
index 02b3072ff8..c4ca208363 100644
--- a/mayan/apps/metadata/views.py
+++ b/mayan/apps/metadata/views.py
@@ -131,7 +131,7 @@ def metadata_edit(request, document_id=None, document_id_list=None):
         len(documents)
     )
 
-    return render_to_response('main/generic_form.html', context,
+    return render_to_response('appearance/generic_form.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -213,7 +213,7 @@ def metadata_add(request, document_id=None, document_id_list=None):
         len(documents)
     )
 
-    return render_to_response('main/generic_form.html', context,
+    return render_to_response('appearance/generic_form.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -310,7 +310,7 @@ def metadata_remove(request, document_id=None, document_id_list=None):
         len(documents)
     )
 
-    return render_to_response('main/generic_form.html', context,
+    return render_to_response('appearance/generic_form.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -326,7 +326,7 @@ def metadata_view(request, document_id):
     except PermissionDenied:
         AccessEntry.objects.check_access(PERMISSION_METADATA_DOCUMENT_VIEW, request.user, document)
 
-    return render_to_response('main/generic_list.html', {
+    return render_to_response('appearance/generic_list.html', {
         'title': _('Metadata for document: %s') % document,
         'object_list': document.metadata.all(),
         'extra_columns': [
@@ -380,7 +380,7 @@ def setup_metadata_type_list(request):
         ]
     }
 
-    return render_to_response('main/generic_list.html', context,
+    return render_to_response('appearance/generic_list.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -402,7 +402,7 @@ def setup_metadata_type_edit(request, metadatatype_id):
     else:
         form = MetadataTypeForm(instance=metadata_type)
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'title': _('Edit metadata type: %s') % metadata_type,
         'form': form,
         'object': metadata_type,
@@ -421,7 +421,7 @@ def setup_metadata_type_create(request):
     else:
         form = MetadataTypeForm()
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'title': _('Create metadata type'),
         'form': form,
     }, context_instance=RequestContext(request))
@@ -455,7 +455,7 @@ def setup_metadata_type_delete(request, metadatatype_id):
         'title': _('Are you sure you wish to delete the metadata type: %s?') % metadata_type,
     }
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
 
 
diff --git a/mayan/apps/navigation/templates/generic_navigation.html b/mayan/apps/navigation/templates/generic_navigation.html
deleted file mode 100644
index df0fbddea2..0000000000
--- a/mayan/apps/navigation/templates/generic_navigation.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% for link in object_navigation_links %}
-    {% include 'generic_subnavigation.html' %}
-{% endfor %}
diff --git a/mayan/apps/navigation/templatetags/navigation_tags.py b/mayan/apps/navigation/templatetags/navigation_tags.py
index 9e965db61e..8a65fcfab8 100644
--- a/mayan/apps/navigation/templatetags/navigation_tags.py
+++ b/mayan/apps/navigation/templatetags/navigation_tags.py
@@ -232,7 +232,7 @@ def get_object_navigation_links(parser, token):
     return GetNavigationLinks(menu_name=menu_name, var_name=var_name)
 
 
-@register.inclusion_tag('generic_navigation.html', takes_context=True)
+@register.inclusion_tag('navigation/generic_navigation.html', takes_context=True)
 def object_navigation_template(context):
     new_context = copy.copy(context)
     new_context.update({
diff --git a/mayan/apps/navigation/views.py b/mayan/apps/navigation/views.py
deleted file mode 100644
index 60f00ef0ef..0000000000
--- a/mayan/apps/navigation/views.py
+++ /dev/null
@@ -1 +0,0 @@
-# Create your views here.
diff --git a/mayan/apps/ocr/links.py b/mayan/apps/ocr/links.py
index 57ae34bf50..457a83aeba 100644
--- a/mayan/apps/ocr/links.py
+++ b/mayan/apps/ocr/links.py
@@ -16,4 +16,4 @@ link_entry_delete_multiple = {'text': _('Delete'), 'view': 'ocr:entry_delete_mul
 
 link_document_all_ocr_cleanup = {'text': _('Clean up pages content'), 'view': 'ocr:document_all_ocr_cleanup', 'famfam': 'text_strikethrough', 'permissions': [PERMISSION_OCR_CLEAN_ALL_PAGES], 'description': _('Runs a language filter to remove common OCR mistakes from document pages content.')}
 
-link_entry_list = {'text': _('OCR Errors'), 'view': 'ocr:entry_list', 'famfam': 'hourglass', 'icon': 'main/icons/text.png', 'permissions': [PERMISSION_OCR_DOCUMENT]}
+link_entry_list = {'text': _('OCR Errors'), 'view': 'ocr:entry_list', 'famfam': 'hourglass', 'icon': 'appearance/icons/text.png', 'permissions': [PERMISSION_OCR_DOCUMENT]}
diff --git a/mayan/apps/ocr/views.py b/mayan/apps/ocr/views.py
index 1de58fd278..9b7a1ae4c3 100644
--- a/mayan/apps/ocr/views.py
+++ b/mayan/apps/ocr/views.py
@@ -50,7 +50,7 @@ def document_all_ocr_cleanup(request):
     next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', None)))
 
     if request.method != 'POST':
-        return render_to_response('main/generic_confirm.html', {
+        return render_to_response('appearance/generic_confirm.html', {
             'previous': previous,
             'next': next,
             'title': _('Are you sure you wish to clean up all the pages content?'),
@@ -76,7 +76,7 @@ def entry_list(request):
         'hide_object': True,
     }
 
-    return render_to_response('main/generic_list.html', context,
+    return render_to_response('appearance/generic_list.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -121,7 +121,7 @@ def entry_delete(request, pk=None, pk_list=None):
         len(entries)
     )
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -171,7 +171,7 @@ def entry_re_queue(request, pk=None, pk_list=None):
         len(entries)
     )
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
 
 
diff --git a/mayan/apps/permissions/links.py b/mayan/apps/permissions/links.py
index 2c52b336cb..780635b636 100644
--- a/mayan/apps/permissions/links.py
+++ b/mayan/apps/permissions/links.py
@@ -14,6 +14,6 @@ permission_revoke = {'text': _('Revoke'), 'view': 'permissions:permission_multip
 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', 'famfam': 'medal_gold_1', 'icon': 'main/icons/medal_gold_red.png', 'permissions': [PERMISSION_ROLE_VIEW]}
+role_list = {'text': _('Roles'), 'view': 'permissions:role_list', 'famfam': 'medal_gold_1', 'icon': 'appearance/icons/medal_gold_red.png', '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]}
diff --git a/mayan/apps/permissions/views.py b/mayan/apps/permissions/views.py
index 6ea4ba09e5..50c057fa26 100644
--- a/mayan/apps/permissions/views.py
+++ b/mayan/apps/permissions/views.py
@@ -60,7 +60,7 @@ def role_list(request):
         'hide_link': True,
     }
 
-    return render_to_response('main/generic_list.html', context,
+    return render_to_response('appearance/generic_list.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -72,7 +72,7 @@ def role_permissions(request, role_id):
 
     subtemplates_list = [
         {
-            'name': 'main/generic_list_subtemplate.html',
+            'name': 'appearance/generic_list_subtemplate.html',
             'context': {
                 'title': _('Permissions'),
                 'object_list': Permission.objects.all(),
@@ -90,7 +90,7 @@ def role_permissions(request, role_id):
         },
     ]
 
-    return render_to_response('main/generic_detail.html', {
+    return render_to_response('appearance/generic_detail.html', {
         'form': form,
         'object': role,
         'subtemplates_list': subtemplates_list,
@@ -159,7 +159,7 @@ def permission_grant(request):
     if len(grouped_items) == 1:
         context['object'] = grouped_items[0][0]
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -219,7 +219,7 @@ def permission_revoke(request):
     if len(grouped_items) == 1:
         context['object'] = grouped_items[0][0]
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
 
 
diff --git a/mayan/apps/project_setup/views.py b/mayan/apps/project_setup/views.py
index d2917c20e2..d57316c27d 100644
--- a/mayan/apps/project_setup/views.py
+++ b/mayan/apps/project_setup/views.py
@@ -13,5 +13,5 @@ def setup_list(request):
         'title': _('Setup items'),
     }
 
-    return render_to_response('main/generic_list_horizontal.html', context,
+    return render_to_response('appearance/generic_list_horizontal.html', context,
                               context_instance=RequestContext(request))
diff --git a/mayan/apps/project_tools/views.py b/mayan/apps/project_tools/views.py
index c64c573e9c..3f8f446762 100644
--- a/mayan/apps/project_tools/views.py
+++ b/mayan/apps/project_tools/views.py
@@ -13,5 +13,5 @@ def tools_list(request):
         'title': _('Tools'),
     }
 
-    return render_to_response('main/generic_list_horizontal.html', context,
+    return render_to_response('appearance/generic_list_horizontal.html', context,
                               context_instance=RequestContext(request))
diff --git a/mayan/apps/rest_api/links.py b/mayan/apps/rest_api/links.py
index e1f2e16fcf..3176972a34 100644
--- a/mayan/apps/rest_api/links.py
+++ b/mayan/apps/rest_api/links.py
@@ -2,5 +2,5 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-link_api = {'text': _('REST API'), 'view': 'api-root', 'famfam': 'disconnect', 'icon': 'main/icons/disconnect.png'}
-link_api_documentation = {'text': _('REST API Documentation'), 'view': 'django.swagger.base.view', 'famfam': 'book', 'icon': 'main/icons/book.png'}
+link_api = {'text': _('REST API'), 'view': 'api-root', 'famfam': 'disconnect', 'icon': 'appearance/icons/disconnect.png'}
+link_api_documentation = {'text': _('REST API Documentation'), 'view': 'django.swagger.base.view', 'famfam': 'book', 'icon': 'appearance/icons/book.png'}
diff --git a/mayan/apps/rest_api/templates/rest_framework_swagger/index.html b/mayan/apps/rest_api/templates/rest_framework_swagger/index.html
index af6f65a014..a4e5d89695 100644
--- a/mayan/apps/rest_api/templates/rest_framework_swagger/index.html
+++ b/mayan/apps/rest_api/templates/rest_framework_swagger/index.html
@@ -1,4 +1,4 @@
-{% extends 'main/base.html' %}
+{% extends 'appearance/base.html' %}
 
 {% load i18n %}
 {% load staticfiles %}
diff --git a/mayan/apps/smart_settings/links.py b/mayan/apps/smart_settings/links.py
index c544c0a2ad..6a47689dda 100644
--- a/mayan/apps/smart_settings/links.py
+++ b/mayan/apps/smart_settings/links.py
@@ -7,4 +7,4 @@ def is_superuser(context):
     return context['request'].user.is_staff or context['request'].user.is_superuser
 
 
-check_settings = {'text': _('Settings'), 'view': 'settings:setting_list', 'famfam': 'cog', 'icon': 'main/icons/cog.png', 'condition': is_superuser}
+check_settings = {'text': _('Settings'), 'view': 'settings:setting_list', 'famfam': 'cog', 'icon': 'appearance/icons/cog.png', 'condition': is_superuser}
diff --git a/mayan/apps/smart_settings/views.py b/mayan/apps/smart_settings/views.py
index 4d96fa2611..808e61272e 100644
--- a/mayan/apps/smart_settings/views.py
+++ b/mayan/apps/smart_settings/views.py
@@ -41,5 +41,5 @@ def setting_list(request):
         ]
     }
 
-    return render_to_response('main/generic_list.html', context,
+    return render_to_response('appearance/generic_list.html', context,
                               context_instance=RequestContext(request))
diff --git a/mayan/apps/sources/links.py b/mayan/apps/sources/links.py
index 2064744efe..b036b7321a 100644
--- a/mayan/apps/sources/links.py
+++ b/mayan/apps/sources/links.py
@@ -15,12 +15,12 @@ from .permissions import (
     PERMISSION_SOURCES_SETUP_EDIT, PERMISSION_SOURCES_SETUP_VIEW
 )
 
-document_create_multiple = {'text': _('Upload new documents'), 'view': 'sources:document_create_multiple', 'icon': 'main/icons/page_add.png', 'famfam': 'page_add', 'permissions': [PERMISSION_DOCUMENT_CREATE]}
+document_create_multiple = {'text': _('Upload new documents'), 'view': 'sources:document_create_multiple', 'icon': 'appearance/icons/page_add.png', 'famfam': 'page_add', 'permissions': [PERMISSION_DOCUMENT_CREATE]}
 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': 'main/icons/application_form.png', 'permissions': [PERMISSION_SOURCES_SETUP_VIEW]}
+setup_sources = {'text': _('Sources'), 'view': 'sources:setup_source_list', 'famfam': 'application_form', 'icon': 'appearance/icons/application_form.png', 'permissions': [PERMISSION_SOURCES_SETUP_VIEW]}
 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/sources/views.py b/mayan/apps/sources/views.py
index 1152dd3229..fa7db11a48 100644
--- a/mayan/apps/sources/views.py
+++ b/mayan/apps/sources/views.py
@@ -99,7 +99,7 @@ def get_active_tab_links(document=None):
 
 
 class UploadBaseView(MultiFormView):
-    template_name = 'main/generic_form.html'
+    template_name = 'appearance/generic_form.html'
     prefixes = {'source_form': 'source', 'document_form': 'document'}
 
     def dispatch(self, request, *args, **kwargs):
@@ -129,13 +129,13 @@ class UploadBaseView(MultiFormView):
             finally:
                 subtemplates_list = [
                     {
-                        'name': 'main/generic_multiform_subtemplate.html',
+                        'name': 'appearance/generic_multiform_subtemplate.html',
                         'context': {
                             'forms': context['forms'],
                         }
                     },
                     {
-                        'name': 'main/generic_list_subtemplate.html',
+                        'name': 'appearance/generic_list_subtemplate.html',
                         'context': {
                             'title': _('Files in staging path'),
                             'object_list': staging_filelist,
@@ -145,7 +145,7 @@ class UploadBaseView(MultiFormView):
                 ]
         else:
             subtemplates_list.append({
-                'name': 'main/generic_multiform_subtemplate.html',
+                'name': 'appearance/generic_multiform_subtemplate.html',
                 'context': {
                     'forms': context['forms'],
                     'is_multipart': True
@@ -252,7 +252,7 @@ class UploadInteractiveView(UploadBaseView):
             {
                 'sidebar_subtemplates_list': [
                     {
-                        'name': 'main/generic_subtemplate.html',
+                        'name': 'appearance/generic_subtemplate.html',
                         'context': {
                             'title': _('Current document type'),
                             'paragraphs': [self.document_type if self.document_type else _('None')],
@@ -260,7 +260,7 @@ class UploadInteractiveView(UploadBaseView):
                         }
                     },
                     {
-                        'name': 'main/generic_subtemplate.html',
+                        'name': 'appearance/generic_subtemplate.html',
                         'context': {
                             'title': _('Current metadata'),
                             'paragraphs': metadata_repr_as_list(decode_metadata_from_url(self.request.GET)),
@@ -358,7 +358,7 @@ def staging_file_delete(request, staging_folder_pk, encoded_filename):
 
     results = get_active_tab_links()
 
-    return render_to_response('main/generic_confirm.html', {
+    return render_to_response('appearance/generic_confirm.html', {
         'source': staging_folder,
         'delete_view': True,
         'object': staging_file,
@@ -389,7 +389,7 @@ def setup_source_list(request):
         ]
     }
 
-    return render_to_response('main/generic_list.html', context,
+    return render_to_response('appearance/generic_list.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -413,7 +413,7 @@ def setup_source_edit(request, source_id):
     else:
         form = form_class(instance=source)
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'title': _('Edit source: %s') % source,
         'form': form,
         'source': source,
@@ -449,7 +449,7 @@ def setup_source_delete(request, source_id):
         'source_type': source.source_type,
     }
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -471,7 +471,7 @@ def setup_source_create(request, source_type):
     else:
         form = form_class()
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'title': _('Create new source of type: %s') % cls.class_fullname(),
         'form': form,
         'source_type': source_type,
@@ -499,7 +499,7 @@ def setup_source_transformation_list(request, source_id):
         'hide_object': True,
     }
 
-    return render_to_response('main/generic_list.html', context,
+    return render_to_response('appearance/generic_list.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -522,7 +522,7 @@ def setup_source_transformation_edit(request, transformation_id):
     else:
         form = SourceTransformationForm(instance=source_transformation)
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'title': _('Edit transformation: %s') % source_transformation,
         'form': form,
         'source': source_transformation.content_object,
@@ -552,7 +552,7 @@ def setup_source_transformation_delete(request, transformation_id):
             )
         return HttpResponseRedirect(redirect_view)
 
-    return render_to_response('main/generic_confirm.html', {
+    return render_to_response('appearance/generic_confirm.html', {
         'delete_view': True,
         'transformation': source_transformation,
         'source': source_transformation.content_object,
@@ -588,7 +588,7 @@ def setup_source_transformation_create(request, source_id):
     else:
         form = SourceTransformationForm_create()
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'form': form,
         'source': source,
         'navigation_object_name': 'source',
diff --git a/mayan/apps/sources/widgets.py b/mayan/apps/sources/widgets.py
index 30836c80ce..eba6895549 100644
--- a/mayan/apps/sources/widgets.py
+++ b/mayan/apps/sources/widgets.py
@@ -57,7 +57,7 @@ def staging_file_html_widget(staging_file, click_view=None, page=DEFAULT_PAGE_NU
     if nolazyload:
         result.append('<img style="border: 1px solid black;" src="%s" alt="%s" />' % (preview_view, alt_text))
     else:
-        result.append('<img class="thin_border %s" data-src="%s" src="%s" alt="%s" />' % (image_class, preview_view, static('main/icons/hourglass.png'), alt_text))
+        result.append('<img class="thin_border %s" data-src="%s" src="%s" alt="%s" />' % (image_class, preview_view, static('appearance/icons/hourglass.png'), alt_text))
 
     if click_view:
         result.append('</a>')
diff --git a/mayan/apps/sources/wizards.py b/mayan/apps/sources/wizards.py
index 033a71c3e6..356e44e281 100644
--- a/mayan/apps/sources/wizards.py
+++ b/mayan/apps/sources/wizards.py
@@ -17,7 +17,7 @@ from .models import InteractiveSource
 
 class DocumentCreateWizard(ViewPermissionCheckMixin, SessionWizardView):
     form_list = [DocumentTypeSelectForm, MetadataFormSet]
-    template_name = 'main/generic_wizard.html'
+    template_name = 'appearance/generic_wizard.html'
     extra_context = {}
     view_permission = PERMISSION_DOCUMENT_CREATE
 
diff --git a/mayan/apps/statistics/links.py b/mayan/apps/statistics/links.py
index 2578a204f1..72082e929b 100644
--- a/mayan/apps/statistics/links.py
+++ b/mayan/apps/statistics/links.py
@@ -10,4 +10,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', 'famfam': 'table', 'icon': 'main/icons/blackboard_sum.png', 'condition': is_superuser}
+link_statistics = {'text': _('Statistics'), 'view': 'statistics:namespace_list', 'famfam': 'table', 'icon': 'appearance/icons/blackboard_sum.png', 'condition': is_superuser}
diff --git a/mayan/apps/statistics/views.py b/mayan/apps/statistics/views.py
index 9e50d95935..8a1d537552 100644
--- a/mayan/apps/statistics/views.py
+++ b/mayan/apps/statistics/views.py
@@ -12,7 +12,7 @@ def namespace_list(request):
     if not request.user.is_superuser or not request.user.is_staff:
         raise PermissionDenied
 
-    return render_to_response('main/generic_list.html', {
+    return render_to_response('appearance/generic_list.html', {
         'object_list': StatisticNamespace.get_all(),
         'hide_link': True,
         'title': _('Statistics namespaces'),
@@ -26,7 +26,7 @@ def namespace_details(request, namespace_id):
 
     namespace = StatisticNamespace.get(namespace_id)
 
-    return render_to_response('main/generic_list.html', {
+    return render_to_response('appearance/generic_list.html', {
         'object': namespace,
         'namespace': namespace,
         'object_list': namespace.statistics,
@@ -41,7 +41,7 @@ def execute(request, statistic_id):
 
     statictic = Statistic.get(statistic_id)
 
-    return render_to_response('main/generic_list.html', {
+    return render_to_response('appearance/generic_list.html', {
         'object': statictic,
         'namespace': statictic.namespace,
         'navigation_object_list': [
diff --git a/mayan/apps/tags/views.py b/mayan/apps/tags/views.py
index f946d5df7d..efa2fe1962 100644
--- a/mayan/apps/tags/views.py
+++ b/mayan/apps/tags/views.py
@@ -44,7 +44,7 @@ def tag_create(request):
     else:
         form = TagForm()
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'title': _('Create tag'),
         'form': form,
     }, context_instance=RequestContext(request))
@@ -101,7 +101,7 @@ def tag_attach(request, document_id=None, document_id_list=None):
     if len(documents) == 1:
         context['object'] = documents[0]
 
-    return render_to_response('main/generic_form.html', context,
+    return render_to_response('appearance/generic_form.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -129,7 +129,7 @@ def tag_list(request, queryset=None, extra_context=None):
 
     context['object_list'] = queryset
 
-    return render_to_response('main/generic_list.html', context,
+    return render_to_response('appearance/generic_list.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -180,7 +180,7 @@ def tag_delete(request, tag_id=None, tag_id_list=None):
     if len(tags) == 1:
         context['object'] = tags[0]
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -207,7 +207,7 @@ def tag_edit(request, tag_id):
     else:
         form = TagForm(instance=tag)
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'title': _('Edit tag: %s') % tag,
         'form': form,
         'object': tag,
@@ -270,13 +270,13 @@ def tag_remove(request, document_id=None, document_id_list=None, tag_id=None, ta
         'next': next,
     }
 
-    template = 'main/generic_confirm.html'
+    template = 'appearance/generic_confirm.html'
     if tag_id:
         tags = [get_object_or_404(Tag, pk=tag_id)]
     elif tag_id_list:
         tags = [get_object_or_404(Tag, pk=tag_id) for tag_id in tag_id_list.split(',')]
     else:
-        template = 'main/generic_form.html'
+        template = 'appearance/generic_form.html'
 
         if request.method == 'POST':
             form = TagListForm(request.POST, user=request.user)
diff --git a/mayan/apps/user_management/links.py b/mayan/apps/user_management/links.py
index 8a10a0c8cf..96c1c48e2b 100644
--- a/mayan/apps/user_management/links.py
+++ b/mayan/apps/user_management/links.py
@@ -9,7 +9,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', 'famfam': 'user', 'icon': 'main/icons/user.png', 'permissions': [PERMISSION_USER_VIEW]}
+user_setup = {'text': _('Users'), 'view': 'user_management:user_list', 'famfam': 'user', 'icon': 'appearance/icons/user.png', 'permissions': [PERMISSION_USER_VIEW]}
 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 +19,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', 'famfam': 'group', 'icon': 'main/icons/group.png', 'permissions': [PERMISSION_GROUP_VIEW]}
+group_setup = {'text': _('Groups'), 'view': 'user_management:group_list', 'famfam': 'group', 'icon': 'appearance/icons/group.png', 'permissions': [PERMISSION_GROUP_VIEW]}
 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/apps/user_management/views.py b/mayan/apps/user_management/views.py
index ce5e106546..3048fd16e2 100644
--- a/mayan/apps/user_management/views.py
+++ b/mayan/apps/user_management/views.py
@@ -50,7 +50,7 @@ def user_list(request):
         ],
     }
 
-    return render_to_response('main/generic_list.html', context,
+    return render_to_response('appearance/generic_list.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -71,7 +71,7 @@ def user_edit(request, user_id):
     else:
         form = UserForm(instance=user)
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'title': _('Edit user: %s') % user,
         'form': form,
         'object': user,
@@ -92,7 +92,7 @@ def user_add(request):
     else:
         form = UserForm()
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'title': _('Create new user'),
         'form': form,
     }, context_instance=RequestContext(request))
@@ -140,7 +140,7 @@ def user_delete(request, user_id=None, user_id_list=None):
     elif len(users) > 1:
         context['title'] = _('Are you sure you wish to delete the users: %s?') % ', '.join([unicode(d) for d in users])
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -201,7 +201,7 @@ def user_set_password(request, user_id=None, user_id_list=None):
     elif len(users) > 1:
         context['title'] = _('Reseting password for users: %s') % ', '.join([unicode(d) for d in users])
 
-    return render_to_response('main/generic_form.html', context,
+    return render_to_response('appearance/generic_form.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -254,7 +254,7 @@ def group_list(request):
         ],
     }
 
-    return render_to_response('main/generic_list.html', context,
+    return render_to_response('appearance/generic_list.html', context,
                               context_instance=RequestContext(request))
 
 
@@ -271,7 +271,7 @@ def group_edit(request, group_id):
     else:
         form = GroupForm(instance=group)
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'title': _('Edit group: %s') % group,
         'form': form,
         'object': group,
@@ -290,7 +290,7 @@ def group_add(request):
     else:
         form = GroupForm()
 
-    return render_to_response('main/generic_form.html', {
+    return render_to_response('appearance/generic_form.html', {
         'title': _('Create new group'),
         'form': form,
     }, context_instance=RequestContext(request))
@@ -335,7 +335,7 @@ def group_delete(request, group_id=None, group_id_list=None):
     elif len(groups) > 1:
         context['title'] = _('Are you sure you wish to delete the groups: %s?') % ', '.join([unicode(d) for d in groups])
 
-    return render_to_response('main/generic_confirm.html', context,
+    return render_to_response('appearance/generic_confirm.html', context,
                               context_instance=RequestContext(request))
 
 
diff --git a/mayan/settings/base.py b/mayan/settings/base.py
index a6e6c5eba0..8fa22de404 100644
--- a/mayan/settings/base.py
+++ b/mayan/settings/base.py
@@ -74,6 +74,7 @@ INSTALLED_APPS = (
     'smart_settings',
     'user_management',
     # Mayan EDMS
+    'appearance',
     'checkouts',
     'document_acls',
     'document_comments',