diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index 54e421b19f74ed83c0cf14e4beec61cc03414df7..5b8ea59ecbfc9e1df66a84047c8a55cf703518fb 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -56,22 +56,23 @@ MEDIA_URL = "/site_media/media/"
 # Don"t put anything in this directory yourself; store your static files
 # in apps" "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = os.path.join(PACKAGE_ROOT, "site_media", "static")
+STATIC_ROOT = os.path.join(PROJECT_ROOT, 'staticfiles')
 
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
-STATIC_URL = "/site_media/static/"
+STATIC_URL = '/static/'
 
 # Additional locations of static files
-STATICFILES_DIRS = [
-    os.path.join(PROJECT_ROOT, "static", "dist"),
-]
+STATICFILES_DIRS = (
+    os.path.join(PROJECT_ROOT, 'static'),
+)
 
 # List of finder classes that know how to find static files in
 # various locations.
 STATICFILES_FINDERS = [
     "django.contrib.staticfiles.finders.FileSystemFinder",
     "django.contrib.staticfiles.finders.AppDirectoriesFinder",
+    "compressor.finders.CompressorFinder",
 ]
 
 # Make this unique, and don't share it with anybody.
@@ -172,6 +173,9 @@ INSTALLED_APPS = [
 
     #testing
     "django_nose",
+
+    # stylesheets and js
+    'compressor',
 ]
 
 # A sample logging configuration. The only tangible logging
@@ -203,6 +207,10 @@ LOGGING = {
     }
 }
 
+COMPRESS_PRECOMPILERS = (
+    ('text/x-scss', 'django_libsass.SassCompiler'),
+)
+
 FIXTURE_DIRS = [
     os.path.join(PROJECT_ROOT, "fixtures"),
 ]