diff --git a/README.md b/README.md
index d963986..1588629 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
 # Re2o-themes
 
-This repository contains the source file for [Re2o](https://gitlab.federez.net/re2o/re2o) themes. They are written using [sass](https://sass-lang.com/) to make them easier to customize.
+This repository contains the source files for [Re2o](https://gitlab.federez.net/re2o/re2o) themes. They are written using [sass](https://sass-lang.com) to make them easier to customize.
 
-Checkout each theme's folder for more details and a preview of the theme. Also see [this page](https://gitlab.federez.net/re2o/re2o/-/wikis/User%20Documentation/Add-a-custom-theme) to learn how to install themes.
+Checkout each theme's folder for more details and a preview. Also see [this page](https://gitlab.federez.net/re2o/re2o/-/wikis/User%20Documentation/Add-a-custom-theme) to learn how to install themes.
 
 ## Dependencies
 
-To compile the `.scss` files, install the following packages for Debian:
+To compile the `.scss` files, install the following packages (for Debian):
 
 ```bash
 $ sudo apt install python3-pyscss yui-compressor
diff --git a/default-dark/README.md b/default-dark/README.md
index e85f841..c72d2c6 100644
--- a/default-dark/README.md
+++ b/default-dark/README.md
@@ -2,10 +2,14 @@
 
 This theme is inspired by the [darkly theme for bootstrap](https://bootswatch.com/darkly). However, it is simplified and customized for Re2o.
 
-This theme is supposed to be match the default theme as much as possible but with dark colors: it shouldn't impact padding, margins, behaviors...
+This theme is supposed to match the default theme as much as possible, but with dark colors: it shouldn't impact padding, margins, behaviors...
 
 ## Preview
 
 ![Homepage preview](img/default-dark-home.png)
 
 ![User page preview](img/default-dark-user.png)
+
+![Room list preview](img/default-dark-rooms.png)
+
+![Modal preview](img/default-dark-modal.png)
diff --git a/default-dark/default-dark-variables.scss b/default-dark/default-dark-variables.scss
index b08fa4f..00803fa 100644
--- a/default-dark/default-dark-variables.scss
+++ b/default-dark/default-dark-variables.scss
@@ -1,202 +1,139 @@
 // Generic
-$success-color: #009670;
-$success-alt-color: #03775a;
-$success-focus-color: #03775a;
-$success-link-color: #e6e6e6;
-
-$info-color: #2384c6;
-$info-alt-color: #217dbb;
-$info-focus-color: #217dbb;
-$info-link-color: #e6e6e6;
-
-$warning-color: #df8900;
-$warning-alt-color: #c77b00;
-$warning-focus-color: #c87f0a;
-$warning-link-color: #e6e6e6;
-
-$danger-color: #e12e1c;
-$danger-alt-color: #e43725;
-$danger-focus-color: #d62c1a;
-$danger-link-color: #e6e6e6;
-
 $primary-color: #375a7f;
-$primary-focus-color: #28415b;
-$primary-active-color: #375a7f;
-$primary-active-focus-color: #1d2f43;
-$primary-disabled: #375a7f;
+$primary-focus-color: #2b4764;
 
+$secondary-color: #444444;
+$secondary-focus-color: #2C2C2C;
 
-// Body
-$body-text-color: #ffffff;
-$body-background-color: #222222;
+$success-color: #00bc8c;
+$success-focus-color: #009670;
+
+$info-color: #3498db;
+$info-focus-color: #2384c6;
+
+$warning-color: #f39c12;
+$warning-focus-color: #d4860b;
+
+$danger-color: #e74c3c;
+$danger-focus-color: #e12e1c;
+
+$light-color: #adb5bd;
+$light-focus-color: #9fa8b2;
+
+$dark-color: #303030;
+$dark-focus-color: #232323;
+
+$background-color: #222222;
+$background-alt-color: #303030;
+
+$border-color: #454545;
 
 
 // Text
-$text-standard-color: #ffffff; // text in buttons etc.
-$text-alt-color: #303030;  // text on hover
-$text-disabled-color: #999999;
+$text-color: #ffffff;
+$text-alt-color: #222222;
+$text-focus-color: #303030;
 
-$text-primary-color: #375a7f;  // text in .*-primary
-$text-primary-focus-color: #28415b;
+$text-primary-color: #375a7f;
+$text-secondary-color: #444444;
+$text-muted-color: #888888;
 $text-help-color: #aaaaaa;
-$text-muted-color: #999999;
 
 $link-color: #337ab7;
 $link-focus-color: #49a8e8;
 
 
+// Forms
+$forms-text-color: #555555;
+$forms-background-color: #ffffff;
+
+
+// Django autocomplete light
+$dal-result-focus-background-color: #5897fb;
+
+
 // Navbar
-$navbar-text-color: #d6d6d6;
+$navbar-text-color: rgba($text-color, 0.6);
+$navbar-text-focus-color: $text-color;
+$navbar-text-disabled-color: rgba($text-color, 0.4);
 $navbar-brand-color: #ffffff;
+
 $navbar-background-color: #222222;
+$navbar-background-active-color: #080808;
 $navbar-border-color: transparent;
 
-$navbar-focus-text-color: #ffffff;
-$navbar-active-text-color: #d6d6d6;
-$navbar-active-background-color: #28415b;
-$navbar-open-text-color: #ffffff;
-$navbar-open-background-color: #d6d6d6;
-$navbar-disabled-text-color: #cccccc;
-
-$secondary-navbar-text-color: #d6d6d6;
 $secondary-navbar-background-color: #333333;
 
 
-// Menus
-$dropdown-menu-text-color: #ebebeb;
-$dropdown-menu-background-color: #303030;
-$dropdown-menu-focus-text-color: #ffffff;
-$dropdown-menu-focus-background-color: #375a7f;
-$dropdown-menu-divider-color: #454545;
-$dropdown-menu-disabled-color: #999999;
+// Dropdown
+$dropdown-background-focus-color: #375a7f;
 
 
-// Buttons
-$button-default-color: #454545;
-$button-default-focus-color: #2c2c2c;
-$button-default-active-color: #272727;
-$button-default-active-focus-color: #1a1a1a;
-$button-default-disabled-focus-color: #454545;
-$button-default-badge-text-color: #454545;
-$button-default-badge-background-color: #ffffff;
+// Alerts
+$alert-link-color: $text-color;
 
-$button-success-active-focus-color: #00654b;
-$button-success-disabled-focus-color: #49a8e8;
-$button-success-badge-text-color: #49a8e8;
-$button-success-badge-background-color: #ffffff;
 
-$button-info-active-focus-color: #1c699d;
-$button-info-disabled-focus-color: #285879;
-$button-info-badge-text-color: #3498db;
-$button-info-badge-background-color: #ffffff;
-
-$button-warning-active-focus-color: #a66908;
-$button-warning-disabled-focus-color: #df8900;
-$button-warning-badge-text-color: #df8900;
-$button-warning-badge-background-color: #ffffff;
-
-$button-danger-active-focus-color: #b62516;
-$button-danger-disabled-focus-color: #e12e1c;
-$button-danger-badge-text-color: #e12e1c;
-$button-danger-badge-background-color: #ffffff;
+// Pagination
+$pagination-border-color: #505050;
 
 
 // Panels
 $panel-background-color: #303030;
-$panel-border-color: #454545;
-$panel-default-background-color: #454545; // .panel-default elements
-$panel-footer-background-color: #454545;
-$panel-heading-background-color: #303030;
+$panel-background-focus-color: #505050;
+$panel-text-focus-color: $text-color;
+$panel-border-color: $border-color;
+
+$panel-heading-background-color: #353535;
+$panel-footer-background-color: #353535;
+
 $panel-badge-text-color: #303030;
 $panel-badge-background-color: #ffffff;
 
-$thumbnail-text-color: #ffffff;
-$thumbnail-background-color: #222222;
-$thumbnail-border-color: #454545;
-$thumbnail-focus-border-color: #49a8e8;
+
+// Cards
+$thumbnail-background-color: transparent;
+$thumbnail-border-color: $border-color;
+
+
+// Modals
+$modal-background-color: $panel-background-color;
+$modal-border-color: $border-color;
+$modal-heading-background-color: $modal-background-color;
+$modal-heading-border-color: $border-color;
 
 
 // Tables
-$table-text-color: #999999;
-$table-background-color: #222222;
-$table-alt-background-color: #3d3d3d;  // Odd elements have this color
-$table-border-color: #454545;
-$table-focus-background-color: #454545;
-$table-active-background-color: #454545;
-$table-active-focus-background-color: #393838;
+$table-background-color: transparent;
+$table-alt-background-color: $secondary-focus-color;
 
-$table-success-background-color: #407293;
-$table-success-focus-background-color: #00a379;
+$table-default-background-color: #222222;
+$table-default-focus-background-color: $table-default-background-color;
 
-$table-info-background-color: #3498db;
-$table-info-focus-background-color: #258cd1;
+$table-primary-background-color: $primary-color;
+$table-primary-focus-background-color: $primary-focus-color;
 
-$table-warning-background-color: #df8900;
-$table-warning-focus-background-color: #c77b00;
+$table-secondary-background-color: $secondary-color;
+$table-secondary-focus-background-color: $secondary-focus-color;
 
-$table-danger-background-color: #86413a;
-$table-danger-focus-background-color: #e43725;
+$table-success-background-color: $success-color;
+$table-success-focus-background-color: $success-focus-color;
+
+$table-info-background-color: $info-color;
+$table-info-focus-background-color: $info-focus-color;
+
+$table-warning-background-color: $warning-color;
+$table-warning-focus-background-color: $warning-focus-color;
+
+$table-danger-background-color: $danger-color;
+$table-danger-focus-background-color: $danger-focus-color;
+
+$table-light-background-color: $light-color;
+$table-light-focus-background-color: $light-focus-color;
+
+$table-dark-background-color: $dark-color;
+$table-dark-focus-background-color: $dark-focus-color;
 
 
 // Lists
-$list-background-color: #303030;
-$list-disabled-text-color: #999999;
-$list-disabled-background-color: #ebebeb;
-$list-disabled-focus-text-color: #999999;
-$list-active-text-color: #a8c0da;
-$list-active-background-color: #375a7f;
-$list-active-border-color: #375a7f;
-
-$list-badge-text-color: #375a7f;
-$list-badge-background-color: #ffffff;
-
-$list-link-text-color: #49a8e8;
-$list-link-focus-text-color: #49a8e8;
-$list-heading-text-color: #0bcb9a;
-
-$list-success-link-background-color: #49a8e8;
-$list-success-link-focus-background-color: #00a379;
-$list-success-active-focus-background-color: #ffffff;
-
-$list-info-link-background-color: #2384c6;
-$list-info-link-focus-background-color: #258cd1;
-$list-info-active-focus-background-color: #ffffff;
-
-$list-warning-link-background-color: #df8900;
-$list-warning-link-focus-background-color: #c77b00;
-$list-warning-active-focus-background-color: #ffffff;
-
-$list-danger-link-background-color: #e12e1c;
-$list-danger-link-focus-background-color: #e43725;
-$list-danger-active-focus-background-color: #ffffff;
-
-
-// Pagination
-$pagination-background-color: #2b2b2b;
-$pagination-border-color: #454545;
-$pagination-focus-background-color: #3d3d3d;
-$pagination-focus-border-color: #454545;
-$pagination-active-background-color: #375a7f;
-$pagination-active-border-color: #454545;
-$pagination-disabled-text-color: #454545;
-$pagination-disabled-background-color: #303030;
-$pagination-disabled-border-color: #454545;
-
-
-// Forms
-$forms-text-color: #555555;
-$forms-background-color: #ffffff;
-$forms-border-color: #cccccc;
-
-
-// Django autocomplete light
-$dal-text-color: #555555;
-$dal-background-color: #ffffff;
-$dal-border-color: #cccccc;
-
-$dal-result-focus-text-color: #ffffff;
-$dal-result-focus-background-color: #5897fb;
-
-$dal-input-text-color: #000000;
-$dal-input-background-color: #ffffff;
-$dal-input-border-color: #cccccc;
+$list-background-color: $background-alt-color;
+$list-border-color: transparent;
diff --git a/default-dark/img/default-dark-home.png b/default-dark/img/default-dark-home.png
index 5551038..320a91d 100644
Binary files a/default-dark/img/default-dark-home.png and b/default-dark/img/default-dark-home.png differ
diff --git a/default-dark/img/default-dark-modal.png b/default-dark/img/default-dark-modal.png
new file mode 100644
index 0000000..32d018e
Binary files /dev/null and b/default-dark/img/default-dark-modal.png differ
diff --git a/default-dark/img/default-dark-rooms.png b/default-dark/img/default-dark-rooms.png
new file mode 100644
index 0000000..58c5c8f
Binary files /dev/null and b/default-dark/img/default-dark-rooms.png differ
diff --git a/default-dark/img/default-dark-user.png b/default-dark/img/default-dark-user.png
index 421d890..487af80 100644
Binary files a/default-dark/img/default-dark-user.png and b/default-dark/img/default-dark-user.png differ
diff --git a/template-variables.scss b/template-variables.scss
index cfbc39f..2fc50b1 100644
--- a/template-variables.scss
+++ b/template-variables.scss
@@ -3,131 +3,121 @@
  */
 
 // Generic
-$success-color: none;
-$success-alt-color: none;
-$success-focus-color: none;
-$success-link-color: none;
-
-$info-color: none;
-$info-alt-color: none;
-$info-focus-color: none;
-$info-link-color: none;
-
-$warning-color: none;
-$warning-alt-color: none;
-$warning-focus-color: none;
-$warning-link-color: none;
-
-$danger-color: none;
-$danger-alt-color: none;
-$danger-focus-color: none;
-$danger-link-color: none;
-
 $primary-color: none;
 $primary-focus-color: none;
-$primary-active-color: none;
-$primary-active-focus-color: none;
-$primary-disabled: none;
 
+$secondary-color: none;
+$secondary-focus-color: none;
 
-// Body
-$body-text-color: none;
-$body-background-color: none;
+$success-color: none;
+$success-focus-color: none;
+
+$info-color: none;
+$info-focus-color: none;
+
+$warning-color: none;
+$warning-focus-color: none;
+
+$danger-color: none;
+$danger-focus-color: none;
+
+$light-color: none;
+$light-focus-color: none;
+
+$dark-color: none;
+$dark-focus-color: none;
+
+$background-color: none;
+$background-alt-color: none;
+
+$border-color: none;
 
 
 // Text
-$text-standard-color: none; // text in buttons etc.
-$text-alt-color: none;  // text on hover
-$text-disabled-color: none;
+$text-color: none;
+$text-alt-color: none;
+$text-focus-color: none;
 
-$text-primary-color: none;  // text in .*-primary
-$text-primary-focus-color: none;
-$text-help-color: none;
+$text-primary-color: none;
+$text-secondary-color: none;
 $text-muted-color: none;
+$text-help-color: none;
 
 $link-color: none;
 $link-focus-color: none;
 
 
+// Forms
+$forms-text-color: none;
+$forms-background-color: none;
+
+
+// Django autocomplete light
+$dal-result-focus-background-color: none;
+
+
 // Navbar
 $navbar-text-color: none;
+$navbar-text-focus-color: none;
+$navbar-text-disabled-color: none;
 $navbar-brand-color: none;
+
 $navbar-background-color: none;
-$navbar-border-color:none;
+$navbar-background-active-color: none;
+$navbar-border-color: transparent;
 
-$navbar-focus-text-color: none;
-$navbar-active-text-color: none;
-$navbar-active-background-color: none;
-$navbar-open-text-color: none;
-$navbar-open-background-color: none;
-$navbar-disabled-text-color: none;
-
-$secondary-navbar-text-color: none;
 $secondary-navbar-background-color: none;
 
 
-// Menus
-$dropdown-menu-text-color: none;
-$dropdown-menu-background-color: none;
-$dropdown-menu-focus-text-color: none;
-$dropdown-menu-focus-background-color: none;
-$dropdown-menu-divider-color: none;
-$dropdown-menu-disabled-color: none;
+// Dropdown
+$dropdown-background-focus-color: none;
 
 
-// Buttons
-$button-default-color: none;
-$button-default-focus-color: none;
-$button-default-active-color: none;
-$button-default-active-focus-color: none;
-$button-default-disabled-focus-color: none;
-$button-default-badge-text-color: none;
-$button-default-badge-background-color: none;
+// Alerts
+$alert-link-color: none;
 
-$button-success-active-focus-color: none;
-$button-success-disabled-focus-color: none;
-$button-success-badge-text-color: none;
-$button-success-badge-background-color: none;
 
-$button-info-active-focus-color: none;
-$button-info-disabled-focus-color: none;
-$button-info-badge-text-color: none;
-$button-info-badge-background-color: none;
-
-$button-warning-active-focus-color: none;
-$button-warning-disabled-focus-color: none;
-$button-warning-badge-text-color: none;
-$button-warning-badge-background-color: none;
-
-$button-danger-active-focus-color: none;
-$button-danger-disabled-focus-color: none;
-$button-danger-badge-text-color: none;
-$button-danger-badge-background-color: none;
+// Pagination
+$pagination-border-color: none;
 
 
 // Panels
 $panel-background-color: none;
+$panel-background-focus-color: none;
+$panel-text-focus-color: none;
 $panel-border-color: none;
-$panel-default-background-color: none; // .panel-default elements
-$panel-footer-background-color: none;
+
 $panel-heading-background-color: none;
+$panel-footer-background-color: none;
+
 $panel-badge-text-color: none;
 $panel-badge-background-color: none;
 
-$thumbnail-text-color: none;
-$thumbnail-background-color: none;
+
+// Cards
+$thumbnail-background-color: transparent;
 $thumbnail-border-color: none;
-$thumbnail-focus-border-color: none;
+
+
+// Modals
+$modal-background-color: none;
+$modal-border-color: none;
+$modal-heading-background-color: none;
+$modal-heading-border-color: none;
 
 
 // Tables
-$table-text-color: none;
-$table-background-color: none;
-$table-alt-background-color: none;  // Odd elements have this color
-$table-border-color: none;
-$table-focus-background-color: none;
-$table-active-background-color: none;
-$table-active-focus-background-color: none;
+$table-background-color: transparent;
+$table-alt-background-color: none;
+
+$table-default-background-color: none;
+$table-default-focus-background-color: none;
+
+$table-primary-background-color: none;
+$table-primary-focus-background-color: none;
+
+$table-secondary-background-color: none;
+$table-secondary-focus-background-color: none;
 
 $table-success-background-color: none;
 $table-success-focus-background-color: none;
@@ -141,66 +131,13 @@ $table-warning-focus-background-color: none;
 $table-danger-background-color: none;
 $table-danger-focus-background-color: none;
 
+$table-light-background-color: none;
+$table-light-focus-background-color: none;
+
+$table-dark-background-color: none;
+$table-dark-focus-background-color: none;
+
 
 // Lists
 $list-background-color: none;
-$list-disabled-text-color: none;
-$list-disabled-background-color: none;
-$list-disabled-focus-text-color: none;
-$list-active-text-color: none;
-$list-active-background-color: none;
-$list-active-border-color: none;
-
-$list-badge-text-color: none;
-$list-badge-background-color: none;
-
-$list-link-text-color: none;
-$list-link-focus-text-color: none;
-$list-heading-text-color: none;
-
-$list-success-link-background-color: none;
-$list-success-link-focus-background-color: none;
-$list-success-active-focus-background-color: none;
-
-$list-info-link-background-color: none;
-$list-info-link-focus-background-color: none;
-$list-info-active-focus-background-color: none;
-
-$list-warning-link-background-color: none;
-$list-warning-link-focus-background-color: none;
-$list-warning-active-focus-background-color: none;
-
-$list-danger-link-background-color: none;
-$list-danger-link-focus-background-color: none;
-$list-danger-active-focus-background-color: none;
-
-
-// Pagination
-$pagination-background-color: none;
-$pagination-border-color: none;
-$pagination-focus-background-color: none;
-$pagination-focus-border-color: none;
-$pagination-active-background-color: none;
-$pagination-active-border-color: none;
-$pagination-disabled-text-color: none;
-$pagination-disabled-background-color: none;
-$pagination-disabled-border-color: none;
-
-
-// Forms
-$forms-text-color: none;
-$forms-background-color: none;
-$forms-border-color: none;
-
-
-// Django autocomplete light
-$dal-text-color: none;
-$dal-background-color: none;
-$dal-border-color: none;
-
-$dal-result-focus-text-color: none;
-$dal-result-focus-background-color: none;
-
-$dal-input-text-color: none;
-$dal-input-background-color: none;
-$dal-input-border-color: none;
+$list-border-color: transparent;
diff --git a/template.scss b/template.scss
index 2c8fe77..c75bd82 100644
--- a/template.scss
+++ b/template.scss
@@ -22,8 +22,8 @@
  * Body
  */
 body {
-    color: $body-text-color;
-    background-color: $body-background-color;
+    color: $text-color;
+    background-color: $background-color;
 }
 
 
@@ -37,82 +37,97 @@ a:focus,
 a:hover {
     color: $link-focus-color;
 }
-.text-muted {
-    color: $text-muted-color;
-}
 .text-primary {
     color: $text-primary-color;
 }
-a.text-primary:focus,
-a.text-primary:hover {
-    color: $text-primary-focus-color;
+.text-secondary {
+    color: $text-secondary-color;
 }
 .text-success {
     color: $success-color;
 }
-a.text-success:focus,
-a.text-success:hover {
-    color: $success-focus-color;
-}
 .text-info {
     color: $info-color;
 }
-a.text-info:focus,
-a.text-info:hover {
-    color: $info-focus-color;
-}
 .text-warning {
     color: $warning-color;
 }
-a.text-warning:focus,
-a.text-warning:hover {
-    color: $warning-focus-color;
-}
 .text-danger {
     color: $danger-color;
 }
-a.text-danger:focus,
-a.text-danger:hover {
-    color: $danger-focus-color;
+.text-muted {
+    color: $text-muted-color;
 }
+.help-block {
+    color: $text-help-color;
+}
+.valid-feedback {
+    color: $success-color;
+}
+.invalid-feedback {
+    color: $danger-color;
+}
+
+
+/*
+ * Highlights
+ */
 .bg-primary {
-    color: $text-standard-color;
+    color: $text-color;
     background-color: $primary-color;
 }
-a.bg-primary:focus,
-a.bg-primary:hover {
-    background-color: $primary-focus-color;
+.bg-secondary {
+    color: $text-color;
+    background-color: $secondary-color;
 }
 .bg-success {
     background-color: $success-color;
 }
-a.bg-success:focus,
-a.bg-success:hover {
-    background-color: $success-focus-color;
-}
 .bg-info {
     background-color: $info-color;
 }
-a.bg-info:focus,
-a.bg-info:hover {
-    background-color: $info-focus-color;
-}
 .bg-warning {
     background-color: $warning-color;
 }
-a.bg-warning:focus,
-a.bg-warning:hover {
-    background-color: $warning-focus-color;
-}
 .bg-danger {
     background-color: $danger-color;
 }
-a.bg-danger:focus,
-a.bg-danger:hover {
-    background-color: $danger-focus-color;
+
+
+/*
+ * Badges
+ */
+.badge-primary {
+    color: $text-color;
+    background-color: $primary-color;
 }
-.help-block {
-    color: $text-help-color;
+.badge-secondary {
+    color: $text-color;
+    background-color: $secondary-color;
+}
+.badge-success {
+    color: $text-color;
+    background-color: $success-color;
+}
+.badge-info {
+    color: $text-color;
+    background-color: $info-color;
+}
+.badge-warning {
+    color: $text-color;
+    background-color: $warning-color;
+}
+.badge-danger {
+    color: $text-alt-color;
+    background-color: $danger-color;
+}
+.badge-light {
+    color: $text-color;
+    background-color: $light-color;
+}
+.badge-dark {
+    color: $text-color;
+    background-color: $dark-color;
 }
 
 
@@ -122,21 +137,13 @@ a.bg-danger:hover {
 .form-control {
     color: $forms-text-color;
     background-color: $forms-background-color;
-    border-color: $forms-border-color;
+    border-color: $border-color;
 }
-
-
-/*
- * Vue.js trees
- */
-.tree-anchor {
-	color: $text-standard-color !important;
+.form-control .is-valid {
+    border-color: $success-color;
 }
-.tree-node > .tree-content:hover > .tree-anchor {
-	color: $text-alt-color !important;
-}
-.tree-node.selected > .tree-content > .tree-anchor {
-	color: $text-alt-color !important;
+.form-control .is-invalid {
+    border-color: $danger-color;
 }
 
 
@@ -144,56 +151,40 @@ a.bg-danger:hover {
  * Django autocomplete light
  */
 .select2-results__options {
-	color: $dal-text-color;
+	color: $forms-text-color;
 }
 .select2-dropdown {
-    background-color: $dal-background-color;
+    background-color: $forms-background-color;
 }
 .select2-container--default {
-    border-color: $dal-border-color;
+    border-color: $border-color;
 }
 .select2-search__field {
-    color: $dal-input-text-color;
-    background-color: $dal-input-background-color;
-    border-color: $dal-input-border-color;
+    color: $forms-text-color;
+    background-color: $forms-background-color;
+    border-color: $border-color;
 }
 .select2-results__option {
-    background-color: $dal-background-color;
+    background-color: $forms-background-color;
 }
 .select2-results__option--highlighted {
-    color: $dal-result-focus-text-color;
+    color: $text-color;
     background-color: $dal-result-focus-background-color;
 }
 
 
 /*
- * Menus
+ * Vue.js trees
  */
-.dropdown-menu {
-    background-color: $dropdown-menu-background-color;
+.tree-anchor {
+    color: $text-color !important;
 }
-.dropdown-menu .divider {
-    background-color: $dropdown-menu-divider-color;
+.tree-node > .tree-content:focus > .tree-anchor,
+.tree-node > .tree-content:hover > .tree-anchor {
+    color: $text-focus-color !important;
 }
-.dropdown-menu > li > a {
-    color: $dropdown-menu-text-color;
-    background-color: $dropdown-menu-background-color;
-}
-.dropdown-menu > li > a:focus,
-.dropdown-menu > li > a:hover {
-    color: $dropdown-menu-focus-text-color;
-    background-color: $dropdown-menu-focus-background-color;
-}
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:focus,
-.dropdown-menu > .active > a:hover {
-    color: $text-standard-color;
-    background-color: $dropdown-menu-focus-background-color;
-}
-.dropdown-menu > .disabled > a,
-.dropdown-menu > .disabled > a:focus,
-.dropdown-menu > .disabled > a:hover {
-    color: $dropdown-menu-disabled-color;
+.tree-node.selected > .tree-content > .tree-anchor {
+    color: $text-focus-color !important;
 }
 
 
@@ -211,36 +202,433 @@ a.bg-danger:hover {
 .navbar-default .navbar-text {
     color: $navbar-text-color;
 }
+.nav-item:hover {
+    background-color: $navbar-background-active-color;
+}
+
 .navbar-static-bottom {
-    color: $secondary-navbar-text-color;
+    color: $navbar-text-color;
     background-color: $secondary-navbar-background-color;
+    border-color: $navbar-border-color;
+}
+.navbar-static-bottom .navbar-brand {
+    color: $navbar-brand-color;
 }
 .navbar-static-bottom .navbar-text {
-    color: $secondary-navbar-text-color;
+    color: $navbar-text-color;
 }
+
 .navbar-default .navbar-nav > li > a {
     color: $navbar-text-color;
 }
 .navbar-default .navbar-nav > li > a:focus,
 .navbar-default .navbar-nav > li > a:hover {
-    color: $navbar-focus-text-color;
+    color: $navbar-text-focus-color;
 }
 .navbar-default .navbar-nav > .active > a,
 .navbar-default .navbar-nav > .active > a:focus,
 .navbar-default .navbar-nav > .active > a:hover {
-    color: $navbar-active-text-color;
-    background-color: $navbar-active-background-color;
-}
-.navbar-default .navbar-nav > .disabled > a,
-.navbar-default .navbar-nav > .disabled > a:focus,
-.navbar-default .navbar-nav > .disabled > a:hover {
-    color: $navbar-disabled-text-color;
+    color: $navbar-text-focus-color;
+    background-color: $navbar-background-active-color;
 }
 .navbar-default .navbar-nav > .open > a,
 .navbar-default .navbar-nav > .open > a:focus,
 .navbar-default .navbar-nav > .open > a:hover {
-    color: $navbar-open-text-color;
-    background-color: $navbar-open-background-color;
+    color: $navbar-text-color;
+    background-color: $navbar-background-color;
+}
+.navbar-inverse .dropdown-menu .btn-link {
+    color: $navbar-text-color !important;
+}
+.navbar-inverse .dropdown-menu .btn-link:hover {
+    background-color: $navbar-background-active-color !important;
+}
+
+
+/*
+ * Menus
+ */
+.dropdown-menu {
+    background-color: $navbar-background-color;
+}
+.dropdown-menu .divider {
+    background-color: $border-color;
+}
+.dropdown-menu > li > a {
+    color: $navbar-text-color;
+    background-color: $navbar-background-color;
+}
+.dropdown-menu > li > a:focus,
+.dropdown-menu > li > a:hover {
+    color: $navbar-text-focus-color;
+    background-color:  $navbar-background-color;
+}
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:focus,
+.dropdown-menu > .active > a:hover {
+    color: $navbar-text-focus-color;
+    background-color: $dropdown-background-focus-color;
+}
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:focus,
+.dropdown-menu > .disabled > a:hover {
+    color: $navbar-text-disabled-color;
+}
+.navbar-inverse .dropdown-menu .btn-link {
+    color: $navbar-text-color;
+}
+
+
+/*
+ * Buttons
+ */
+.btn.disabled, .btn:disabled {
+    opacity: 0.65;
+}
+
+.btn-default {
+    color: $text-color;
+    background-color: $secondary-color;
+    border-color: $secondary-color;
+}
+.btn-default.focus,
+.btn-default:focus,
+.btn-default:hover {
+    color: $text-color;
+    background-color: $secondary-focus-color;
+    border-color: $secondary-focus-color;
+}
+.btn-default.active,
+.btn-default:active,
+.open > .dropdown-toggle.btn-default {
+    color: $text-color;
+    background-color: $secondary-focus-color;
+    border-color: $secondary-focus-color;
+}
+.btn-default.active.focus,
+.btn-default.active:focus,
+.btn-default.active:hover,
+.btn-default:active.focus,
+.btn-default:active:focus,
+.btn-default:active:hover,
+.open > .dropdown-toggle.btn-default.focus,
+.open > .dropdown-toggle.btn-default:focus,
+.open > .dropdown-toggle.btn-default:hover {
+    color: $text-color;
+    background-color: $secondary-focus-color;
+    border-color: $secondary-focus-color;
+}
+
+.btn-primary {
+    color: $text-color;
+    background-color: $primary-color;
+    border-color: $primary-color;
+}
+.btn-primary.focus,
+.btn-primary:focus,
+.btn-primary:hover {
+    color: $text-color;
+    background-color: $primary-focus-color;
+    border-color: $primary-focus-color;
+}
+.btn-primary.active,
+.btn-primary:active,
+.open > .dropdown-toggle.btn-primary {
+    color: $text-color;
+    background-color: $primary-focus-color;
+    border-color: $primary-focus-color;
+}
+.btn-primary.active.focus,
+.btn-primary.active:focus,
+.btn-primary.active:hover,
+.btn-primary:active.focus,
+.btn-primary:active:focus,
+.btn-primary:active:hover,
+.open > .dropdown-toggle.btn-primary.focus,
+.open > .dropdown-toggle.btn-primary:focus,
+.open > .dropdown-toggle.btn-primary:hover {
+    color: $text-color;
+    background-color: $primary-focus-color;
+    border-color: $primary-focus-color;
+}
+
+.btn-secondary {
+    color: $text-color;
+    background-color: $secondary-color;
+    border-color: $secondary-color;
+}
+.btn-secondary.focus,
+.btn-secondary:focus,
+.btn-secondary:hover {
+    color: $text-color;
+    background-color: $secondary-focus-color;
+    border-color: $secondary-focus-color;
+}
+.btn-secondary.active,
+.btn-secondary:active,
+.open > .dropdown-toggle.btn-secondary {
+    color: $text-color;
+    background-color: $secondary-focus-color;
+    border-color: $secondary-focus-color;
+}
+.btn-secondary.active.focus,
+.btn-secondary.active:focus,
+.btn-secondary.active:hover,
+.btn-secondary:active.focus,
+.btn-secondary:active:focus,
+.btn-secondary:active:hover,
+.open > .dropdown-toggle.btn-secondary.focus,
+.open > .dropdown-toggle.btn-secondary:focus,
+.open > .dropdown-toggle.btn-secondary:hover {
+    color: $text-color;
+    background-color: $secondary-focus-color;
+    border-color: $secondary-focus-color;
+}
+
+.btn-success {
+    color: $text-color;
+    background-color: $success-color;
+    border-color: $success-color;
+}
+.btn-success.focus,
+.btn-success:focus,
+.btn-success:hover {
+    color: $text-color;
+    background-color: $success-focus-color;
+    border-color: $success-focus-color;
+}
+.btn-success.active,
+.btn-success:active,
+.open > .dropdown-toggle.btn-success {
+    color: $text-color;
+    background-color: $success-focus-color;
+    border-color: $success-focus-color;
+}
+.btn-success.active.focus,
+.btn-success.active:focus,
+.btn-success.active:hover,
+.btn-success:active.focus,
+.btn-success:active:focus,
+.btn-success:active:hover,
+.open > .dropdown-toggle.btn-success.focus,
+.open > .dropdown-toggle.btn-success:focus,
+.open > .dropdown-toggle.btn-success:hover {
+    color: $text-color;
+    background-color: $success-focus-color;
+    border-color: $success-focus-color;
+}
+
+.btn-info {
+    color: $text-color;
+    background-color: $info-color;
+    border-color: $info-color;
+}
+.btn-info.focus,
+.btn-info:focus,
+.btn-info:hover {
+    color: $text-color;
+    background-color: $info-focus-color;
+    border-color: $info-focus-color;
+}
+.btn-info.active,
+.btn-info:active,
+.open > .dropdown-toggle.btn-info {
+    color: $text-color;
+    background-color: $info-focus-color;
+    border-color: $info-focus-color;
+}
+.btn-info.active.focus,
+.btn-info.active:focus,
+.btn-info.active:hover,
+.btn-info:active.focus,
+.btn-info:active:focus,
+.btn-info:active:hover,
+.open > .dropdown-toggle.btn-info.focus,
+.open > .dropdown-toggle.btn-info:focus,
+.open > .dropdown-toggle.btn-info:hover {
+    color: $text-color;
+    background-color: $info-focus-color;
+    border-color: $info-focus-color;
+}
+
+.btn-warning {
+    color: $text-color;
+    background-color: $warning-color;
+    border-color: $warning-color;
+}
+.btn-warning.focus,
+.btn-warning:focus,
+.btn-warning:hover {
+    color: $text-color;
+    background-color: $warning-focus-color;
+    border-color: $warning-focus-color;
+}
+.btn-warning.active,
+.btn-warning:active,
+.open > .dropdown-toggle.btn-warning {
+    color: $text-color;
+    background-color: $warning-focus-color;
+    border-color: $warning-focus-color;
+}
+.btn-warning.active.focus,
+.btn-warning.active:focus,
+.btn-warning.active:hover,
+.btn-warning:active.focus,
+.btn-warning:active:focus,
+.btn-warning:active:hover,
+.open > .dropdown-toggle.btn-warning.focus,
+.open > .dropdown-toggle.btn-warning:focus,
+.open > .dropdown-toggle.btn-warning:hover {
+    color: $text-color;
+    background-color: $warning-focus-color;
+    border-color: $warning-focus-color;
+}
+
+.btn-danger {
+    color: $text-color;
+    background-color: $danger-color;
+    border-color: $danger-color;
+}
+.btn-danger.focus,
+.btn-danger:focus,
+.btn-danger:hover {
+    color: $text-color;
+    background-color: $danger-focus-color;
+    border-color: $danger-focus-color;
+}
+.btn-danger.active,
+.btn-danger:active,
+.open > .dropdown-toggle.btn-danger {
+    color: $text-color;
+    background-color: $danger-focus-color;
+    border-color: $danger-focus-color;
+}
+.btn-danger.active.focus,
+.btn-danger.active:focus,
+.btn-danger.active:hover,
+.btn-danger:active.focus,
+.btn-danger:active:focus,
+.btn-danger:active:hover,
+.open > .dropdown-toggle.btn-danger.focus,
+.open > .dropdown-toggle.btn-danger:focus,
+.open > .dropdown-toggle.btn-danger:hover {
+    color: $text-color;
+    background-color: $danger-focus-color;
+    border-color: $danger-focus-color;
+}
+
+
+/*
+ * Alerts
+ */
+.alert a, .alert .alert-link {
+    color: $alert-link-color;
+}
+.alert-success {
+    color: $text-color;
+    background-color: $success-color;
+    border-color: $success-focus-color;
+}
+.alert-success hr {
+    border-top-color: $success-focus-color;
+}
+.alert-info {
+    color: $text-color;
+    background-color: $success-focus-color;;
+    border-color: $info-focus-color;
+}
+.alert-info hr {
+    border-top-color: $info-focus-color;
+}
+.alert-warning {
+    color: $text-color;
+    background-color: $warning-color;
+    border-color: $warning-focus-color;
+}
+.alert-warning hr {
+    border-top-color: $warning-focus-color;
+}
+.alert-danger {
+    color: $text-color;
+    background-color: $danger-color;
+    border-color: $danger-focus-color;
+}
+.alert-danger hr {
+    border-top-color: $danger-focus-color;
+}
+.alert-light {
+    color: $text-color;
+    background-color: $light-color;
+    border-color: $light-focus-color;
+}
+.alert-light hr {
+    border-top-color: $light-focus-color;
+}
+.alert-dark {
+    color: $text-color;
+    background-color: $dark-color;
+    border-color: $dark-focus-color;
+}
+.alert-dark hr {
+    border-top-color: $dark-focus-color;
+}
+
+
+/*
+ * Pagination
+ */
+.pagination > li > a,
+.pagination > li > span {
+    color: $text-color;
+    background-color: $secondary-color;
+    border-color: $pagination-border-color;
+}
+.pagination > li > a:focus,
+.pagination > li > a:hover,
+.pagination > li > span:focus,
+.pagination > li > span:hover {
+    color: $text-color;
+    background-color: $secondary-focus-color;
+    border-color: $pagination-border-color;
+}
+.pagination > .active > a,
+.pagination > .active > a:focus,
+.pagination > .active > a:hover,
+.pagination > .active > span,
+.pagination > .active > span:focus,
+.pagination > .active > span:hover {
+    color: $text-color;
+    background-color: $primary-color;
+    border-color: $pagination-border-color;
+}
+.pagination > .disabled > a,
+.pagination > .disabled > a:focus,
+.pagination > .disabled > a:hover,
+.pagination > .disabled > span,
+.pagination > .disabled > span:focus,
+.pagination > .disabled > span:hover {
+    color: $text-color;
+    background-color: $secondary-color;
+    border-color: $pagination-border-color;
+    opacity: 0.65;
+}
+.pager li > a,
+.pager li > span {
+    background-color: $secondary-color;
+    border-color: $pagination-border-color;
+}
+.pager li > a:focus,
+.pager li > a:hover {
+    background-color: $secondary-color;
+    border-color: $pagination-border-color;
+}
+.pager .disabled > a,
+.pager .disabled > a:focus,
+.pager .disabled > a:hover,
+.pager .disabled > span {
+    background-color: $secondary-color;
+    border-color: $pagination-border-color;
+    opacity: 0.65;
 }
 
 
@@ -253,11 +641,16 @@ a.bg-danger:hover {
 .panel-footer {
     background-color: $panel-footer-background-color;
 }
+.panel > .profil:hover {
+    color: $panel-text-focus-color !important;
+    background-color: $panel-background-focus-color !important;
+}
+
 .panel-default {
-    border-color: $panel-default-background-color;
+    border-color: $panel-border-color;
 }
 .panel-default > .panel-heading {
-    color: $text-standard-color;
+    color: $text-color;
     background-color: $panel-heading-background-color;
     border-color: $panel-border-color;
 }
@@ -271,11 +664,12 @@ a.bg-danger:hover {
 .panel-default > .panel-footer+.panel-collapse > .panel-body {
     border-bottom-color: $panel-border-color;
 }
+
 .panel-primary {
     border-color: $primary-color;
 }
 .panel-primary > .panel-heading {
-    color: $text-standard-color;
+    color: $text-color;
     background-color: $primary-color;
     border-color: $primary-color;
 }
@@ -289,11 +683,31 @@ a.bg-danger:hover {
 .panel-primary > .panel-footer+.panel-collapse > .panel-body {
     border-bottom-color: $primary-color;
 }
+
+.panel-secondary {
+    border-color: $secondary-color;
+}
+.panel-secondary > .panel-heading {
+    color: $text-color;
+    background-color: $secondary-color;
+    border-color: $secondary-color;
+}
+.panel-secondary > .panel-heading+.panel-collapse > .panel-body {
+    border-top-color: $secondary-color;
+}
+.panel-secondary > .panel-heading .badge {
+    color: $secondary-color;
+    background-color: $panel-badge-background-color;
+}
+.panel-secondary > .panel-footer+.panel-collapse > .panel-body {
+    border-bottom-color: $secondary-color;
+}
+
 .panel-success {
     border-color: $success-color;
 }
 .panel-success > .panel-heading {
-    color: $text-standard-color;
+    color: $text-color;
     background-color: $success-color;
     border-color: $success-color;
 }
@@ -307,29 +721,31 @@ a.bg-danger:hover {
 .panel-success > .panel-footer+.panel-collapse > .panel-body {
     border-bottom-color: $success-color;
 }
+
 .panel-info {
-    border-color: $info-focus-color;
+    border-color: $info-color;
 }
 .panel-info > .panel-heading {
-    color: $text-standard-color;
-    background-color: $info-focus-color;
-    border-color: $info-focus-color;
+    color: $text-color;
+    background-color: $info-color;
+    border-color: $info-color;
 }
 .panel-info > .panel-heading+.panel-collapse > .panel-body {
-    border-top-color: $info-focus-color;
+    border-top-color: $info-color;
 }
 .panel-info > .panel-heading .badge {
     color: $info-color;
     background-color: $panel-badge-background-color;
 }
 .panel-info > .panel-footer+.panel-collapse > .panel-body {
-    border-bottom-color: $info-focus-color;
+    border-bottom-color: $info-color;
 }
+
 .panel-warning {
     border-color: $warning-color;
 }
 .panel-warning > .panel-heading {
-    color: $text-standard-color;
+    color: $text-color;
     background-color: $warning-color;
     border-color: $warning-color;
 }
@@ -343,11 +759,12 @@ a.bg-danger:hover {
 .panel-warning > .panel-footer+.panel-collapse > .panel-body {
     border-bottom-color: $warning-color;
 }
+
 .panel-danger {
     border-color: $danger-color;
 }
 .panel-danger > .panel-heading {
-    color: $text-standard-color;
+    color: $text-color;
     background-color: $danger-color;
     border-color: $danger-color;
 }
@@ -361,121 +778,41 @@ a.bg-danger:hover {
 .panel-danger > .panel-footer+.panel-collapse > .panel-body {
     border-bottom-color: $danger-color;
 }
+
+
+/*
+ * Cards
+ */
 .thumbnail {
+    color: $text-color;
     background-color: $thumbnail-background-color;
     border-color: $thumbnail-border-color;
 }
 a.thumbnail.active,
 a.thumbnail:focus,
 a.thumbnail:hover {
-    border-color: $thumbnail-focus-border-color;
+    border-color: $thumbnail-background-color;
 }
 .thumbnail .caption {
-    color: $thumbnail-text-color;
+    color: $text-color;
 }
 
 
 /*
- * Pagination
+ * Modals
  */
-.pagination > li > a,
-.pagination > li > span {
-    color: $text-standard-color;
-    background-color: $pagination-background-color;
-    border-color: $pagination-border-color;
+.modal-content, .modal-body {
+    color: $text-color;
+    background-color: $modal-background-color;
+    border-color: $modal-border-color;
 }
-.pagination > li > a:focus,
-.pagination > li > a:hover,
-.pagination > li > span:focus,
-.pagination > li > span:hover {
-    color: $text-standard-color;
-    background-color: $pagination-focus-background-color;
-    border-color: $pagination-focus-border-color;
+.modal-header {
+    color: $text-color;
+    background-color: $modal-heading-background-color;
+    border-color: $modal-heading-border-color;
 }
-.pagination > .active > a,
-.pagination > .active > a:focus,
-.pagination > .active > a:hover,
-.pagination > .active > span,
-.pagination > .active > span:focus,
-.pagination > .active > span:hover {
-    color: $text-standard-color;
-    background-color: $pagination-active-background-color;
-    border-color: $pagination-active-border-color;
-}
-.pagination > .disabled > a,
-.pagination > .disabled > a:focus,
-.pagination > .disabled > a:hover,
-.pagination > .disabled > span,
-.pagination > .disabled > span:focus,
-.pagination > .disabled > span:hover {
-    color: $pagination-disabled-text-color;
-    background-color: $pagination-disabled-background-color;
-    border-color: $pagination-disabled-border-color;
-}
-.pager li > a,
-.pager li > span {
-    background-color: $pagination-background-color;
-    border-color: $pagination-border-color;
-}
-.pager li > a:focus,
-.pager li > a:hover {
-    background-color: $pagination-background-color;
-}
-.pager .disabled > a,
-.pager .disabled > a:focus,
-.pager .disabled > a:hover,
-.pager .disabled > span {
-    color: $pagination-disabled-text-color;
-    background-color: $pagination-disabled-background-color;
-}
-
-
-/*
- * Alerts
- */
-.alert-success {
-    color: $text-standard-color;
-    background-color: $success-color;
-    border-color: $success-alt-color;
-}
-.alert-success hr {
-    border-top-color: $success-alt-color;
-}
-.alert-success .alert-link {
-    color: $success-link-color;
-}
-.alert-info {
-    color: $text-standard-color;
-    background-color: $success-focus-color;;
-    border-color: $info-alt-color;
-}
-.alert-info hr {
-    border-top-color: $info-alt-color;
-}
-.alert-info .alert-link {
-    color: $info-link-color;
-}
-.alert-warning {
-    color: $text-standard-color;
-    background-color: $warning-color;
-    border-color: $warning-alt-color;
-}
-.alert-warning hr {
-    border-top-color: $warning-alt-color;
-}
-.alert-warning .alert-link {
-    color: $warning-link-color;
-}
-.alert-danger {
-    color: $text-standard-color;
-    background-color: $danger-color;
-    border-color: $danger-alt-color;
-}
-.alert-danger hr {
-    border-top-color: $danger-alt-color;
-}
-.alert-danger .alert-link {
-    color: $danger-link-color;
+.modal-header .close {
+    color: $text-color;
 }
 
 
@@ -483,10 +820,10 @@ a.thumbnail:hover {
  * Tables
  */
 table {
-    background-color: transparent;
+    background-color: $table-background-color;
 }
 caption {
-    color: $table-text-color;
+    color: $text-color;
 }
 .table > tbody > tr > td,
 .table > tbody > tr > th,
@@ -494,19 +831,19 @@ caption {
 .table > tfoot > tr > th,
 .table > thead > tr > td,
 .table > thead > tr > th {
-    border-top-color: $table-border-color;
+    border-top-color: $border-color;
 }
 .table > thead > tr > th {
-    border-bottom-color: $table-border-color;
+    border-bottom-color: $border-color;
 }
 .table > tbody+tbody {
-    border-top-color: $table-border-color;
+    border-top-color: $border-color;
 }
 .table .table {
     background-color: $table-background-color;
 }
 .table-bordered {
-    border-color: $table-border-color;
+    border-color: $border-color;
 }
 .table-bordered > tbody > tr > td,
 .table-bordered > tbody > tr > th,
@@ -514,13 +851,13 @@ caption {
 .table-bordered > tfoot > tr > th,
 .table-bordered > thead > tr > td,
 .table-bordered > thead > tr > th {
-    border-color: $table-border-color;
+    border-color: $border-color;
 }
 .table-striped > tbody > tr:nth-of-type(odd) {
     background-color: $table-alt-background-color;
 }
 .table-hover > tbody > tr:hover {
-    background-color: $table-focus-background-color;
+    background-color: $table-default-focus-background-color;
 }
 .table > tbody > tr > td.active,
 .table > tbody > tr > th.active,
@@ -534,14 +871,14 @@ caption {
 .table > thead > tr > th.active,
 .table > thead > tr.active > td,
 .table > thead > tr.active > th {
-    background-color: $table-active-background-color;
+    background-color: $table-default-focus-background-color;
 }
 .table-hover > tbody > tr > td.active:hover,
 .table-hover > tbody > tr > th.active:hover,
 .table-hover > tbody > tr.active:hover > td,
 .table-hover > tbody > tr.active:hover > th,
 .table-hover > tbody > tr:hover > .active {
-    background-color: $table-active-focus-background-color;
+    background-color: $table-default-focus-background-color;
 }
 .table > tbody > tr > td.success,
 .table > tbody > tr > th.success,
@@ -627,301 +964,47 @@ caption {
 .table-hover > tbody > tr:hover > .danger {
     background-color: $table-danger-focus-background-color;
 }
-
-
-/*
- * Buttons
- */
-.btn-default {
-    color: $text-standard-color;
-    background-color: $button-default-color;
-    border-color: $button-default-color;
+.table > tbody > tr > td.light,
+.table > tbody > tr > th.light,
+.table > tbody > tr.light > td,
+.table > tbody > tr.light > th,
+.table > tfoot > tr > td.light,
+.table > tfoot > tr > th.light,
+.table > tfoot > tr.light > td,
+.table > tfoot > tr.light > th,
+.table > thead > tr > td.light,
+.table > thead > tr > th.light,
+.table > thead > tr.light > td,
+.table > thead > tr.light > th {
+    background-color: $table-light-background-color;
 }
-.btn-default.focus,
-.btn-default:focus,
-.btn-default:hover {
-    color: $text-standard-color;
-    background-color: $button-default-focus-color;
-    border-color: $button-default-focus-color;
+.table-hover > tbody > tr > td.light:hover,
+.table-hover > tbody > tr > th.light:hover,
+.table-hover > tbody > tr.light:hover > td,
+.table-hover > tbody > tr.light:hover > th,
+.table-hover > tbody > tr:hover > .light {
+    background-color: $table-light-focus-background-color;
 }
-.btn-default.active,
-.btn-default:active,
-.open > .dropdown-toggle.btn-default {
-    color: $text-standard-color;
-    background-color: $button-default-active-color;
-    border-color: $button-default-active-color;
+.table > tbody > tr > td.dark,
+.table > tbody > tr > th.dark,
+.table > tbody > tr.dark > td,
+.table > tbody > tr.dark > th,
+.table > tfoot > tr > td.dark,
+.table > tfoot > tr > th.dark,
+.table > tfoot > tr.dark > td,
+.table > tfoot > tr.dark > th,
+.table > thead > tr > td.dark,
+.table > thead > tr > th.dark,
+.table > thead > tr.dark > td,
+.table > thead > tr.dark > th {
+    background-color: $table-dark-background-color;
 }
-.btn-default.active.focus,
-.btn-default.active:focus,
-.btn-default.active:hover,
-.btn-default:active.focus,
-.btn-default:active:focus,
-.btn-default:active:hover,
-.open > .dropdown-toggle.btn-default.focus,
-.open > .dropdown-toggle.btn-default:focus,
-.open > .dropdown-toggle.btn-default:hover {
-    color: $text-standard-color;
-    background-color: $button-default-active-focus-color;
-    border-color: $button-default-active-focus-color;
-}
-.btn-default.disabled.focus,
-.btn-default.disabled:focus,
-.btn-default.disabled:hover,
-.btn-default[disabled].focus,
-.btn-default[disabled]:focus,
-.btn-default[disabled]:hover,
-fieldset[disabled] .btn-default.focus,
-fieldset[disabled] .btn-default:focus,
-fieldset[disabled] .btn-default:hover {
-    background-color: $button-default-disabled-focus-color;
-    border-color: $button-default-disabled-focus-color;
-}
-.btn-default .badge {
-    color: $button-default-badge-text-color;
-    background-color: $button-default-badge-background-color;
-}
-.btn-primary {
-    color: $text-standard-color;
-    background-color: $primary-color;
-    border-color: $primary-color;
-}
-.btn-primary.focus,
-.btn-primary:focus,
-.btn-primary:hover {
-    color: $text-standard-color;
-    background-color: $primary-focus-color;
-    border-color: $primary-focus-color;
-}
-.btn-primary.active,
-.btn-primary:active,
-.open > .dropdown-toggle.btn-primary {
-    color: $text-standard-color;
-    background-color: $primary-active-color;
-    border-color: $primary-active-color;
-}
-.btn-primary.active.focus,
-.btn-primary.active:focus,
-.btn-primary.active:hover,
-.btn-primary:active.focus,
-.btn-primary:active:focus,
-.btn-primary:active:hover,
-.open > .dropdown-toggle.btn-primary.focus,
-.open > .dropdown-toggle.btn-primary:focus,
-.open > .dropdown-toggle.btn-primary:hover {
-    color: $text-standard-color;
-    background-color: $primary-active-focus-color;
-    border-color: $primary-active-focus-color;
-}
-.btn-primary.disabled.focus,
-.btn-primary.disabled:focus,
-.btn-primary.disabled:hover,
-.btn-primary[disabled].focus,
-.btn-primary[disabled]:focus,
-.btn-primary[disabled]:hover,
-fieldset[disabled] .btn-primary.focus,
-fieldset[disabled] .btn-primary:focus,
-fieldset[disabled] .btn-primary:hover {
-    background-color: $primary-disabled;
-    border-color: $primary-disabled;
-}
-.btn-primary .badge {
-    color: $button-default-badge-text-color;
-    background-color: $button-default-badge-background-color;
-}
-.btn-success {
-    color: $text-standard-color;
-    background-color: $success-color;
-    border-color: $success-alt-color;
-}
-.btn-success.focus,
-.btn-success:focus,
-.btn-success:hover {
-    color: $text-standard-color;
-    background-color: $success-focus-color;
-    border-color: $success-focus-color;
-}
-.btn-success.active,
-.btn-success:active,
-.open > .dropdown-toggle.btn-success {
-    color: $text-standard-color;
-    background-color: $success-alt-color;
-    border-color: $success-alt-color;
-}
-.btn-success.active.focus,
-.btn-success.active:focus,
-.btn-success.active:hover,
-.btn-success:active.focus,
-.btn-success:active:focus,
-.btn-success:active:hover,
-.open > .dropdown-toggle.btn-success.focus,
-.open > .dropdown-toggle.btn-success:focus,
-.open > .dropdown-toggle.btn-success:hover {
-    color: $text-standard-color;
-    background-color: $button-success-active-focus-color;
-    border-color: $button-success-active-focus-color;
-}
-.btn-success.disabled.focus,
-.btn-success.disabled:focus,
-.btn-success.disabled:hover,
-.btn-success[disabled].focus,
-.btn-success[disabled]:focus,
-.btn-success[disabled]:hover,
-fieldset[disabled] .btn-success.focus,
-fieldset[disabled] .btn-success:focus,
-fieldset[disabled] .btn-success:hover {
-    background-color: $button-success-disabled-focus-color;
-    border-color: $button-success-disabled-focus-color;
-}
-.btn-success .badge {
-    color: $button-success-badge-text-color;
-    background-color: $button-success-badge-background-color;
-}
-.btn-info {
-    color: $text-standard-color;
-    background-color: $info-color;
-    border-color: $info-alt-color;
-}
-.btn-info.focus,
-.btn-info:focus,
-.btn-info:hover {
-    color: $text-standard-color;
-    background-color: $info-focus-color;
-    border-color: $info-focus-color;
-}
-.btn-info.active,
-.btn-info:active,
-.open > .dropdown-toggle.btn-info {
-    color: $text-standard-color;
-    background-color: $info-alt-color;
-    border-color: $info-alt-color;
-}
-.btn-info.active.focus,
-.btn-info.active:focus,
-.btn-info.active:hover,
-.btn-info:active.focus,
-.btn-info:active:focus,
-.btn-info:active:hover,
-.open > .dropdown-toggle.btn-info.focus,
-.open > .dropdown-toggle.btn-info:focus,
-.open > .dropdown-toggle.btn-info:hover {
-    color: $text-standard-color;
-    background-color: $button-info-active-focus-color;
-    border-color: $button-info-active-focus-color;
-}
-.btn-info.disabled.focus,
-.btn-info.disabled:focus,
-.btn-info.disabled:hover,
-.btn-info[disabled].focus,
-.btn-info[disabled]:focus,
-.btn-info[disabled]:hover,
-fieldset[disabled] .btn-info.focus,
-fieldset[disabled] .btn-info:focus,
-fieldset[disabled] .btn-info:hover {
-    background-color: $button-info-disabled-focus-color;
-    border-color: $button-info-disabled-focus-color;
-}
-.btn-info .badge {
-    color: $button-info-badge-text-color;
-    background-color: $button-info-badge-background-color;
-}
-.btn-warning {
-    color: $text-standard-color;
-    background-color: $warning-color;
-    border-color: $warning-color;
-}
-.btn-warning.focus,
-.btn-warning:focus,
-.btn-warning:hover {
-    color: $text-standard-color;
-    background-color: $warning-focus-color;
-    border-color: $warning-focus-color;
-}
-.btn-warning.active,
-.btn-warning:active,
-.open > .dropdown-toggle.btn-warning {
-    color: $text-standard-color;
-    background-color: $warning-alt-color;
-    border-color: $warning-alt-color;
-}
-.btn-warning.active.focus,
-.btn-warning.active:focus,
-.btn-warning.active:hover,
-.btn-warning:active.focus,
-.btn-warning:active:focus,
-.btn-warning:active:hover,
-.open > .dropdown-toggle.btn-warning.focus,
-.open > .dropdown-toggle.btn-warning:focus,
-.open > .dropdown-toggle.btn-warning:hover {
-    color: $text-standard-color;
-    background-color: $button-warning-active-focus-color;
-    border-color: $button-warning-active-focus-color;
-}
-.btn-warning.disabled.focus,
-.btn-warning.disabled:focus,
-.btn-warning.disabled:hover,
-.btn-warning[disabled].focus,
-.btn-warning[disabled]:focus,
-.btn-warning[disabled]:hover,
-fieldset[disabled] .btn-warning.focus,
-fieldset[disabled] .btn-warning:focus,
-fieldset[disabled] .btn-warning:hover {
-    background-color: $button-warning-disabled-focus-color;
-    border-color: $button-warning-disabled-focus-color;
-}
-.btn-warning .badge {
-    color: $button-warning-badge-text-color;
-    background-color: $button-warning-badge-background-color;
-}
-.btn-danger {
-    color: $text-standard-color;
-    background-color: $danger-color;
-    border-color: $danger-color;
-}
-.btn-danger.focus,
-.btn-danger:focus,
-.btn-danger:hover {
-    color: $text-standard-color;
-    background-color: $danger-focus-color;
-    border-color: $danger-focus-color;
-}
-.btn-danger.active,
-.btn-danger:active,
-.open > .dropdown-toggle.btn-danger {
-    color: $text-standard-color;
-    background-color: $danger-alt-color;
-    border-color: $danger-alt-color;
-}
-.btn-danger.active.focus,
-.btn-danger.active:focus,
-.btn-danger.active:hover,
-.btn-danger:active.focus,
-.btn-danger:active:focus,
-.btn-danger:active:hover,
-.open > .dropdown-toggle.btn-danger.focus,
-.open > .dropdown-toggle.btn-danger:focus,
-.open > .dropdown-toggle.btn-danger:hover {
-    color: $text-standard-color;
-    background-color: $button-danger-active-focus-color;
-    border-color: $button-danger-active-focus-color;
-}
-.btn-danger.disabled.focus,
-.btn-danger.disabled:focus,
-.btn-danger.disabled:hover,
-.btn-danger[disabled].focus,
-.btn-danger[disabled]:focus,
-.btn-danger[disabled]:hover,
-fieldset[disabled] .btn-danger.focus,
-fieldset[disabled] .btn-danger:focus,
-fieldset[disabled] .btn-danger:hover {
-    background-color: $button-danger-disabled-focus-color;
-    border-color: $button-danger-disabled-focus-color;
-}
-.btn-danger .badge {
-    color: $button-danger-badge-text-color;
-    background-color: $button-danger-badge-background-color;
-}
-.navbar-inverse .dropdown-menu .btn-link {
-	color: $text-standard-color;
+.table-hover > tbody > tr > td.dark:hover,
+.table-hover > tbody > tr > th.dark:hover,
+.table-hover > tbody > tr.dark:hover > td,
+.table-hover > tbody > tr.dark:hover > th,
+.table-hover > tbody > tr:hover > .dark {
+    background-color: $table-dark-focus-background-color;
 }
 
 
@@ -929,65 +1012,116 @@ fieldset[disabled] .btn-danger:hover {
  * Lists
  */
 .list-group-item {
+    color: $text-color;
     background-color: $list-background-color;
-    border-color: transparent;
+    border-color: $list-border-color;
 }
 .list-group-item.disabled,
 .list-group-item.disabled:focus,
 .list-group-item.disabled:hover {
-    color: $list-disabled-text-color;
-    background-color: $list-disabled-background-color;
+    opacity: 0.65;
 }
 .list-group-item.disabled .list-group-item-text,
 .list-group-item.disabled:focus .list-group-item-text,
 .list-group-item.disabled:hover .list-group-item-text {
-    color: $list-disabled-focus-text-color;
+    opacity: 0.65;
 }
 .list-group-item.active,
 .list-group-item.active:focus,
 .list-group-item.active:hover {
-    color: $text-standard-color;
-    background-color: $list-active-background-color;
-    border-color: $list-active-border-color;
+    color: $text-color;
+    background-color: $list-background-color;
+    border-color: $list-border-color;
 }
 .list-group-item.active .list-group-item-text,
 .list-group-item.active:focus .list-group-item-text,
 .list-group-item.active:hover .list-group-item-text {
-    color: $list-active-text-color;
+    color: $text-color;
 }
 .list-group-item.active > .badge,
 .nav-pills > .active > a > .badge {
-    color: $list-badge-text-color;
-    background-color: $list-badge-background-color;
+    color: $text-color;
+    background-color: $list-background-color;
 }
 a.list-group-item,
 button.list-group-item {
-    color: $list-link-text-color;
+    color: $link-color;
 }
 a.list-group-item .list-group-item-heading,
 button.list-group-item .list-group-item-heading {
-    color: $list-heading-text-color;
+    color: $text-color;
 }
 a.list-group-item:focus,
 a.list-group-item:hover,
 button.list-group-item:focus,
 button.list-group-item:hover {
-    color: $list-link-focus-text-color;
+    color: $text-color;
 }
+
+.list-group-item-primary {
+    color: $text-color;
+    background-color: $primary-color;
+}
+a.list-group-item-primary,
+button.list-group-item-primary {
+    color: $text-color;
+}
+a.list-group-item-primary:focus,
+a.list-group-item-primary:hover,
+button.list-group-item-primary:focus,
+button.list-group-item-primary:hover {
+    color: $text-color;
+    background-color: $primary-focus-color;
+}
+a.list-group-item-primary.active,
+a.list-group-item-primary.active:focus,
+a.list-group-item-primary.active:hover,
+button.list-group-item-primary.active,
+button.list-group-item-primary.active:focus,
+button.list-group-item-primary.active:hover {
+    color: $text-color;
+    background-color: $primary-focus-color;
+}
+
+.list-group-item-secondary {
+    color: $text-color;
+    background-color: $secondary-color;
+}
+a.list-group-item-secondary,
+button.list-group-item-secondary {
+    color: $text-color;
+}
+a.list-group-item-secondary:focus,
+a.list-group-item-secondary:hover,
+button.list-group-item-secondary:focus,
+button.list-group-item-secondary:hover {
+    color: $text-color;
+    background-color: $secondary-focus-color;
+}
+a.list-group-item-secondary.active,
+a.list-group-item-secondary.active:focus,
+a.list-group-item-secondary.active:hover,
+button.list-group-item-secondary.active,
+button.list-group-item-secondary.active:focus,
+button.list-group-item-secondary.active:hover {
+    color: $text-color;
+    background-color: $secondary-focus-color;
+}
+
 .list-group-item-success {
-    color: $text-standard-color;
-    background-color: $list-success-link-background-color;
+    color: $text-color;
+    background-color: $success-color;
 }
 a.list-group-item-success,
 button.list-group-item-success {
-    color: $text-standard-color;
+    color: $text-color;
 }
 a.list-group-item-success:focus,
 a.list-group-item-success:hover,
 button.list-group-item-success:focus,
 button.list-group-item-success:hover {
-    color: $text-standard-color;
-    background-color: $list-success-link-focus-background-color;
+    color: $text-color;
+    background-color: $success-focus-color;
 }
 a.list-group-item-success.active,
 a.list-group-item-success.active:focus,
@@ -995,24 +1129,24 @@ a.list-group-item-success.active:hover,
 button.list-group-item-success.active,
 button.list-group-item-success.active:focus,
 button.list-group-item-success.active:hover {
-    color: $text-standard-color;
-    background-color: $list-success-active-focus-background-color;
-    border-color: $list-success-active-focus-background-color;
+    color: $text-color;
+    background-color: $success-focus-color;
 }
+
 .list-group-item-info {
-    color: $text-standard-color;
-    background-color: $list-info-link-background-color;
+    color: $text-color;
+    background-color: $info-color;
 }
 a.list-group-item-info,
 button.list-group-item-info {
-    color: $text-standard-color;
+    color: $text-color;
 }
 a.list-group-item-info:focus,
 a.list-group-item-info:hover,
 button.list-group-item-info:focus,
 button.list-group-item-info:hover {
-    color: $text-standard-color;
-    background-color: $list-info-link-focus-background-color;
+    color: $text-color;
+    background-color: $info-focus-color;
 }
 a.list-group-item-info.active,
 a.list-group-item-info.active:focus,
@@ -1020,24 +1154,24 @@ a.list-group-item-info.active:hover,
 button.list-group-item-info.active,
 button.list-group-item-info.active:focus,
 button.list-group-item-info.active:hover {
-    color: $text-standard-color;
-    background-color: $list-info-active-focus-background-color;
-    border-color: $list-info-active-focus-background-color;
+    color: $text-color;
+    background-color: $info-focus-color;
 }
+
 .list-group-item-warning {
-    color: $text-standard-color;
-    background-color: $list-warning-link-background-color;
+    color: $text-color;
+    background-color: $warning-color;
 }
 a.list-group-item-warning,
 button.list-group-item-warning {
-    color: $text-standard-color;
+    color: $text-color;
 }
 a.list-group-item-warning:focus,
 a.list-group-item-warning:hover,
 button.list-group-item-warning:focus,
 button.list-group-item-warning:hover {
-    color: $text-standard-color;
-    background-color: $list-warning-link-focus-background-color;
+    color: $text-color;
+    background-color: $warning-focus-color;
 }
 a.list-group-item-warning.active,
 a.list-group-item-warning.active:focus,
@@ -1045,24 +1179,24 @@ a.list-group-item-warning.active:hover,
 button.list-group-item-warning.active,
 button.list-group-item-warning.active:focus,
 button.list-group-item-warning.active:hover {
-    color: $text-standard-color;
-    background-color: $list-warning-active-focus-background-color;
-    border-color: $list-warning-active-focus-background-color;
+    color: $text-color;
+    background-color: $warning-focus-color;
 }
+
 .list-group-item-danger {
-    color: $text-standard-color;
-    background-color: $list-danger-link-background-color;
+    color: $text-color;
+    background-color: $danger-color;
 }
 a.list-group-item-danger,
 button.list-group-item-danger {
-    color: $text-standard-color;
+    color: $text-color;
 }
 a.list-group-item-danger:focus,
 a.list-group-item-danger:hover,
 button.list-group-item-danger:focus,
 button.list-group-item-danger:hover {
-    color: $text-standard-color;
-    background-color: $list-danger-link-focus-background-color;
+    color: $text-color;
+    background-color: $danger-focus-color;
 }
 a.list-group-item-danger.active,
 a.list-group-item-danger.active:focus,
@@ -1070,7 +1204,6 @@ a.list-group-item-danger.active:hover,
 button.list-group-item-danger.active,
 button.list-group-item-danger.active:focus,
 button.list-group-item-danger.active:hover {
-    color: $text-standard-color;
-    background-color: $list-danger-active-focus-background-color;
-    border-color: $list-danger-active-focus-background-color;
+    color: $text-color;
+    background-color: $danger-focus-color;
 }