diff --git a/app/assets/stylesheets/theme/base.css b/app/assets/stylesheets/theme/base.css
deleted file mode 100644
index 5b6e94a..0000000
--- a/app/assets/stylesheets/theme/base.css
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
-    Override base to remove zero-reset.
-*/
-.clear { clear: both; height: 0; }
-
-.wat-cf:after {
-     content: "."; 
-     display: block; 
-     height: 0; 
-     clear: both; 
-     visibility: hidden;
-}
-
-.wat-cf {display: inline-block;}
-
-/* Hides from IE-mac \*/
-* html .wat-cf {height: 1%;}
-.wat-cf {display: block;}
-/* End hide from IE-mac */
-
-h1 { font-size: 30px; margin: 15px 0; font-weight: normal; }
-h2 { font-size: 24px; margin: 15px 0; font-weight: normal;}
-h3 { font-size: 20px; margin: 10px 0; font-weight: normal;}
-h4 { font-size: 18px; margin: 10px 0; font-weight: normal;}
-hr {height: 1px; border: 0; }
-p { margin: 15px 0;}
-a img { border: none; }
-
-body {
-  font-size: 16px;
-  font-family: sans-serif;  
-}
-
-#container {
-  min-width: 960px;
-}
-
-#header, #wrapper {
-  padding: 0 20px;
-}
-
-#header {
-  position: relative;
-  padding-top: 1px;  
-}
-
-#header h1 {
-  margin: 0;
-  padding: 10px 0;  
-  font-size: 26px;
-}
-
-#header h1 a:link, #header h1 a:active, #header h1 a:hover, #header h1 a:visited {
-  text-decoration: none;
-}
-
-#main {  
-  width: 70%;
-  float: left;    
-}
-
-.actions-bar {
-  padding: 10px 1px;
-}
-
-.actions-bar .actions {
-  float: left;
-}
-
-
-.actions-bar .pagination {
-  float: right;
-  padding: 1px 0;
-}
-
-#sidebar {
-  width: 25%;
-  float: right;      
-}
-
-#sidebar h3 {  
-  padding: 10px 15px;
-  margin: 0;
-  font-size: 13px;
-}
-
-#sidebar .block {
-  margin-bottom: 20px;
-  padding-bottom: 10px;
-}
-
-#sidebar .block .content {
-  padding: 0 15px;
-}
-
-#sidebar ul.navigation li a:link, #sidebar ul.navigation li a:visited {
-  display: block;
-  padding: 10px 15px;
-}
-
-#sidebar .block .sidebar-block, #sidebar .notice {
-  padding:10px;
-}
-
-#wrapper {
-  padding-top: 20px;
-}
-
-#main .block {
-  margin-bottom: 20px;
-  padding-top: 1px;
-}
-
-#main .block .content .inner {
-  padding: 0 15px 15px;  
-}
-
-#main .main p.first {
-  margin-top: 0;
-}
-
-#user-navigation {
-  position: absolute;
-  top: 0px;
-  right: 20px;  
-}
-
-#main-navigation {
-  width: 100%;
-}
-
-#user-navigation ul, #main-navigation ul, .secondary-navigation ul, #sidebar ul.navigation {
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
-}
-
-#user-navigation ul li, #main-navigation ul li, .secondary-navigation ul li {
-  float: left;  
-}
-
-#main-navigation ul li {
-  margin-right: 5px;
-}
-
-#user-navigation ul li {
-  padding: 5px 10px;
-}
-
-#main-navigation ul li a:link, #main-navigation ul li a:visited, #main-navigation ul li a:hover, #main-navigation ul li a:active,
-.secondary-navigation ul li a:link, .secondary-navigation ul li a:visited, .secondary-navigation ul li a:hover, .secondary-navigation ul li a:active,
-#user-navigation ul li a:link, #user-navigation ul li a:visited, #user-navigation ul li a:hover, #user-navigation ul li a:active {
-  text-decoration: none;
-}
-
-#main-navigation ul li a {
-  font-size: 14px;
-  line-height: 14px;
-  display: block;
-  padding: 8px 15px;
-}
-
-.secondary-navigation {
-  font-size: 13px;  
-  border-bottom-width: 10px;
-  border-bottom-style: solid;
-}
-
-.secondary-navigation ul li a {
-  display: block;
-  padding: 10px 15px;  
-}
-
-#footer {
-  padding-bottom: 20px;
-}
-
-/* pagination */
-
-.pagination a, .pagination span, .pagination em {
-  padding: 2px 5px;
-  margin-right: 5px; 
-  display: block;
-  float: left;
-  border-style: solid;
-  border-width: 1px;
-}
-
-.pagination em {
-  font-weight: bold;  
-}
-
-.pagination a {
-  text-decoration: none;  
-}
-
-/* tables */
-.table {
-  width: 100%;
-  border-collapse: collapse;  
-  margin-bottom: 15px;
-}
-
-.table th {
-  padding: 10px;
-  font-weight: bold;
-  text-align: left;
-}
-
-.table th.first {
-  width: 30px;
-}
-
-.table th.last {
-  width: 200px;  
-}
-
-.table .checkbox {
-  margin-left: 10px;
-}
-
-.table td {
-  padding: 10px;
-}
-
-.table td.last {
-  text-align: right;
-}
-
-/* forms */
-
-input.checkbox {
-  margin: 0;
-  padding: 0;
-}
-
-.form .group {
-  margin-bottom: 15px;
-}
-
-.form div.left {
-  width: 20%;
-  float: left;
-}
-
-.form div.right {
-  width: 75%;
-  float: right;
-}
-
-.form .columns .column {
-  width: 48%;
-}
-
-.form .columns .left {
-  float: left;
-}
-
-.form .columns .right {
-  float: right;
-}
-
-.form label.label, .form input.text_field, .form textarea.text_area {
-  font-size: 1.2em;
-  padding: 1px 0;
-  margin: 0;
-}
-
-.form label.right {
-  text-align: right;
-}
-
-.form input.checkbox, .form input.radio {
-  margin-right: 5px;
-}
-
-.form label.checkbox, .form label.radio {
-  line-height: 1.5em;
-}
-
-.form label.label {
-  display: block;
-  padding-bottom: 2px;  
-  font-weight: bold;
-}
-
-.form div.fieldWithErrors label.label {
-  display: inline;
-}
-
-.form .fieldWithErrors .error {
-  color: red;
-}
-
-.form input.text_field, .form textarea.text_area {
-  width: 100%;
-  border-width: 1px;
-  border-style: solid;
-}
-
-/* lists */
-
-ul.list {
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
-}
-
-ul.list li {
-  clear: left;
-  padding-bottom: 5px;
-}
-
-ul.list li .left {
-  float: left;  
-}
-
-ul.list li .left .avatar {
-  width: 50px;
-  height: 50px;
-}
-
-ul.list li .item {
-  margin-left: 80px;
-}
-
-ul.list li .item .avatar {
-  float: left;
-  margin: 0 5px 5px 0;
-  width: 30px;
-  height: 30px;
-}
-
-/* box */
-
-#box {
-  width: 500px;
-  margin: 50px auto;  
-}
-
-#box .block {
-  margin-bottom: 20px;
-}
-
-#box .block h2 {
-  padding: 10px 15px;
-  margin: 0;  
-}
-
-#box .block .content {
-  padding: 10px 20px;
-}
-
-/*  Inspired by http://particletree.com/features/rediscovering-the-button-element */
-
-a.button:link, a.button:visited, a.button:hover, a.button:active, button.button {
-  color: #222;
-  display:block;
-  float:left;
-  margin:0 7px 0 0;
-  background-color: #eee;
-  border:1px solid #bfbfbf;
-  font-size: 1em;
-  line-height: 1.3em;
-  font-weight:bold;
-  cursor:pointer;
-  padding:5px 10px 6px 7px;
-  text-decoration: none;
-}
-
-button.button {
-  width:auto;
-  overflow:visible;
-  padding:4px 10px 3px 7px; /* IE6 */
-}
-button.button[type] {
-  padding:5px 10px 5px 7px; /* Firefox */
-  line-height:17px; /* Safari */
-}
-
-/**:first-child+html button.button[type] {
-  padding:4px 10px 3px 7px;  IE7 
-}*/
-
-button.button img, a.button img {
-  margin:0 3px -3px 0 !important;
-  padding:0;
-  border:none;
-  width:16px;
-  height:16px;
-}
-
-button.button:hover, a.button:hover {
-  background-color:#dedede;
-}
-
-button.button:active, a.button:active {
-  background-color:#e5e5e5;
-}
-.text_button_padding{
-  color: #222222;
-  display: block;
-  float: left;
-  font-size: 1em;
-  line-height: 2em;
-  margin: 0 7px 0 0;
-  padding: 5px 0 6px 7px;
-  text-decoration: none;
-}
-.link_button{
-  cursor: pointer;
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/theme/base.css.scss b/app/assets/stylesheets/theme/base.css.scss
new file mode 100644
index 0000000..9f571af
--- /dev/null
+++ b/app/assets/stylesheets/theme/base.css.scss
@@ -0,0 +1,427 @@
+/*
+Override base to remove zero-reset.
+*/
+.clear { clear: both; height: 0; }
+
+.wat-cf:after {
+    content: "."; 
+    display: block; 
+    height: 0; 
+    clear: both; 
+    visibility: hidden;
+}
+
+.wat-cf {display: inline-block;}
+
+/* Hides from IE-mac \*/
+* html .wat-cf {height: 1%;}
+.wat-cf {display: block;}
+/* End hide from IE-mac */
+
+h1 { font-size: 30px; margin: 15px 0; font-weight: normal; }
+h2 { font-size: 24px; margin: 15px 0; font-weight: normal;}
+h3 { font-size: 20px; margin: 10px 0; font-weight: normal;}
+h4 { font-size: 18px; margin: 10px 0; font-weight: normal;}
+hr {height: 1px; border: 0; }
+p { margin: 15px 0;}
+a img { border: none; }
+
+body {
+    font-size: 16px;
+    font-family: sans-serif;  
+}
+
+#container {
+    min-width: 960px;
+}
+
+#header, #wrapper {
+    padding: 0 20px;
+}
+
+#header {
+    position: relative;
+    padding-top: 1px;  
+}
+
+#header h1 {
+    margin: 0;
+    padding: 10px 0;  
+    font-size: 26px;
+}
+
+#header h1 a {
+    &:link, &:active, &:hover, &:visited {
+        text-decoration: none;
+    }
+}
+
+#main {  
+    width: 70%;
+    float: left;    
+}
+
+.actions-bar {
+    padding: 10px 1px;
+}
+
+.actions-bar .actions {
+    float: left;
+}
+
+
+.actions-bar .pagination {
+    float: right;
+    padding: 1px 0;
+}
+
+#sidebar {
+    width: 25%;
+    float: right;      
+}
+
+#sidebar h3 {  
+    padding: 10px 15px;
+    margin: 0;
+    font-size: 13px;
+}
+
+#sidebar .block {
+    margin-bottom: 20px;
+    padding-bottom: 10px;
+}
+
+#sidebar .block .content {
+    padding: 0 15px;
+}
+
+#sidebar ul.navigation li a {
+    &:link, &:visited {
+        display: block;
+        padding: 10px 15px;
+    }
+}
+
+#sidebar  {
+    .block .sidebar-block, .notice {
+        padding:10px;
+    }
+}
+
+#wrapper {
+    padding-top: 20px;
+}
+
+#main .block {
+    margin-bottom: 20px;
+    padding-top: 1px;
+}
+
+#main .block .content .inner {
+    padding: 0 15px 15px;  
+}
+
+#main .main p.first {
+    margin-top: 0;
+}
+
+#user-navigation {
+    position: absolute;
+    top: 0px;
+    right: 20px;  
+}
+
+#main-navigation {
+    width: 100%;
+}
+
+#user-navigation ul, 
+#main-navigation ul, 
+.secondary-navigation ul, 
+#sidebar ul.navigation {
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
+}
+
+#user-navigation ul li, 
+#main-navigation ul li, 
+.secondary-navigation ul li {
+    float: left;  
+}
+
+#main-navigation ul li {
+    margin-right: 5px;
+}
+
+#user-navigation ul li {
+    padding: 5px 10px;
+}
+
+#main-navigation ul li a,
+.secondary-navigation,
+#user-navigation {
+    ul li a {
+        &:link, &:visited, &:hover, &:active {
+            text-decoration: none;
+        }
+    }
+}
+
+#main-navigation ul li a {
+    font-size: 14px;
+    line-height: 14px;
+    display: block;
+    padding: 8px 15px;
+}
+
+.secondary-navigation {
+    font-size: 13px;  
+    border-bottom-width: 10px;
+    border-bottom-style: solid;
+}
+
+.secondary-navigation ul li a {
+    display: block;
+    padding: 10px 15px;  
+}
+
+#footer {
+    padding-bottom: 20px;
+}
+
+/* pagination */
+
+.pagination a, .pagination span, .pagination em {
+    padding: 2px 5px;
+    margin-right: 5px; 
+    display: block;
+    float: left;
+    border-style: solid;
+    border-width: 1px;
+}
+
+.pagination em {
+    font-weight: bold;  
+}
+
+.pagination a {
+    text-decoration: none;  
+}
+
+/* tables */
+.table {
+    width: 100%;
+    border-collapse: collapse;  
+    margin-bottom: 15px;
+}
+
+.table th {
+    padding: 10px;
+    font-weight: bold;
+    text-align: left;
+}
+
+.table th.first {
+    width: 30px;
+}
+
+.table th.last {
+    width: 200px;  
+}
+
+.table .checkbox {
+    margin-left: 10px;
+}
+
+.table td {
+    padding: 10px;
+}
+
+.table td.last {
+    text-align: right;
+}
+
+/* forms */
+
+input.checkbox {
+    margin: 0;
+    padding: 0;
+}
+
+.form .group {
+    margin-bottom: 15px;
+}
+
+.form div.left {
+    width: 20%;
+    float: left;
+}
+
+.form div.right {
+    width: 75%;
+    float: right;
+}
+
+.form .columns .column {
+    width: 48%;
+}
+
+.form .columns .left {
+    float: left;
+}
+
+.form .columns .right {
+    float: right;
+}
+
+.form label.label, .form input.text_field, .form textarea.text_area {
+    font-size: 1.2em;
+    padding: 1px 0;
+    margin: 0;
+}
+
+.form label.right {
+    text-align: right;
+}
+
+.form input.checkbox, .form input.radio {
+    margin-right: 5px;
+}
+
+.form label.checkbox, .form label.radio {
+    line-height: 1.5em;
+}
+
+.form label.label {
+    display: block;
+    padding-bottom: 2px;  
+    font-weight: bold;
+}
+
+.form div.fieldWithErrors label.label {
+    display: inline;
+}
+
+.form .fieldWithErrors .error {
+    color: red;
+}
+
+.form input.text_field, .form textarea.text_area {
+    width: 100%;
+    border-width: 1px;
+    border-style: solid;
+}
+
+/* lists */
+
+ul.list {
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
+}
+
+ul.list li {
+    clear: left;
+    padding-bottom: 5px;
+}
+
+ul.list li .left {
+    float: left;  
+}
+
+ul.list li .left .avatar {
+    width: 50px;
+    height: 50px;
+}
+
+ul.list li .item {
+    margin-left: 80px;
+}
+
+ul.list li .item .avatar {
+    float: left;
+    margin: 0 5px 5px 0;
+    width: 30px;
+    height: 30px;
+}
+
+/* box */
+
+#box {
+    width: 500px;
+    margin: 50px auto;  
+}
+
+#box .block {
+    margin-bottom: 20px;
+}
+
+#box .block h2 {
+    padding: 10px 15px;
+    margin: 0;  
+}
+
+#box .block .content {
+    padding: 10px 20px;
+}
+
+/*  Inspired by http://particletree.com/features/rediscovering-the-button-element */
+
+a.button:link, a.button:visited, a.button:hover, a.button:active, button.button {
+    color: #222;
+    display:block;
+    float:left;
+    margin:0 7px 0 0;
+    background-color: #eee;
+    border:1px solid #bfbfbf;
+    font-size: 1em;
+    line-height: 1.3em;
+    font-weight:bold;
+    cursor:pointer;
+    padding:5px 10px 6px 7px;
+    text-decoration: none;
+}
+
+button.button {
+    width:auto;
+    overflow:visible;
+    padding:4px 10px 3px 7px; /* IE6 */
+}
+button.button[type] {
+    padding:5px 10px 5px 7px; /* Firefox */
+    line-height:17px; /* Safari */
+}
+
+/**:first-child+html button.button[type] {
+padding:4px 10px 3px 7px;  IE7 
+}*/
+
+button.button img, a.button img {
+    margin:0 3px -3px 0 !important;
+    padding:0;
+    border:none;
+    width:16px;
+    height:16px;
+}
+
+button.button:hover, a.button:hover {
+    background-color:#dedede;
+}
+
+button.button:active, a.button:active {
+    background-color:#e5e5e5;
+}
+.text_button_padding{
+    color: #222222;
+    display: block;
+    float: left;
+    font-size: 1em;
+    line-height: 2em;
+    margin: 0 7px 0 0;
+    padding: 5px 0 6px 7px;
+    text-decoration: none;
+}
+.link_button{
+    cursor: pointer;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/theme/theme.css.scss b/app/assets/stylesheets/theme/theme.css.scss
new file mode 100644
index 0000000..dc53c47
--- /dev/null
+++ b/app/assets/stylesheets/theme/theme.css.scss
@@ -0,0 +1,402 @@
+@import "compass/css3/border-radius";
+@import "compass/css3/box-shadow";
+@import "compass/css3/text-shadow";
+@import "compass/css3/images";
+
+body {
+    color: #111111;
+    background: #c4c4c4 url(image-path("theme/bgd.jpg"));
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+h1, h2, h3 {
+    color: #111111;
+    font-weight: normal;
+}
+
+a {
+    color: #111111;
+    -moz-outline: none;
+}
+
+hr {
+    background: #dddddd;
+    color: #dddddd;
+}
+
+#header {
+    height: 80px;
+    background-color: #333333;
+    @include text-shadow(0 1px 1px rgba(0, 0, 0, 0.25));
+    @include box-shadow(inset 0 -5px 10px rgba(0, 0, 0, 0.25), 0 1px 1px rgba(255, 255, 255, 0.3));
+}
+#header h1 {
+    padding: 15px 5px;
+    float: left;
+    font-size: 40px;
+    font-style: normal;
+    font-weight: bold;
+    text-transform: normal;
+    letter-spacing: -1px;
+    line-height: 1.2em;
+    color: white;
+}
+#header h1 a:link, #header h1 a:active, #header h1 a:hover, #header h1 a:visited {
+    color: white;
+}
+
+#main {
+    width: 77%;
+    float: left;
+}
+#main .block {
+    padding-top: 0px;
+    background-color: white;
+    @include text-shadow(0 1px 0 white);
+    @include border-radius(6px);
+    @include box-shadow(0 0 1px rgba(0, 0, 0, 0.3), 0 1px 1px rgba(0, 0, 0, 0.3));
+}
+#main .block .content {
+    padding-top: 1px;
+}
+#main .block .content .inner {
+    padding: 0 15px 15px;
+}
+#main .block .content h2 {
+    margin-left: 15px;
+    font-size: 22px;
+    text-transform: normal;
+    letter-spacing: -1px;
+    line-height: 1.2em;
+}
+#main .block .content p {
+    font-size: 13px;
+    font-style: normal;
+    font-weight: normal;
+    text-transform: normal;
+    letter-spacing: normal;
+    line-height: 1.45em;
+}
+
+#main-navigation {
+    padding-top: 30px;
+    width: auto;
+}
+#main-navigation ul li {
+    padding-left: 20px;
+    margin-right: 0;
+    a {
+        text-decoration: none;
+        padding: 8px 0;
+        color: #eeeeee;
+        &:hover {
+            text-decoration: underline;
+        }
+    }
+    /*
+    &.active {
+    a {
+    color: #a4a4a4;
+    }
+    }
+    */
+}
+
+.secondary-navigation {
+    background: #e0e0e0 url(image-path("theme/boxbar-background.png")) top;
+    border-bottom-width: 0px;
+    @include border-top-radius(6px);
+}
+.secondary-navigation li.first a, .secondary-navigation ul li.first {
+    @include border-top-left-radius(6px);
+}
+.secondary-navigation ul li a:link, .secondary-navigation ul li a:visited, .secondary-navigation ul li a:hover, .secondary-navigation ul li a:active {
+    text-decoration: none;
+    color: #111111;
+}
+.secondary-navigation ul li.text {
+    padding: 10px 15px;
+    color: #818171;
+}
+.secondary-navigation ul li.active {
+    background-color: white;
+}
+.secondary-navigation ul li.active a:hover {
+    background-color: white;
+}
+
+#user-navigation {
+    top: 33px;
+    right: 10px;
+    color: #eeeeee;
+    font-size: 14px;
+}
+
+#user-navigation ul li {
+    a {
+        color: #eeeeee;
+        &:hover {
+            text-decoration: underline;
+        }
+    }
+}
+#user-navigation ul li a:active img {
+    margin-top: 1px;
+}
+
+#user-navigation ul li, .secondary-navigation ul li {
+    float: left;
+}
+
+#footer {
+    color: #261f1f;
+    text-shadow: none;
+}
+#footer .block {
+    @include box-shadow(none);
+    background: none;
+}
+#footer p {
+    margin: 0;
+    padding: 0;
+    text-align: center;
+}
+
+#sidebar {
+    width: 20%;
+    float: right;
+}
+#sidebar .block {
+    padding-top: 2px;
+    padding-bottom: 2px;
+    @include border-radius(6px);
+    @include text-shadow(0 1px 0 rgba(255, 255, 255, 0.6));
+}
+#sidebar .block h4 {
+    font-weight: normal;
+    font-family: helvetica, arial, sans-serif;
+}
+#sidebar .notice {
+    color: white;
+    text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25);
+    background-color: rgba(0, 0, 0, 0.3);
+    @include background-image(linear-gradient(rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)));
+    @include border-radius(6px);
+    @include box-shadow(inset 0 1px 3px rgba(0, 0, 0, 0.25), 0 1px 1px rgba(255, 255, 255, 0.3));
+}
+#sidebar .warning {
+    padding-left: 10px;
+    padding-right: 10px;
+    color: #222222;
+    background: #ffef4e;
+    @include border-radius(6px);
+    @include box-shadow(0 0 1px rgba(0, 0, 0, 0.3), 0 1px 1px rgba(0, 0, 0, 0.1));
+    border: 1px solid rgba(0, 0, 0, 0.3);
+}
+#sidebar h3 {
+    padding-left: 25px;
+    color: #111111;
+    border-bottom: 1px solid #261f1f;
+}
+#sidebar ul li {
+    background-position: 0 11px;
+    background-repeat: no-repeat;
+    background-image: url(image-path("theme/arrow.png"));
+    border-bottom: 1px dashed #777777;
+    list-style-type: none;
+}
+#sidebar ul li a {
+    margin-left: 10px;
+    text-decoration: none;
+    text-shadow: 0 1px 0 white;
+}
+#sidebar ul li.active a {
+    color: #a4a4a4;
+}
+
+.control {
+    float: right;
+    margin-right: 9px;
+    margin-top: 11px;
+}
+
+.pagination a, .pagination span {
+    border: 1px solid #c3c4ba;
+    @include border-radius(2px);
+    margin-right: 5px;
+    padding: 6px;
+    min-width: 15px;
+    text-align: center;
+    background: #dddddd;
+    background-image: url(image-path("theme/button-background.png"));
+    color: #111111;
+}
+.pagination a:hover {
+    border: 1px solid #818171;
+    @include box-shadow(0 0 4px rgba(0, 0, 0, 0.3));
+}
+.pagination span.current {
+    background: #261f1f;
+    color: white;
+    border: 1px solid #261f1f;
+}
+
+.pagination a:active {
+    background-image: url(image-path("theme/button-background-active.png"));
+    outline: none;
+}
+
+.table th {
+    background: #eaeaea;
+    color: #222222;
+    font-weight: normal;
+}
+.table th.last {
+    min-width: 90px;
+}
+.table td {
+    border-bottom: 1px solid #eaeaea;
+}
+.table td.last {
+    padding-top: 0px;
+    padding-bottom: 0px;
+}
+.table tr.even {
+    background: #f8f8f8;
+}
+
+.form label.label {
+    font-family: helvetica, arial, sans-serif;
+    font-weight: normal;
+    color: #666666;
+}
+.form input.text_field, .form textarea.text_area {
+    width: 100%;
+    border: 1px solid #dddddd;
+    @include box-shadow(inset 0 1px 3px rgba(0, 0, 0, 0.1));
+}
+.form input.button {
+    background: #dddddd;
+    @include border-radius(5px);
+    border: 1px solid #c1c1c1;
+    padding: 2px 5px;
+    cursor: pointer;
+    color: #111111;
+    font-weight: bold;
+    font-size: 11px;
+}
+.form input.button:hover {
+    border: 1px solid #666666;
+}
+.form .description {
+    font-style: italic;
+    color: #8c8c8c;
+    font-size: 0.9em;
+}
+.form .navform a {
+    color: #cc0000;
+}
+
+.flash .message {
+    @include border-radius(3px);
+    text-align: center;
+    margin: 0 auto 15px;
+    color: white;
+    @include text-shadow(0 1px 0 rgba(0, 0, 0, 0.3));
+}
+.flash .message p {
+    margin: 8px;
+}
+.flash .error, .flash .error-list {
+    border: 1px solid #993624;
+    background: #cc4831 url(image-path("messages/error.png")) no-repeat 10px center;
+}
+.flash .warning {
+    border: 1px solid #bb9004;
+    background: #f9c006 url(image-path("messages/warning.png")) no-repeat 10px center;
+}
+.flash .notice {
+    color: #28485e;
+    @include text-shadow(0 1px 0 rgba(255, 255, 255, 0.7));
+    border: 1px solid #8a9daa;
+    background: #b8d1e2 url(image-path("messages/notice.png")) no-repeat 10px center;
+}
+.flash .error-list {
+    text-align: left;
+}
+.flash .error-list h2 {
+    font-size: 16px;
+    text-align: center;
+}
+.flash .error-list ul {
+    padding-left: 22px;
+    line-height: 18px;
+    list-style-type: square;
+    margin-bottom: 15px;
+}
+
+ul.list li {
+    border-bottom-color: #dddddd;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+}
+ul.list li .item .avatar {
+    border-color: #dddddd;
+    border-width: 1px;
+    border-style: solid;
+    padding: 2px;
+}
+
+#box {
+    width: 480px;
+}
+#box .block {
+    background: white;
+    text-shadow: 0 1px 0 white;
+    @include box-shadow(0 0 1px rgba(0, 0, 0, 0.3), 0 1px 1px rgba(0, 0, 0, 0.3));
+    @include border-radius(6px);
+}
+#box .block h2 {
+    background: #261f1f;
+    color: white;
+    @include text-shadow(none);
+    @include border-top-radius(6px);
+}
+
+a.button, button.button {
+    background: #edeeed url(image-path("theme/button-background.png")) top;
+    border: 1px solid #c3c4ba;
+    font-family: helvetica, arial, sans-serif;
+    font-weight: normal;
+    @include border-radius(3px);
+    @include box-shadow(0 1px 2px rgba(0, 0, 0, 0.1));
+}
+a.button:link, a.button:visited, a.button:hover, a.button:active, button.button:link, button.button:visited, button.button:hover, button.button:active {
+    font-weight: normal;
+    background: #edeeed url(image-path("theme/button-background.png")) top;
+}
+
+a.button:active, button.button:active {
+    background: #eaeaea url(image-path("theme/button-background-active.png")) top;
+    outline: none;
+    margin-top: 1px;
+    margin-bottom: -1px;
+}
+
+.form div.left {
+    width: 10%;
+    float: left;
+}
+.form div.right {
+    width: 85%;
+    float: right;
+}
+
+.login div.left, .signup div div.left {
+    width: 21%;
+    float: left;
+}
+.login div.right, .signup div div.right {
+    width: 74%;
+    float: right;
+}
diff --git a/app/assets/stylesheets/theme/theme.scss b/app/assets/stylesheets/theme/theme.scss
deleted file mode 100644
index a964e9b..0000000
--- a/app/assets/stylesheets/theme/theme.scss
+++ /dev/null
@@ -1,394 +0,0 @@
-@import "compass/css3/border-radius";
-@import "compass/css3/box-shadow";
-@import "compass/css3/text-shadow";
-@import "compass/css3/images";
-
-body {
-  color: #111111;
-  background: #c4c4c4 url(image-path("theme/bgd.jpg"));
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-
-h1, h2, h3 {
-  color: #111111;
-  font-weight: normal;
-}
-
-a:link, a:visited, a:hover, a:active {
-  color: #111111;
-}
-
-a {
-  -moz-outline: none;
-}
-
-hr {
-  background: #dddddd;
-  color: #dddddd;
-}
-
-#header {
-  height: 80px;
-  background-color: #333333;
-  @include text-shadow(0 1px 1px rgba(0, 0, 0, 0.25));
-  @include box-shadow(inset 0 -5px 10px rgba(0, 0, 0, 0.25), 0 1px 1px rgba(255, 255, 255, 0.3));
-}
-#header h1 {
-  padding: 15px 5px;
-  float: left;
-  font-size: 40px;
-  font-style: normal;
-  font-weight: bold;
-  text-transform: normal;
-  letter-spacing: -1px;
-  line-height: 1.2em;
-  color: white;
-}
-#header h1 a:link, #header h1 a:active, #header h1 a:hover, #header h1 a:visited {
-  color: white;
-}
-
-#main {
-  width: 77%;
-  float: left;
-}
-#main .block {
-  padding-top: 0px;
-  background-color: white;
-  @include text-shadow(0 1px 0 white);
-  @include border-radius(6px);
-  @include box-shadow(0 0 1px rgba(0, 0, 0, 0.3), 0 1px 1px rgba(0, 0, 0, 0.3));
-}
-#main .block .content {
-  padding-top: 1px;
-}
-#main .block .content .inner {
-  padding: 0 15px 15px;
-}
-#main .block .content h2 {
-  margin-left: 15px;
-  font-size: 22px;
-  text-transform: normal;
-  letter-spacing: -1px;
-  line-height: 1.2em;
-}
-#main .block .content p {
-  font-size: 13px;
-  font-style: normal;
-  font-weight: normal;
-  text-transform: normal;
-  letter-spacing: normal;
-  line-height: 1.45em;
-}
-
-#main-navigation {
-  padding-top: 30px;
-  width: auto;
-}
-#main-navigation ul li {
-  padding-left: 20px;
-  margin-right: 0;
-}
-#main-navigation ul li a:link, #main-navigation ul li a:visited, #main-navigation ul li a:hover, #main-navigation ul li a:active {
-  padding: 8px 0;
-  text-decoration: none;
-  color: #eeeeee;
-}
-#main-navigation ul li.active a:link, #main-navigation ul li.active a:visited, #main-navigation ul li.active a:hover, #main-navigation ul li.active a:active {
-  color: #a4a4a4;
-}
-
-.secondary-navigation {
-  background: #e0e0e0 url(image-path("theme/boxbar-background.png")) top;
-  border-bottom-width: 0px;
-  @include border-top-radius(6px);
-}
-.secondary-navigation li.first a, .secondary-navigation ul li.first {
-  @include border-top-left-radius(6px);
-}
-.secondary-navigation ul li a:link, .secondary-navigation ul li a:visited, .secondary-navigation ul li a:hover, .secondary-navigation ul li a:active {
-  text-decoration: none;
-  color: #111111;
-}
-.secondary-navigation ul li.text {
-  padding: 10px 15px;
-  color: #818171;
-}
-.secondary-navigation ul li.active {
-  background-color: white;
-}
-.secondary-navigation ul li.active a:hover {
-  background-color: white;
-}
-
-#user-navigation {
-  top: 33px;
-  right: 10px;
-  color: #eeeeee;
-  font-size: 14px;
-}
-
-#user-navigation ul li a:link, #user-navigation ul li a:visited, #user-navigation ul li a:hover, #user-navigation ul li a:active {
-  text-decoration: none;
-  color: #eeeeee;
-}
-#user-navigation ul li a:active img {
-  margin-top: 1px;
-}
-
-#user-navigation ul li, .secondary-navigation ul li {
-  float: left;
-}
-
-#footer {
-  color: #261f1f;
-  text-shadow: none;
-}
-#footer .block {
-  @include box-shadow(none);
-  background: none;
-}
-#footer p {
-  margin: 0;
-  padding: 0;
-  text-align: center;
-}
-
-#sidebar {
-  width: 20%;
-  float: right;
-}
-#sidebar .block {
-  padding-top: 2px;
-  padding-bottom: 2px;
-  @include border-radius(6px);
-  @include text-shadow(0 1px 0 rgba(255, 255, 255, 0.6));
-}
-#sidebar .block h4 {
-  font-weight: normal;
-  font-family: helvetica, arial, sans-serif;
-}
-#sidebar .notice {
-  color: white;
-  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25);
-  background-color: rgba(0, 0, 0, 0.3);
-  @include background-image(linear-gradient(rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)));
-  @include border-radius(6px);
-  @include box-shadow(inset 0 1px 3px rgba(0, 0, 0, 0.25), 0 1px 1px rgba(255, 255, 255, 0.3));
-}
-#sidebar .warning {
-  padding-left: 10px;
-  padding-right: 10px;
-  color: #222222;
-  background: #ffef4e;
-  @include border-radius(6px);
-  @include box-shadow(0 0 1px rgba(0, 0, 0, 0.3), 0 1px 1px rgba(0, 0, 0, 0.1));
-  border: 1px solid rgba(0, 0, 0, 0.3);
-}
-#sidebar h3 {
-  padding-left: 25px;
-  color: #111111;
-  border-bottom: 1px solid #261f1f;
-}
-#sidebar ul li {
-  background-position: 0 11px;
-  background-repeat: no-repeat;
-  background-image: url(image-path("theme/arrow.png"));
-  border-bottom: 1px dashed #777777;
-  list-style-type: none;
-}
-#sidebar ul li a {
-  margin-left: 10px;
-  text-decoration: none;
-  text-shadow: 0 1px 0 white;
-}
-#sidebar ul li.active a {
-  color: #a4a4a4;
-}
-
-.control {
-  float: right;
-  margin-right: 9px;
-  margin-top: 11px;
-}
-
-.pagination a, .pagination span {
-  border: 1px solid #c3c4ba;
-  @include border-radius(2px);
-  margin-right: 5px;
-  padding: 6px;
-  min-width: 15px;
-  text-align: center;
-  background: #dddddd;
-  background-image: url(image-path("theme/button-background.png"));
-  color: #111111;
-}
-.pagination a:hover {
-  border: 1px solid #818171;
-  @include box-shadow(0 0 4px rgba(0, 0, 0, 0.3));
-}
-.pagination span.current {
-  background: #261f1f;
-  color: white;
-  border: 1px solid #261f1f;
-}
-
-.pagination a:active {
-  background-image: url(image-path("theme/button-background-active.png"));
-  outline: none;
-}
-
-.table th {
-  background: #eaeaea;
-  color: #222222;
-  font-weight: normal;
-}
-.table th.last {
-  min-width: 90px;
-}
-.table td {
-  border-bottom: 1px solid #eaeaea;
-}
-.table td.last {
-  padding-top: 0px;
-  padding-bottom: 0px;
-}
-.table tr.even {
-  background: #f8f8f8;
-}
-
-.form label.label {
-  font-family: helvetica, arial, sans-serif;
-  font-weight: normal;
-  color: #666666;
-}
-.form input.text_field, .form textarea.text_area {
-  width: 100%;
-  border: 1px solid #dddddd;
-  @include box-shadow(inset 0 1px 3px rgba(0, 0, 0, 0.1));
-}
-.form input.button {
-  background: #dddddd;
-  @include border-radius(5px);
-  border: 1px solid #c1c1c1;
-  padding: 2px 5px;
-  cursor: pointer;
-  color: #111111;
-  font-weight: bold;
-  font-size: 11px;
-}
-.form input.button:hover {
-  border: 1px solid #666666;
-}
-.form .description {
-  font-style: italic;
-  color: #8c8c8c;
-  font-size: 0.9em;
-}
-.form .navform a {
-  color: #cc0000;
-}
-
-.flash .message {
-  @include border-radius(3px);
-  text-align: center;
-  margin: 0 auto 15px;
-  color: white;
-  @include text-shadow(0 1px 0 rgba(0, 0, 0, 0.3));
-}
-.flash .message p {
-  margin: 8px;
-}
-.flash .error, .flash .error-list {
-  border: 1px solid #993624;
-  background: #cc4831 url(image-path("messages/error.png")) no-repeat 10px center;
-}
-.flash .warning {
-  border: 1px solid #bb9004;
-  background: #f9c006 url(image-path("messages/warning.png")) no-repeat 10px center;
-}
-.flash .notice {
-  color: #28485e;
-  @include text-shadow(0 1px 0 rgba(255, 255, 255, 0.7));
-  border: 1px solid #8a9daa;
-  background: #b8d1e2 url(image-path("messages/notice.png")) no-repeat 10px center;
-}
-.flash .error-list {
-  text-align: left;
-}
-.flash .error-list h2 {
-  font-size: 16px;
-  text-align: center;
-}
-.flash .error-list ul {
-  padding-left: 22px;
-  line-height: 18px;
-  list-style-type: square;
-  margin-bottom: 15px;
-}
-
-ul.list li {
-  border-bottom-color: #dddddd;
-  border-bottom-width: 1px;
-  border-bottom-style: solid;
-}
-ul.list li .item .avatar {
-  border-color: #dddddd;
-  border-width: 1px;
-  border-style: solid;
-  padding: 2px;
-}
-
-#box {
-  width: 480px;
-}
-#box .block {
-  background: white;
-  text-shadow: 0 1px 0 white;
-  @include box-shadow(0 0 1px rgba(0, 0, 0, 0.3), 0 1px 1px rgba(0, 0, 0, 0.3));
-  @include border-radius(6px);
-}
-#box .block h2 {
-  background: #261f1f;
-  color: white;
-  @include text-shadow(none);
-  @include border-top-radius(6px);
-}
-
-a.button, button.button {
-  background: #edeeed url(image-path("theme/button-background.png")) top;
-  border: 1px solid #c3c4ba;
-  font-family: helvetica, arial, sans-serif;
-  font-weight: normal;
-  @include border-radius(3px);
-  @include box-shadow(0 1px 2px rgba(0, 0, 0, 0.1));
-}
-a.button:link, a.button:visited, a.button:hover, a.button:active, button.button:link, button.button:visited, button.button:hover, button.button:active {
-  font-weight: normal;
-  background: #edeeed url(image-path("theme/button-background.png")) top;
-}
-
-a.button:active, button.button:active {
-  background: #eaeaea url(image-path("theme/button-background-active.png")) top;
-  outline: none;
-  margin-top: 1px;
-  margin-bottom: -1px;
-}
-
-.form div.left {
-  width: 10%;
-  float: left;
-}
-.form div.right {
-  width: 85%;
-  float: right;
-}
-
-.login div.left, .signup div div.left {
-  width: 21%;
-  float: left;
-}
-.login div.right, .signup div div.right {
-  width: 74%;
-  float: right;
-}
diff --git a/config/settings.sample.yml b/config/settings.sample.yml
index 3500028..92c2b87 100644
--- a/config/settings.sample.yml
+++ b/config/settings.sample.yml
@@ -1,3 +1,4 @@
+
 default_ttl: 3600
 min_ttl: 60
 ns:
@@ -15,3 +16,4 @@ protected_hostnames:
   - imap
   - ns[0-9]*
 support_mail: "support@entrydns.net"
+honeypot: userid