diff --git a/apps/main/templates/base.html b/apps/main/templates/base.html
index 85eaa5f0dc..bce7da29e6 100644
--- a/apps/main/templates/base.html
+++ b/apps/main/templates/base.html
@@ -46,12 +46,11 @@
 {% endblock %}
 
 {% block web_theme_javascript %}
+    <script type="text/javascript" src="{{ STATIC_URL }}packages/jquery.scrollview.js"></script>
     <script type="text/javascript" src="{{ STATIC_URL }}packages/JqueryAsynchImageLoader-0.8.min.js"></script>
     <script type="text/javascript" src="{{ STATIC_URL }}packages/jquery.fancybox-1.3.4/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
     <script type="text/javascript" src="{{ STATIC_URL }}packages/jquery.fancybox-1.3.4/fancybox/jquery.easing-1.3.pack.js"></script>
 
-    <script type="text/javascript" src="{{ STATIC_URL }}packages/jquery.scrollview.js"></script>
-
     <script type="text/javascript">
         jQuery(document).ready(function() {
             {% if not disable_auto_focus %}
diff --git a/apps/web_theme/templates/web_theme_base.html b/apps/web_theme/templates/web_theme_base.html
index 762df88143..bbd4340355 100644
--- a/apps/web_theme/templates/web_theme_base.html
+++ b/apps/web_theme/templates/web_theme_base.html
@@ -1,5 +1,7 @@
 {% load i18n %}
 {% load theme_tags %}
+{% load compress %}
+
 {% get_theme as web_theme %}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -11,6 +13,7 @@
 
         {% block web_theme_head %}{% endblock %}	
 
+		{% compress css %}
         <link rel="stylesheet" href="{{ STATIC_URL }}web_theme_media/stylesheets/base.css" type="text/css" media="screen" />
         <link rel="stylesheet" id="current-theme" href="{{ STATIC_URL }}web_theme_media/stylesheets/themes/{{ web_theme }}/style.css" type="text/css" media="screen" />
         <style type="text/css">
@@ -32,15 +35,18 @@
             }
         </style> 
         {% block web_theme_stylesheets %}{% endblock %}
+		{% endcompress %}
 
+		{% compress js %}
         <script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}web_theme_media/javascripts/jquery-1.5.2.min.js"></script>
+
         {% if enable_scroll_js %}
             <script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}web_theme_media/javascripts/jquery.scrollTo.js"></script>#}
             <script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}web_theme_media/javascripts/jquery.localscroll.js"></script>#}
         {% endif %}
 
         {% block web_theme_javascript %}{% endblock %}
-       
+
         <script type="text/javascript">
             $(document).ready(function() {
                 $(".message").fadeIn("slow");
@@ -59,6 +65,7 @@
                 });                
             });
         </script>
+        {% endcompress %}
 	</head>
 	<body>
         <div id="container">
diff --git a/requirements/development.txt b/requirements/development.txt
index 1e9357ff11..10496b3b5d 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -16,3 +16,5 @@ pdfminer==20110227
 APScheduler==2.0.2
 django-grappelli==2.3.3
 Pillow==1.7.4
+cssmin==0.1.4
+django-compressor==1.1
diff --git a/requirements/production.txt b/requirements/production.txt
index b2ba31513a..ba444a2bbf 100644
--- a/requirements/production.txt
+++ b/requirements/production.txt
@@ -13,3 +13,5 @@ pdfminer==20110227
 APScheduler==2.0.2
 django-grappelli==2.3.3
 Pillow==1.7.4
+cssmin==0.1.4
+django-compressor==1.1
diff --git a/settings.py b/settings.py
index 25dcd3d12e..25182f6e98 100644
--- a/settings.py
+++ b/settings.py
@@ -162,6 +162,7 @@ INSTALLED_APPS = (
     'job_processor',
     'history',
     'main',
+    'compressor',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
@@ -173,6 +174,15 @@ TEMPLATE_CONTEXT_PROCESSORS = (
 #    'django.contrib.messages.context_processors.messages',
 )
 
+STATICFILES_FINDERS = (
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+    # other finders..
+    'compressor.finders.CompressorFinder',
+)
+COMPRESS_PARSER = 'compressor.parser.HtmlParser'
+COMPRESS_CSS_FILTERS = ['compressor.filters.css_default.CssAbsoluteFilter', 'compressor.filters.cssmin.CSSMinFilter']
+
 #===== User configuration options ===============
 #--------- Pagination ------------------
 #PAGINATION_DEFAULT_PAGINATION = 10
