diff --git a/fas/fas/static/css/style.css b/fas/fas/static/theme/fas/css/style.css
similarity index 100%
rename from fas/fas/static/css/style.css
rename to fas/fas/static/theme/fas/css/style.css
diff --git a/fas/fas/static/images/account.png b/fas/fas/static/theme/fas/images/account.png
similarity index 100%
rename from fas/fas/static/images/account.png
rename to fas/fas/static/theme/fas/images/account.png
diff --git a/fas/fas/static/images/approved.png b/fas/fas/static/theme/fas/images/approved.png
similarity index 100%
rename from fas/fas/static/images/approved.png
rename to fas/fas/static/theme/fas/images/approved.png
diff --git a/fas/fas/static/images/arrow.png b/fas/fas/static/theme/fas/images/arrow.png
similarity index 100%
rename from fas/fas/static/images/arrow.png
rename to fas/fas/static/theme/fas/images/arrow.png
diff --git a/fas/fas/static/images/attn.png b/fas/fas/static/theme/fas/images/attn.png
similarity index 100%
rename from fas/fas/static/images/attn.png
rename to fas/fas/static/theme/fas/images/attn.png
diff --git a/fas/fas/static/images/control-separator.png b/fas/fas/static/theme/fas/images/control-separator.png
similarity index 100%
rename from fas/fas/static/images/control-separator.png
rename to fas/fas/static/theme/fas/images/control-separator.png
diff --git a/fas/fas/static/images/favicon.ico b/fas/fas/static/theme/fas/images/favicon.ico
similarity index 100%
rename from fas/fas/static/images/favicon.ico
rename to fas/fas/static/theme/fas/images/favicon.ico
diff --git a/fas/fas/static/images/footer-bottom.png b/fas/fas/static/theme/fas/images/footer-bottom.png
similarity index 100%
rename from fas/fas/static/images/footer-bottom.png
rename to fas/fas/static/theme/fas/images/footer-bottom.png
diff --git a/fas/fas/static/images/footer-top.png b/fas/fas/static/theme/fas/images/footer-top.png
similarity index 100%
rename from fas/fas/static/images/footer-top.png
rename to fas/fas/static/theme/fas/images/footer-top.png
diff --git a/fas/fas/static/images/head.png b/fas/fas/static/theme/fas/images/head.png
similarity index 100%
rename from fas/fas/static/images/head.png
rename to fas/fas/static/theme/fas/images/head.png
diff --git a/fas/fas/static/images/header-icon_account.png b/fas/fas/static/theme/fas/images/header-icon_account.png
similarity index 100%
rename from fas/fas/static/images/header-icon_account.png
rename to fas/fas/static/theme/fas/images/header-icon_account.png
diff --git a/fas/fas/static/images/header_inner.png b/fas/fas/static/theme/fas/images/header_inner.png
similarity index 100%
rename from fas/fas/static/images/header_inner.png
rename to fas/fas/static/theme/fas/images/header_inner.png
diff --git a/fas/fas/static/images/help.png b/fas/fas/static/theme/fas/images/help.png
similarity index 100%
rename from fas/fas/static/images/help.png
rename to fas/fas/static/theme/fas/images/help.png
diff --git a/fas/fas/static/images/hr.png b/fas/fas/static/theme/fas/images/hr.png
similarity index 100%
rename from fas/fas/static/images/hr.png
rename to fas/fas/static/theme/fas/images/hr.png
diff --git a/fas/fas/static/images/icon_tool-item.png b/fas/fas/static/theme/fas/images/icon_tool-item.png
similarity index 100%
rename from fas/fas/static/images/icon_tool-item.png
rename to fas/fas/static/theme/fas/images/icon_tool-item.png
diff --git a/fas/fas/static/images/icon_warning.png b/fas/fas/static/theme/fas/images/icon_warning.png
similarity index 100%
rename from fas/fas/static/images/icon_warning.png
rename to fas/fas/static/theme/fas/images/icon_warning.png
diff --git a/fas/fas/static/images/info.png b/fas/fas/static/theme/fas/images/info.png
similarity index 100%
rename from fas/fas/static/images/info.png
rename to fas/fas/static/theme/fas/images/info.png
diff --git a/fas/fas/static/images/infobar.png b/fas/fas/static/theme/fas/images/infobar.png
similarity index 100%
rename from fas/fas/static/images/infobar.png
rename to fas/fas/static/theme/fas/images/infobar.png
diff --git a/fas/fas/static/images/logo.png b/fas/fas/static/theme/fas/images/logo.png
similarity index 100%
rename from fas/fas/static/images/logo.png
rename to fas/fas/static/theme/fas/images/logo.png
diff --git a/fas/fas/static/images/ok.png b/fas/fas/static/theme/fas/images/ok.png
similarity index 100%
rename from fas/fas/static/images/ok.png
rename to fas/fas/static/theme/fas/images/ok.png
diff --git a/fas/fas/static/images/queue.png b/fas/fas/static/theme/fas/images/queue.png
similarity index 100%
rename from fas/fas/static/images/queue.png
rename to fas/fas/static/theme/fas/images/queue.png
diff --git a/fas/fas/static/images/shadow.png b/fas/fas/static/theme/fas/images/shadow.png
similarity index 100%
rename from fas/fas/static/images/shadow.png
rename to fas/fas/static/theme/fas/images/shadow.png
diff --git a/fas/fas/static/images/sidebar.png b/fas/fas/static/theme/fas/images/sidebar.png
similarity index 100%
rename from fas/fas/static/images/sidebar.png
rename to fas/fas/static/theme/fas/images/sidebar.png
diff --git a/fas/fas/static/images/status_approved.png b/fas/fas/static/theme/fas/images/status_approved.png
similarity index 100%
rename from fas/fas/static/images/status_approved.png
rename to fas/fas/static/theme/fas/images/status_approved.png
diff --git a/fas/fas/static/images/status_incomplete.png b/fas/fas/static/theme/fas/images/status_incomplete.png
similarity index 100%
rename from fas/fas/static/images/status_incomplete.png
rename to fas/fas/static/theme/fas/images/status_incomplete.png
diff --git a/fas/fas/static/images/status_rejected.png b/fas/fas/static/theme/fas/images/status_rejected.png
similarity index 100%
rename from fas/fas/static/images/status_rejected.png
rename to fas/fas/static/theme/fas/images/status_rejected.png
diff --git a/fas/fas/static/images/success.png b/fas/fas/static/theme/fas/images/success.png
similarity index 100%
rename from fas/fas/static/images/success.png
rename to fas/fas/static/theme/fas/images/success.png
diff --git a/fas/fas/static/images/tg_under_the_hood.png b/fas/fas/static/theme/fas/images/tg_under_the_hood.png
similarity index 100%
rename from fas/fas/static/images/tg_under_the_hood.png
rename to fas/fas/static/theme/fas/images/tg_under_the_hood.png
diff --git a/fas/fas/static/images/tools.png b/fas/fas/static/theme/fas/images/tools.png
similarity index 100%
rename from fas/fas/static/images/tools.png
rename to fas/fas/static/theme/fas/images/tools.png
diff --git a/fas/fas/static/images/topnav-separator.png b/fas/fas/static/theme/fas/images/topnav-separator.png
similarity index 100%
rename from fas/fas/static/images/topnav-separator.png
rename to fas/fas/static/theme/fas/images/topnav-separator.png
diff --git a/fas/fas/static/images/topnav.png b/fas/fas/static/theme/fas/images/topnav.png
similarity index 100%
rename from fas/fas/static/images/topnav.png
rename to fas/fas/static/theme/fas/images/topnav.png
diff --git a/fas/fas/static/images/unapproved.png b/fas/fas/static/theme/fas/images/unapproved.png
similarity index 100%
rename from fas/fas/static/images/unapproved.png
rename to fas/fas/static/theme/fas/images/unapproved.png
diff --git a/fas/fas/static/images/under_the_hood_blue.png b/fas/fas/static/theme/fas/images/under_the_hood_blue.png
similarity index 100%
rename from fas/fas/static/images/under_the_hood_blue.png
rename to fas/fas/static/theme/fas/images/under_the_hood_blue.png
diff --git a/fas/fas/templates/master.html b/fas/fas/templates/master.html
index 4838960..b18fadd 100644
--- a/fas/fas/templates/master.html
+++ b/fas/fas/templates/master.html
@@ -6,9 +6,10 @@
   <?python
   _ = lambda text: tg.gettext(text)
   ?>
+  <?python from turbogears import config  ?>
   <head py:match="head" py:attrs="select('@*')">
-    <link href="${tg.url('/static/css/style.css')}" rel="stylesheet" type="text/css" />
-    <link rel="shortcut icon" href="${tg.url('/static/images/favicon.ico')}" type="image/vnd.microsoft.icon" />
+    <link href="${tg.url('/static/theme/%s/css/style.css') % config.get('theme')}" rel="stylesheet" type="text/css" />
+    <link rel="shortcut icon" href="${tg.url('/static/theme/%s/images/favicon.ico' % config.get('theme'))}" type="image/vnd.microsoft.icon" />
     <meta py:replace="select('*|text()')" />
     <script type="text/javascript" src="${tg.url('/static/js/prototype.js')}"></script>
     <script type="text/javascript" src="${tg.url('/static/js/prototype.improvements.js')}"></script>