diff --git a/public/css/theme0.css b/public/css/theme0.css
index 10d00d39..b8678523 100644
--- a/public/css/theme0.css
+++ b/public/css/theme0.css
@@ -6305,21 +6305,21 @@ body {
   color: #777777;
 }
 #shifts td.free {
-  border: 1px solid #777777;
+  border: 1px solid #d9534f;
   background-color: #f2dede;
 }
 a#shifts td.free:hover {
   background-color: #e4b9b9;
 }
 #shifts td.occupied {
-  border: 1px solid #777777;
+  border: 1px solid #5cb85c;
   background-color: #dff0d8;
 }
 a#shifts td.occupied:hover {
   background-color: #c1e2b3;
 }
 #shifts td.collides {
-  border: 1px solid #777777;
+  border: 1px solid #f0ad4e;
   background-color: #fcf8e3;
 }
 a#shifts td.collides:hover {
diff --git a/public/css/theme1.css b/public/css/theme1.css
index 4e98dcc2..b61c83f3 100644
--- a/public/css/theme1.css
+++ b/public/css/theme1.css
@@ -6328,21 +6328,21 @@ body {
   color: #888888;
 }
 #shifts td.free {
-  border: 1px solid #888888;
+  border: 1px solid #d9534f;
   background-color: #d9534f;
 }
 a#shifts td.free:hover {
   background-color: #c9302c;
 }
 #shifts td.occupied {
-  border: 1px solid #888888;
+  border: 1px solid #5cb85c;
   background-color: #5cb85c;
 }
 a#shifts td.occupied:hover {
   background-color: #449d44;
 }
 #shifts td.collides {
-  border: 1px solid #888888;
+  border: 1px solid #f0ad4e;
   background-color: #f0ad4e;
 }
 a#shifts td.collides:hover {
diff --git a/public/css/theme2.css b/public/css/theme2.css
index cb19eb09..77fc32ad 100644
--- a/public/css/theme2.css
+++ b/public/css/theme2.css
@@ -896,12 +896,12 @@ textarea {
   line-height: inherit;
 }
 a {
-  color: #758499;
+  color: #58585a;
   text-decoration: none;
 }
 a:hover,
 a:focus {
-  color: #525e6f;
+  color: #323233;
   text-decoration: underline;
 }
 a:focus {
@@ -1103,7 +1103,7 @@ small,
 }
 mark,
 .mark {
-  background-color: #fffefd;
+  background-color: #ffffff;
   padding: .2em;
 }
 .text-left {
@@ -1171,28 +1171,28 @@ a.bg-primary:hover {
   background-color: #5d6b7e;
 }
 .bg-success {
-  background-color: #d9e6c3;
+  background-color: #f0f5e7;
 }
 a.bg-success:hover {
-  background-color: #c3d79f;
+  background-color: #d9e6c3;
 }
 .bg-info {
-  background-color: #e8ded7;
+  background-color: #fbf9f7;
 }
 a.bg-info:hover {
-  background-color: #d6c3b6;
+  background-color: #e8ded7;
 }
 .bg-warning {
-  background-color: #fffefd;
+  background-color: #ffffff;
 }
 a.bg-warning:hover {
-  background-color: #f8e7d1;
+  background-color: #e6e6e6;
 }
 .bg-danger {
-  background-color: #c5a9cd;
+  background-color: #f1eaf2;
 }
 a.bg-danger:hover {
-  background-color: #af89ba;
+  background-color: #dbcadf;
 }
 .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: #d9e6c3;
+  background-color: #f0f5e7;
 }
 .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: #cedeb1;
+  background-color: #e5eed5;
 }
 .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: #e8ded7;
+  background-color: #fbf9f7;
 }
 .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: #dfd0c6;
+  background-color: #f2ebe7;
 }
 .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: #fffefd;
+  background-color: #ffffff;
 }
 .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: #fbf2e7;
+  background-color: #f2f2f2;
 }
 .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: #c5a9cd;
+  background-color: #f1eaf2;
 }
 .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: #ba99c3;
+  background-color: #e6dae9;
 }
 .table-responsive {
   overflow-x: auto;
@@ -2598,7 +2598,7 @@ select[multiple].form-group-lg .form-control {
 .has-success .input-group-addon {
   color: #638232;
   border-color: #638232;
-  background-color: #d9e6c3;
+  background-color: #f0f5e7;
 }
 .has-success .form-control-feedback {
   color: #638232;
@@ -2628,7 +2628,7 @@ select[multiple].form-group-lg .form-control {
 .has-warning .input-group-addon {
   color: #bc8640;
   border-color: #bc8640;
-  background-color: #fffefd;
+  background-color: #ffffff;
 }
 .has-warning .form-control-feedback {
   color: #bc8640;
@@ -2658,7 +2658,7 @@ select[multiple].form-group-lg .form-control {
 .has-error .input-group-addon {
   color: #694374;
   border-color: #694374;
-  background-color: #c5a9cd;
+  background-color: #f1eaf2;
 }
 .has-error .form-control-feedback {
   color: #694374;
@@ -3085,7 +3085,7 @@ fieldset[disabled] .btn-danger.active {
   background-color: #ffffff;
 }
 .btn-link {
-  color: #758499;
+  color: #58585a;
   font-weight: normal;
   border-radius: 0;
 }
@@ -3106,7 +3106,7 @@ fieldset[disabled] .btn-link {
 }
 .btn-link:hover,
 .btn-link:focus {
-  color: #525e6f;
+  color: #323233;
   text-decoration: underline;
   background-color: transparent;
 }
@@ -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: #758499;
+  border-color: #58585a;
 }
 .nav .nav-divider {
   height: 1px;
@@ -4391,7 +4391,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
   padding: 6px 12px;
   line-height: 1.42857143;
   text-decoration: none;
-  color: #758499;
+  color: #58585a;
   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: #525e6f;
+  color: #323233;
   background-color: #eeeeee;
   border-color: #dddddd;
 }
@@ -4606,7 +4606,7 @@ a.badge:focus {
 }
 a.list-group-item.active > .badge,
 .nav-pills > .active > a > .badge {
-  color: #758499;
+  color: #58585a;
   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: #758499;
+  border-color: #58585a;
 }
 .thumbnail .caption {
   padding: 9px;
@@ -4709,7 +4709,7 @@ a.thumbnail.active {
   color: inherit;
 }
 .alert-success {
-  background-color: #d9e6c3;
+  background-color: #f0f5e7;
   border-color: #7b9c41;
   color: #638232;
 }
@@ -4720,7 +4720,7 @@ a.thumbnail.active {
   color: #475d24;
 }
 .alert-info {
-  background-color: #e8ded7;
+  background-color: #fbf9f7;
   border-color: #9c7357;
   color: #826045;
 }
@@ -4731,7 +4731,7 @@ a.thumbnail.active {
   color: #614733;
 }
 .alert-warning {
-  background-color: #fffefd;
+  background-color: #ffffff;
   border-color: #e3a14d;
   color: #bc8640;
 }
@@ -4742,7 +4742,7 @@ a.thumbnail.active {
   color: #966b33;
 }
 .alert-danger {
-  background-color: #c5a9cd;
+  background-color: #f1eaf2;
   border-color: #7f528b;
   color: #694374;
 }
@@ -4954,7 +4954,7 @@ a.list-group-item:focus {
 }
 .list-group-item-success {
   color: #638232;
-  background-color: #d9e6c3;
+  background-color: #f0f5e7;
 }
 a.list-group-item-success {
   color: #638232;
@@ -4965,7 +4965,7 @@ a.list-group-item-success .list-group-item-heading {
 a.list-group-item-success:hover,
 a.list-group-item-success:focus {
   color: #638232;
-  background-color: #cedeb1;
+  background-color: #e5eed5;
 }
 a.list-group-item-success.active,
 a.list-group-item-success.active:hover,
@@ -4976,7 +4976,7 @@ a.list-group-item-success.active:focus {
 }
 .list-group-item-info {
   color: #826045;
-  background-color: #e8ded7;
+  background-color: #fbf9f7;
 }
 a.list-group-item-info {
   color: #826045;
@@ -4987,7 +4987,7 @@ a.list-group-item-info .list-group-item-heading {
 a.list-group-item-info:hover,
 a.list-group-item-info:focus {
   color: #826045;
-  background-color: #dfd0c6;
+  background-color: #f2ebe7;
 }
 a.list-group-item-info.active,
 a.list-group-item-info.active:hover,
@@ -4998,7 +4998,7 @@ a.list-group-item-info.active:focus {
 }
 .list-group-item-warning {
   color: #bc8640;
-  background-color: #fffefd;
+  background-color: #ffffff;
 }
 a.list-group-item-warning {
   color: #bc8640;
@@ -5009,7 +5009,7 @@ a.list-group-item-warning .list-group-item-heading {
 a.list-group-item-warning:hover,
 a.list-group-item-warning:focus {
   color: #bc8640;
-  background-color: #fbf2e7;
+  background-color: #f2f2f2;
 }
 a.list-group-item-warning.active,
 a.list-group-item-warning.active:hover,
@@ -5020,7 +5020,7 @@ a.list-group-item-warning.active:focus {
 }
 .list-group-item-danger {
   color: #694374;
-  background-color: #c5a9cd;
+  background-color: #f1eaf2;
 }
 a.list-group-item-danger {
   color: #694374;
@@ -5031,7 +5031,7 @@ a.list-group-item-danger .list-group-item-heading {
 a.list-group-item-danger:hover,
 a.list-group-item-danger:focus {
   color: #694374;
-  background-color: #ba99c3;
+  background-color: #e6dae9;
 }
 a.list-group-item-danger.active,
 a.list-group-item-danger.active:hover,
@@ -5315,14 +5315,14 @@ a.list-group-item-danger.active:focus {
 }
 .panel-success > .panel-heading {
   color: #638232;
-  background-color: #d9e6c3;
+  background-color: #f0f5e7;
   border-color: #7b9c41;
 }
 .panel-success > .panel-heading + .panel-collapse > .panel-body {
   border-top-color: #7b9c41;
 }
 .panel-success > .panel-heading .badge {
-  color: #d9e6c3;
+  color: #f0f5e7;
   background-color: #638232;
 }
 .panel-success > .panel-footer + .panel-collapse > .panel-body {
@@ -5333,14 +5333,14 @@ a.list-group-item-danger.active:focus {
 }
 .panel-info > .panel-heading {
   color: #826045;
-  background-color: #e8ded7;
+  background-color: #fbf9f7;
   border-color: #9c7357;
 }
 .panel-info > .panel-heading + .panel-collapse > .panel-body {
   border-top-color: #9c7357;
 }
 .panel-info > .panel-heading .badge {
-  color: #e8ded7;
+  color: #fbf9f7;
   background-color: #826045;
 }
 .panel-info > .panel-footer + .panel-collapse > .panel-body {
@@ -5351,14 +5351,14 @@ a.list-group-item-danger.active:focus {
 }
 .panel-warning > .panel-heading {
   color: #bc8640;
-  background-color: #fffefd;
+  background-color: #ffffff;
   border-color: #e3a14d;
 }
 .panel-warning > .panel-heading + .panel-collapse > .panel-body {
   border-top-color: #e3a14d;
 }
 .panel-warning > .panel-heading .badge {
-  color: #fffefd;
+  color: #ffffff;
   background-color: #bc8640;
 }
 .panel-warning > .panel-footer + .panel-collapse > .panel-body {
@@ -5369,14 +5369,14 @@ a.list-group-item-danger.active:focus {
 }
 .panel-danger > .panel-heading {
   color: #694374;
-  background-color: #c5a9cd;
+  background-color: #f1eaf2;
   border-color: #7f528b;
 }
 .panel-danger > .panel-heading + .panel-collapse > .panel-body {
   border-top-color: #7f528b;
 }
 .panel-danger > .panel-heading .badge {
-  color: #c5a9cd;
+  color: #f1eaf2;
   background-color: #694374;
 }
 .panel-danger > .panel-footer + .panel-collapse > .panel-body {
@@ -6305,25 +6305,25 @@ body {
   color: #777777;
 }
 #shifts td.free {
-  border: 1px solid #777777;
-  background-color: #c5a9cd;
+  border: 1px solid #7f528b;
+  background-color: #f1eaf2;
 }
 a#shifts td.free:hover {
-  background-color: #af89ba;
+  background-color: #dbcadf;
 }
 #shifts td.occupied {
-  border: 1px solid #777777;
-  background-color: #d9e6c3;
+  border: 1px solid #7b9c41;
+  background-color: #f0f5e7;
 }
 a#shifts td.occupied:hover {
-  background-color: #c3d79f;
+  background-color: #d9e6c3;
 }
 #shifts td.collides {
-  border: 1px solid #777777;
-  background-color: #fffefd;
+  border: 1px solid #e3a14d;
+  background-color: #ffffff;
 }
 a#shifts td.collides:hover {
-  background-color: #f8e7d1;
+  background-color: #e6e6e6;
 }
 #shifts td.own {
   border: 1px solid #777777;
diff --git a/themes/base.less b/themes/base.less
index 10d30d2e..83602c3b 100644
--- a/themes/base.less
+++ b/themes/base.less
@@ -13,15 +13,15 @@ body {
 #shifts {
   td {
     &.free {
-      border: 1px solid @gray-light;
+      border: 1px solid @brand-danger;
       .bg-danger();
     }
     &.occupied {
-      border: 1px solid @gray-light;
+      border: 1px solid @brand-success;
       .bg-success();
     }
     &.collides {
-      border: 1px solid @gray-light;
+      border: 1px solid @brand-warning;
       .bg-warning();
     }
     &.own {
diff --git a/themes/theme2.less b/themes/theme2.less
index 793c0d4e..d5cac763 100644
--- a/themes/theme2.less
+++ b/themes/theme2.less
@@ -6,20 +6,22 @@
 @brand-warning:         #e3a14d;
 @brand-danger:          #7f528b;
 
+@link-color:            #58585a;
+
 @state-success-text:             #638232;
-@state-success-bg:               lighten(@brand-success,40%);
+@state-success-bg:               lighten(@brand-success,50%);
 @state-success-border:           @brand-success;
 
 @state-info-text:                #826045;
-@state-info-bg:                  lighten(@brand-info,40%);
+@state-info-bg:                  lighten(@brand-info,50%);
 @state-info-border:              @brand-info;
 
 @state-warning-text:             #bc8640;
-@state-warning-bg:               lighten(@brand-warning,40%);
+@state-warning-bg:               lighten(@brand-warning,50%);
 @state-warning-border:           @brand-warning;
 
 @state-danger-text:              #694374;
-@state-danger-bg:                lighten(@brand-danger,30%);
+@state-danger-bg:                lighten(@brand-danger,50%);
 @state-danger-border:            @brand-danger;
 
 @import "base.less";