diff --git a/includes/sys_template.php b/includes/sys_template.php
index d3f7a24e..1c3b38b1 100644
--- a/includes/sys_template.php
+++ b/includes/sys_template.php
@@ -6,7 +6,7 @@
 $themes = array(
     "0" => "Engelsystem light",
     "1" => "Engelsystem dark",
-    "2" => "Engelsystem 31c3" 
+    "2" => "Engelsystem cccamp15" 
 );
 
 /**
diff --git a/public/css/theme2.css b/public/css/theme2.css
index e2a17878..cb19eb09 100644
--- a/public/css/theme2.css
+++ b/public/css/theme2.css
@@ -896,12 +896,12 @@ textarea {
   line-height: inherit;
 }
 a {
-  color: #41145a;
+  color: #758499;
   text-decoration: none;
 }
 a:hover,
 a:focus {
-  color: #14061b;
+  color: #525e6f;
   text-decoration: underline;
 }
 a:focus {
@@ -1103,7 +1103,7 @@ small,
 }
 mark,
 .mark {
-  background-color: #ff8232;
+  background-color: #fffefd;
   padding: .2em;
 }
 .text-left {
@@ -1134,65 +1134,65 @@ mark,
   color: #777777;
 }
 .text-primary {
-  color: #41145a;
+  color: #758499;
 }
 a.text-primary:hover {
-  color: #230b30;
+  color: #5d6b7e;
 }
 .text-success {
-  color: #33cc24;
+  color: #638232;
 }
 a.text-success:hover {
-  color: #28a11c;
+  color: #475d24;
 }
 .text-info {
-  color: #6e50b4;
+  color: #826045;
 }
 a.text-info:hover {
-  color: #583f92;
+  color: #614733;
 }
 .text-warning {
-  color: #8a6d3b;
+  color: #bc8640;
 }
 a.text-warning:hover {
-  color: #66512c;
+  color: #966b33;
 }
 .text-danger {
-  color: #ff5a46;
+  color: #694374;
 }
 a.text-danger:hover {
-  color: #ff2d13;
+  color: #4c3054;
 }
 .bg-primary {
   color: #fff;
-  background-color: #41145a;
+  background-color: #758499;
 }
 a.bg-primary:hover {
-  background-color: #230b30;
+  background-color: #5d6b7e;
 }
 .bg-success {
-  background-color: #cbf5c7;
+  background-color: #d9e6c3;
 }
 a.bg-success:hover {
-  background-color: #a3ed9c;
+  background-color: #c3d79f;
 }
 .bg-info {
-  background-color: #e4dff1;
+  background-color: #e8ded7;
 }
 a.bg-info:hover {
-  background-color: #c7bbe2;
+  background-color: #d6c3b6;
 }
 .bg-warning {
-  background-color: #ff8232;
+  background-color: #fffefd;
 }
 a.bg-warning:hover {
-  background-color: #fe6300;
+  background-color: #f8e7d1;
 }
 .bg-danger {
-  background-color: #ffe2df;
+  background-color: #c5a9cd;
 }
 a.bg-danger:hover {
-  background-color: #ffb5ac;
+  background-color: #af89ba;
 }
 .page-header {
   padding-bottom: 9px;
@@ -2156,14 +2156,14 @@ table th[class*="col-"] {
 .table > thead > tr.success > th,
 .table > tbody > tr.success > th,
 .table > tfoot > tr.success > th {
-  background-color: #cbf5c7;
+  background-color: #d9e6c3;
 }
 .table-hover > tbody > tr > td.success:hover,
 .table-hover > tbody > tr > th.success:hover,
 .table-hover > tbody > tr.success:hover > td,
 .table-hover > tbody > tr:hover > .success,
 .table-hover > tbody > tr.success:hover > th {
-  background-color: #b7f1b1;
+  background-color: #cedeb1;
 }
 .table > thead > tr > td.info,
 .table > tbody > tr > td.info,
@@ -2177,14 +2177,14 @@ table th[class*="col-"] {
 .table > thead > tr.info > th,
 .table > tbody > tr.info > th,
 .table > tfoot > tr.info > th {
-  background-color: #e4dff1;
+  background-color: #e8ded7;
 }
 .table-hover > tbody > tr > td.info:hover,
 .table-hover > tbody > tr > th.info:hover,
 .table-hover > tbody > tr.info:hover > td,
 .table-hover > tbody > tr:hover > .info,
 .table-hover > tbody > tr.info:hover > th {
-  background-color: #d6cdea;
+  background-color: #dfd0c6;
 }
 .table > thead > tr > td.warning,
 .table > tbody > tr > td.warning,
@@ -2198,14 +2198,14 @@ table th[class*="col-"] {
 .table > thead > tr.warning > th,
 .table > tbody > tr.warning > th,
 .table > tfoot > tr.warning > th {
-  background-color: #ff8232;
+  background-color: #fffefd;
 }
 .table-hover > tbody > tr > td.warning:hover,
 .table-hover > tbody > tr > th.warning:hover,
 .table-hover > tbody > tr.warning:hover > td,
 .table-hover > tbody > tr:hover > .warning,
 .table-hover > tbody > tr.warning:hover > th {
-  background-color: #ff7218;
+  background-color: #fbf2e7;
 }
 .table > thead > tr > td.danger,
 .table > tbody > tr > td.danger,
@@ -2219,14 +2219,14 @@ table th[class*="col-"] {
 .table > thead > tr.danger > th,
 .table > tbody > tr.danger > th,
 .table > tfoot > tr.danger > th {
-  background-color: #ffe2df;
+  background-color: #c5a9cd;
 }
 .table-hover > tbody > tr > td.danger:hover,
 .table-hover > tbody > tr > th.danger:hover,
 .table-hover > tbody > tr.danger:hover > td,
 .table-hover > tbody > tr:hover > .danger,
 .table-hover > tbody > tr.danger:hover > th {
-  background-color: #ffccc5;
+  background-color: #ba99c3;
 }
 .table-responsive {
   overflow-x: auto;
@@ -2583,25 +2583,25 @@ select[multiple].form-group-lg .form-control {
 .has-success.checkbox label,
 .has-success.radio-inline label,
 .has-success.checkbox-inline label {
-  color: #33cc24;
+  color: #638232;
 }
 .has-success .form-control {
-  border-color: #33cc24;
+  border-color: #638232;
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
 }
 .has-success .form-control:focus {
-  border-color: #28a11c;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7be670;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7be670;
+  border-color: #475d24;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #98c05a;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #98c05a;
 }
 .has-success .input-group-addon {
-  color: #33cc24;
-  border-color: #33cc24;
-  background-color: #cbf5c7;
+  color: #638232;
+  border-color: #638232;
+  background-color: #d9e6c3;
 }
 .has-success .form-control-feedback {
-  color: #33cc24;
+  color: #638232;
 }
 .has-warning .help-block,
 .has-warning .control-label,
@@ -2613,25 +2613,25 @@ select[multiple].form-group-lg .form-control {
 .has-warning.checkbox label,
 .has-warning.radio-inline label,
 .has-warning.checkbox-inline label {
-  color: #8a6d3b;
+  color: #bc8640;
 }
 .has-warning .form-control {
-  border-color: #8a6d3b;
+  border-color: #bc8640;
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
 }
 .has-warning .form-control:focus {
-  border-color: #66512c;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
+  border-color: #966b33;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d7b68b;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d7b68b;
 }
 .has-warning .input-group-addon {
-  color: #8a6d3b;
-  border-color: #8a6d3b;
-  background-color: #ff8232;
+  color: #bc8640;
+  border-color: #bc8640;
+  background-color: #fffefd;
 }
 .has-warning .form-control-feedback {
-  color: #8a6d3b;
+  color: #bc8640;
 }
 .has-error .help-block,
 .has-error .control-label,
@@ -2643,25 +2643,25 @@ select[multiple].form-group-lg .form-control {
 .has-error.checkbox label,
 .has-error.radio-inline label,
 .has-error.checkbox-inline label {
-  color: #ff5a46;
+  color: #694374;
 }
 .has-error .form-control {
-  border-color: #ff5a46;
+  border-color: #694374;
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
 }
 .has-error .form-control:focus {
-  border-color: #ff2d13;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffb5ac;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffb5ac;
+  border-color: #4c3054;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #9f70ad;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #9f70ad;
 }
 .has-error .input-group-addon {
-  color: #ff5a46;
-  border-color: #ff5a46;
-  background-color: #ffe2df;
+  color: #694374;
+  border-color: #694374;
+  background-color: #c5a9cd;
 }
 .has-error .form-control-feedback {
-  color: #ff5a46;
+  color: #694374;
 }
 .has-feedback label ~ .form-control-feedback {
   top: 25px;
@@ -2861,8 +2861,8 @@ fieldset[disabled] .btn-default.active {
 }
 .btn-primary {
   color: #ffffff;
-  background-color: #41145a;
-  border-color: #320f45;
+  background-color: #758499;
+  border-color: #68778d;
 }
 .btn-primary:hover,
 .btn-primary:focus,
@@ -2871,8 +2871,8 @@ fieldset[disabled] .btn-default.active {
 .btn-primary.active,
 .open > .dropdown-toggle.btn-primary {
   color: #ffffff;
-  background-color: #230b30;
-  border-color: #0e0413;
+  background-color: #5d6b7e;
+  border-color: #4e5969;
 }
 .btn-primary:active,
 .btn-primary.active,
@@ -2897,17 +2897,17 @@ fieldset[disabled] .btn-primary:active,
 .btn-primary.disabled.active,
 .btn-primary[disabled].active,
 fieldset[disabled] .btn-primary.active {
-  background-color: #41145a;
-  border-color: #320f45;
+  background-color: #758499;
+  border-color: #68778d;
 }
 .btn-primary .badge {
-  color: #41145a;
+  color: #758499;
   background-color: #ffffff;
 }
 .btn-success {
   color: #ffffff;
-  background-color: #33cc24;
-  border-color: #2eb620;
+  background-color: #7b9c41;
+  border-color: #6d8a39;
 }
 .btn-success:hover,
 .btn-success:focus,
@@ -2916,8 +2916,8 @@ fieldset[disabled] .btn-primary.active {
 .btn-success.active,
 .open > .dropdown-toggle.btn-success {
   color: #ffffff;
-  background-color: #28a11c;
-  border-color: #218217;
+  background-color: #5f7832;
+  border-color: #4b5f28;
 }
 .btn-success:active,
 .btn-success.active,
@@ -2942,17 +2942,17 @@ fieldset[disabled] .btn-success:active,
 .btn-success.disabled.active,
 .btn-success[disabled].active,
 fieldset[disabled] .btn-success.active {
-  background-color: #33cc24;
-  border-color: #2eb620;
+  background-color: #7b9c41;
+  border-color: #6d8a39;
 }
 .btn-success .badge {
-  color: #33cc24;
+  color: #7b9c41;
   background-color: #ffffff;
 }
 .btn-info {
   color: #ffffff;
-  background-color: #6e50b4;
-  border-color: #6246a4;
+  background-color: #9c7357;
+  border-color: #8c674e;
 }
 .btn-info:hover,
 .btn-info:focus,
@@ -2961,8 +2961,8 @@ fieldset[disabled] .btn-success.active {
 .btn-info.active,
 .open > .dropdown-toggle.btn-info {
   color: #ffffff;
-  background-color: #583f92;
-  border-color: #493479;
+  background-color: #7b5b45;
+  border-color: #644a38;
 }
 .btn-info:active,
 .btn-info.active,
@@ -2987,17 +2987,17 @@ fieldset[disabled] .btn-info:active,
 .btn-info.disabled.active,
 .btn-info[disabled].active,
 fieldset[disabled] .btn-info.active {
-  background-color: #6e50b4;
-  border-color: #6246a4;
+  background-color: #9c7357;
+  border-color: #8c674e;
 }
 .btn-info .badge {
-  color: #6e50b4;
+  color: #9c7357;
   background-color: #ffffff;
 }
 .btn-warning {
   color: #ffffff;
-  background-color: #ff8232;
-  border-color: #ff7218;
+  background-color: #e3a14d;
+  border-color: #e09537;
 }
 .btn-warning:hover,
 .btn-warning:focus,
@@ -3006,8 +3006,8 @@ fieldset[disabled] .btn-info.active {
 .btn-warning.active,
 .open > .dropdown-toggle.btn-warning {
   color: #ffffff;
-  background-color: #fe6300;
-  border-color: #da5500;
+  background-color: #db8a22;
+  border-color: #bc761e;
 }
 .btn-warning:active,
 .btn-warning.active,
@@ -3032,17 +3032,17 @@ fieldset[disabled] .btn-warning:active,
 .btn-warning.disabled.active,
 .btn-warning[disabled].active,
 fieldset[disabled] .btn-warning.active {
-  background-color: #ff8232;
-  border-color: #ff7218;
+  background-color: #e3a14d;
+  border-color: #e09537;
 }
 .btn-warning .badge {
-  color: #ff8232;
+  color: #e3a14d;
   background-color: #ffffff;
 }
 .btn-danger {
   color: #ffffff;
-  background-color: #ff5a46;
-  border-color: #ff432c;
+  background-color: #7f528b;
+  border-color: #70497b;
 }
 .btn-danger:hover,
 .btn-danger:focus,
@@ -3051,8 +3051,8 @@ fieldset[disabled] .btn-warning.active {
 .btn-danger.active,
 .open > .dropdown-toggle.btn-danger {
   color: #ffffff;
-  background-color: #ff2d13;
-  border-color: #ee1a00;
+  background-color: #623f6b;
+  border-color: #4d3254;
 }
 .btn-danger:active,
 .btn-danger.active,
@@ -3077,15 +3077,15 @@ fieldset[disabled] .btn-danger:active,
 .btn-danger.disabled.active,
 .btn-danger[disabled].active,
 fieldset[disabled] .btn-danger.active {
-  background-color: #ff5a46;
-  border-color: #ff432c;
+  background-color: #7f528b;
+  border-color: #70497b;
 }
 .btn-danger .badge {
-  color: #ff5a46;
+  color: #7f528b;
   background-color: #ffffff;
 }
 .btn-link {
-  color: #41145a;
+  color: #758499;
   font-weight: normal;
   border-radius: 0;
 }
@@ -3106,7 +3106,7 @@ fieldset[disabled] .btn-link {
 }
 .btn-link:hover,
 .btn-link:focus {
-  color: #14061b;
+  color: #525e6f;
   text-decoration: underline;
   background-color: transparent;
 }
@@ -3247,7 +3247,7 @@ tbody.collapse.in {
   color: #ffffff;
   text-decoration: none;
   outline: 0;
-  background-color: #41145a;
+  background-color: #758499;
 }
 .dropdown-menu > .disabled > a,
 .dropdown-menu > .disabled > a:hover,
@@ -3678,7 +3678,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
 .nav .open > a:hover,
 .nav .open > a:focus {
   background-color: #eeeeee;
-  border-color: #41145a;
+  border-color: #758499;
 }
 .nav .nav-divider {
   height: 1px;
@@ -3771,7 +3771,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
 .nav-pills > li.active > a:hover,
 .nav-pills > li.active > a:focus {
   color: #ffffff;
-  background-color: #41145a;
+  background-color: #758499;
 }
 .nav-stacked > li {
   float: none;
@@ -4391,7 +4391,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
   padding: 6px 12px;
   line-height: 1.42857143;
   text-decoration: none;
-  color: #41145a;
+  color: #758499;
   background-color: #ffffff;
   border: 1px solid #dddddd;
   margin-left: -1px;
@@ -4411,7 +4411,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
 .pagination > li > span:hover,
 .pagination > li > a:focus,
 .pagination > li > span:focus {
-  color: #14061b;
+  color: #525e6f;
   background-color: #eeeeee;
   border-color: #dddddd;
 }
@@ -4423,8 +4423,8 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
 .pagination > .active > span:focus {
   z-index: 2;
   color: #ffffff;
-  background-color: #41145a;
-  border-color: #41145a;
+  background-color: #758499;
+  border-color: #758499;
   cursor: default;
 }
 .pagination > .disabled > span,
@@ -4539,39 +4539,39 @@ a.label:focus {
   background-color: #5e5e5e;
 }
 .label-primary {
-  background-color: #41145a;
+  background-color: #758499;
 }
 .label-primary[href]:hover,
 .label-primary[href]:focus {
-  background-color: #230b30;
+  background-color: #5d6b7e;
 }
 .label-success {
-  background-color: #33cc24;
+  background-color: #7b9c41;
 }
 .label-success[href]:hover,
 .label-success[href]:focus {
-  background-color: #28a11c;
+  background-color: #5f7832;
 }
 .label-info {
-  background-color: #6e50b4;
+  background-color: #9c7357;
 }
 .label-info[href]:hover,
 .label-info[href]:focus {
-  background-color: #583f92;
+  background-color: #7b5b45;
 }
 .label-warning {
-  background-color: #ff8232;
+  background-color: #e3a14d;
 }
 .label-warning[href]:hover,
 .label-warning[href]:focus {
-  background-color: #fe6300;
+  background-color: #db8a22;
 }
 .label-danger {
-  background-color: #ff5a46;
+  background-color: #7f528b;
 }
 .label-danger[href]:hover,
 .label-danger[href]:focus {
-  background-color: #ff2d13;
+  background-color: #623f6b;
 }
 .badge {
   display: inline-block;
@@ -4606,7 +4606,7 @@ a.badge:focus {
 }
 a.list-group-item.active > .badge,
 .nav-pills > .active > a > .badge {
-  color: #41145a;
+  color: #758499;
   background-color: #ffffff;
 }
 .nav-pills > li > a > .badge {
@@ -4671,7 +4671,7 @@ a.list-group-item.active > .badge,
 a.thumbnail:hover,
 a.thumbnail:focus,
 a.thumbnail.active {
-  border-color: #41145a;
+  border-color: #758499;
 }
 .thumbnail .caption {
   padding: 9px;
@@ -4709,48 +4709,48 @@ a.thumbnail.active {
   color: inherit;
 }
 .alert-success {
-  background-color: #cbf5c7;
-  border-color: #c2f1b1;
-  color: #33cc24;
+  background-color: #d9e6c3;
+  border-color: #7b9c41;
+  color: #638232;
 }
 .alert-success hr {
-  border-top-color: #b1ed9c;
+  border-top-color: #6d8a39;
 }
 .alert-success .alert-link {
-  color: #28a11c;
+  color: #475d24;
 }
 .alert-info {
-  background-color: #e4dff1;
-  border-color: #cac6e6;
-  color: #6e50b4;
+  background-color: #e8ded7;
+  border-color: #9c7357;
+  color: #826045;
 }
 .alert-info hr {
-  border-top-color: #bab4df;
+  border-top-color: #8c674e;
 }
 .alert-info .alert-link {
-  color: #583f92;
+  color: #614733;
 }
 .alert-warning {
-  background-color: #ff8232;
-  border-color: #ff4c18;
-  color: #8a6d3b;
+  background-color: #fffefd;
+  border-color: #e3a14d;
+  color: #bc8640;
 }
 .alert-warning hr {
-  border-top-color: #fe3900;
+  border-top-color: #e09537;
 }
 .alert-warning .alert-link {
-  color: #66512c;
+  color: #966b33;
 }
 .alert-danger {
-  background-color: #ffe2df;
-  border-color: #ffc5c9;
-  color: #ff5a46;
+  background-color: #c5a9cd;
+  border-color: #7f528b;
+  color: #694374;
 }
 .alert-danger hr {
-  border-top-color: #ffacb1;
+  border-top-color: #70497b;
 }
 .alert-danger .alert-link {
-  color: #ff2d13;
+  color: #4c3054;
 }
 @-webkit-keyframes progress-bar-stripes {
   from {
@@ -4785,7 +4785,7 @@ a.thumbnail.active {
   line-height: 20px;
   color: #ffffff;
   text-align: center;
-  background-color: #41145a;
+  background-color: #758499;
   -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
   -webkit-transition: width 0.6s ease;
@@ -4813,7 +4813,7 @@ a.thumbnail.active {
   box-shadow: none;
 }
 .progress-bar-success {
-  background-color: #33cc24;
+  background-color: #7b9c41;
 }
 .progress-striped .progress-bar-success {
   background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -4821,7 +4821,7 @@ a.thumbnail.active {
   background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
 }
 .progress-bar-info {
-  background-color: #6e50b4;
+  background-color: #9c7357;
 }
 .progress-striped .progress-bar-info {
   background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -4829,7 +4829,7 @@ a.thumbnail.active {
   background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
 }
 .progress-bar-warning {
-  background-color: #ff8232;
+  background-color: #e3a14d;
 }
 .progress-striped .progress-bar-warning {
   background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -4837,7 +4837,7 @@ a.thumbnail.active {
   background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
 }
 .progress-bar-danger {
-  background-color: #ff5a46;
+  background-color: #7f528b;
 }
 .progress-striped .progress-bar-danger {
   background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -4933,8 +4933,8 @@ a.list-group-item:focus {
 .list-group-item.active:focus {
   z-index: 2;
   color: #ffffff;
-  background-color: #41145a;
-  border-color: #41145a;
+  background-color: #758499;
+  border-color: #758499;
 }
 .list-group-item.active .list-group-item-heading,
 .list-group-item.active:hover .list-group-item-heading,
@@ -4950,95 +4950,95 @@ a.list-group-item:focus {
 .list-group-item.active .list-group-item-text,
 .list-group-item.active:hover .list-group-item-text,
 .list-group-item.active:focus .list-group-item-text {
-  color: #af5fdb;
+  color: #eaedf0;
 }
 .list-group-item-success {
-  color: #33cc24;
-  background-color: #cbf5c7;
+  color: #638232;
+  background-color: #d9e6c3;
 }
 a.list-group-item-success {
-  color: #33cc24;
+  color: #638232;
 }
 a.list-group-item-success .list-group-item-heading {
   color: inherit;
 }
 a.list-group-item-success:hover,
 a.list-group-item-success:focus {
-  color: #33cc24;
-  background-color: #b7f1b1;
+  color: #638232;
+  background-color: #cedeb1;
 }
 a.list-group-item-success.active,
 a.list-group-item-success.active:hover,
 a.list-group-item-success.active:focus {
   color: #fff;
-  background-color: #33cc24;
-  border-color: #33cc24;
+  background-color: #638232;
+  border-color: #638232;
 }
 .list-group-item-info {
-  color: #6e50b4;
-  background-color: #e4dff1;
+  color: #826045;
+  background-color: #e8ded7;
 }
 a.list-group-item-info {
-  color: #6e50b4;
+  color: #826045;
 }
 a.list-group-item-info .list-group-item-heading {
   color: inherit;
 }
 a.list-group-item-info:hover,
 a.list-group-item-info:focus {
-  color: #6e50b4;
-  background-color: #d6cdea;
+  color: #826045;
+  background-color: #dfd0c6;
 }
 a.list-group-item-info.active,
 a.list-group-item-info.active:hover,
 a.list-group-item-info.active:focus {
   color: #fff;
-  background-color: #6e50b4;
-  border-color: #6e50b4;
+  background-color: #826045;
+  border-color: #826045;
 }
 .list-group-item-warning {
-  color: #8a6d3b;
-  background-color: #ff8232;
+  color: #bc8640;
+  background-color: #fffefd;
 }
 a.list-group-item-warning {
-  color: #8a6d3b;
+  color: #bc8640;
 }
 a.list-group-item-warning .list-group-item-heading {
   color: inherit;
 }
 a.list-group-item-warning:hover,
 a.list-group-item-warning:focus {
-  color: #8a6d3b;
-  background-color: #ff7218;
+  color: #bc8640;
+  background-color: #fbf2e7;
 }
 a.list-group-item-warning.active,
 a.list-group-item-warning.active:hover,
 a.list-group-item-warning.active:focus {
   color: #fff;
-  background-color: #8a6d3b;
-  border-color: #8a6d3b;
+  background-color: #bc8640;
+  border-color: #bc8640;
 }
 .list-group-item-danger {
-  color: #ff5a46;
-  background-color: #ffe2df;
+  color: #694374;
+  background-color: #c5a9cd;
 }
 a.list-group-item-danger {
-  color: #ff5a46;
+  color: #694374;
 }
 a.list-group-item-danger .list-group-item-heading {
   color: inherit;
 }
 a.list-group-item-danger:hover,
 a.list-group-item-danger:focus {
-  color: #ff5a46;
-  background-color: #ffccc5;
+  color: #694374;
+  background-color: #ba99c3;
 }
 a.list-group-item-danger.active,
 a.list-group-item-danger.active:hover,
 a.list-group-item-danger.active:focus {
   color: #fff;
-  background-color: #ff5a46;
-  border-color: #ff5a46;
+  background-color: #694374;
+  border-color: #694374;
 }
 .list-group-item-heading {
   margin-top: 0;
@@ -5293,94 +5293,94 @@ a.list-group-item-danger.active:focus {
   border-bottom-color: #dddddd;
 }
 .panel-primary {
-  border-color: #41145a;
+  border-color: #758499;
 }
 .panel-primary > .panel-heading {
   color: #ffffff;
-  background-color: #41145a;
-  border-color: #41145a;
+  background-color: #758499;
+  border-color: #758499;
 }
 .panel-primary > .panel-heading + .panel-collapse > .panel-body {
-  border-top-color: #41145a;
+  border-top-color: #758499;
 }
 .panel-primary > .panel-heading .badge {
-  color: #41145a;
+  color: #758499;
   background-color: #ffffff;
 }
 .panel-primary > .panel-footer + .panel-collapse > .panel-body {
-  border-bottom-color: #41145a;
+  border-bottom-color: #758499;
 }
 .panel-success {
-  border-color: #c2f1b1;
+  border-color: #7b9c41;
 }
 .panel-success > .panel-heading {
-  color: #33cc24;
-  background-color: #cbf5c7;
-  border-color: #c2f1b1;
+  color: #638232;
+  background-color: #d9e6c3;
+  border-color: #7b9c41;
 }
 .panel-success > .panel-heading + .panel-collapse > .panel-body {
-  border-top-color: #c2f1b1;
+  border-top-color: #7b9c41;
 }
 .panel-success > .panel-heading .badge {
-  color: #cbf5c7;
-  background-color: #33cc24;
+  color: #d9e6c3;
+  background-color: #638232;
 }
 .panel-success > .panel-footer + .panel-collapse > .panel-body {
-  border-bottom-color: #c2f1b1;
+  border-bottom-color: #7b9c41;
 }
 .panel-info {
-  border-color: #cac6e6;
+  border-color: #9c7357;
 }
 .panel-info > .panel-heading {
-  color: #6e50b4;
-  background-color: #e4dff1;
-  border-color: #cac6e6;
+  color: #826045;
+  background-color: #e8ded7;
+  border-color: #9c7357;
 }
 .panel-info > .panel-heading + .panel-collapse > .panel-body {
-  border-top-color: #cac6e6;
+  border-top-color: #9c7357;
 }
 .panel-info > .panel-heading .badge {
-  color: #e4dff1;
-  background-color: #6e50b4;
+  color: #e8ded7;
+  background-color: #826045;
 }
 .panel-info > .panel-footer + .panel-collapse > .panel-body {
-  border-bottom-color: #cac6e6;
+  border-bottom-color: #9c7357;
 }
 .panel-warning {
-  border-color: #ff4c18;
+  border-color: #e3a14d;
 }
 .panel-warning > .panel-heading {
-  color: #8a6d3b;
-  background-color: #ff8232;
-  border-color: #ff4c18;
+  color: #bc8640;
+  background-color: #fffefd;
+  border-color: #e3a14d;
 }
 .panel-warning > .panel-heading + .panel-collapse > .panel-body {
-  border-top-color: #ff4c18;
+  border-top-color: #e3a14d;
 }
 .panel-warning > .panel-heading .badge {
-  color: #ff8232;
-  background-color: #8a6d3b;
+  color: #fffefd;
+  background-color: #bc8640;
 }
 .panel-warning > .panel-footer + .panel-collapse > .panel-body {
-  border-bottom-color: #ff4c18;
+  border-bottom-color: #e3a14d;
 }
 .panel-danger {
-  border-color: #ffc5c9;
+  border-color: #7f528b;
 }
 .panel-danger > .panel-heading {
-  color: #ff5a46;
-  background-color: #ffe2df;
-  border-color: #ffc5c9;
+  color: #694374;
+  background-color: #c5a9cd;
+  border-color: #7f528b;
 }
 .panel-danger > .panel-heading + .panel-collapse > .panel-body {
-  border-top-color: #ffc5c9;
+  border-top-color: #7f528b;
 }
 .panel-danger > .panel-heading .badge {
-  color: #ffe2df;
-  background-color: #ff5a46;
+  color: #c5a9cd;
+  background-color: #694374;
 }
 .panel-danger > .panel-footer + .panel-collapse > .panel-body {
-  border-bottom-color: #ffc5c9;
+  border-bottom-color: #7f528b;
 }
 .embed-responsive {
   position: relative;
@@ -6306,24 +6306,24 @@ body {
 }
 #shifts td.free {
   border: 1px solid #777777;
-  background-color: #ffe2df;
+  background-color: #c5a9cd;
 }
 a#shifts td.free:hover {
-  background-color: #ffb5ac;
+  background-color: #af89ba;
 }
 #shifts td.occupied {
   border: 1px solid #777777;
-  background-color: #cbf5c7;
+  background-color: #d9e6c3;
 }
 a#shifts td.occupied:hover {
-  background-color: #a3ed9c;
+  background-color: #c3d79f;
 }
 #shifts td.collides {
   border: 1px solid #777777;
-  background-color: #ff8232;
+  background-color: #fffefd;
 }
 a#shifts td.collides:hover {
-  background-color: #fe6300;
+  background-color: #f8e7d1;
 }
 #shifts td.own {
   border: 1px solid #777777;
diff --git a/themes/base.less b/themes/base.less
index b99a0855..10d30d2e 100644
--- a/themes/base.less
+++ b/themes/base.less
@@ -1,6 +1,6 @@
 @import "../vendor/bootstrap/less/bootstrap";
 
-@icon-font-path: "../vendor/bootstrap/fonts/";
+@icon-font-path: "../fonts/";
 
 body {
   padding-top: 50px;
diff --git a/themes/build-themes.sh b/themes/build-themes.sh
index 5260ecb4..5ea1d63b 100755
--- a/themes/build-themes.sh
+++ b/themes/build-themes.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-lessc theme0.less ../public/css/theme0.css
-lessc theme1.less ../public/css/theme1.css
-lessc theme2.less ../public/css/theme2.css
+lessc theme0.less > ../public/css/theme0.css
+lessc theme1.less > ../public/css/theme1.css
+lessc theme2.less > ../public/css/theme2.css
diff --git a/themes/theme2.less b/themes/theme2.less
index 8e49cffd..793c0d4e 100644
--- a/themes/theme2.less
+++ b/themes/theme2.less
@@ -1,25 +1,25 @@
 @import "../vendor/bootstrap/less/variables";
 
-@brand-primary:         #41145A;
-@brand-success:         #33CC24;
-@brand-info:            #6E50B4;
-@brand-warning:         #FF8232;
-@brand-danger:          #FF5A46;
+@brand-primary:         #758499;
+@brand-success:         #7b9c41;
+@brand-info:            #9c7357;
+@brand-warning:         #e3a14d;
+@brand-danger:          #7f528b;
 
-@state-success-text:             @brand-success;
+@state-success-text:             #638232;
 @state-success-bg:               lighten(@brand-success,40%);
-@state-success-border:           darken(spin(@state-success-bg, -10), 5%);
+@state-success-border:           @brand-success;
 
-@state-info-text:                @brand-info;
-@state-info-bg:                  lighten(@brand-info,40%);//#d9edf7;
-@state-info-border:              darken(spin(@state-info-bg, -10), 7%);
+@state-info-text:                #826045;
+@state-info-bg:                  lighten(@brand-info,40%);
+@state-info-border:              @brand-info;
 
-@state-warning-text:             #8a6d3b;
-@state-warning-bg:               @brand-warning;//#fcf8e3;
-@state-warning-border:           darken(spin(@state-warning-bg, -10), 5%);
+@state-warning-text:             #bc8640;
+@state-warning-bg:               lighten(@brand-warning,40%);
+@state-warning-border:           @brand-warning;
 
-@state-danger-text:              @brand-danger;
-@state-danger-bg:                lighten(@brand-danger,30%);//#f2dede;
-@state-danger-border:            darken(spin(@state-danger-bg, -10), 5%);
+@state-danger-text:              #694374;
+@state-danger-bg:                lighten(@brand-danger,30%);
+@state-danger-border:            @brand-danger;
 
 @import "base.less";