diff --git a/app/assets/stylesheets/bitters/_bitters.scss b/app/assets/stylesheets/bitters/_bitters.scss
deleted file mode 100644
index 2be9d955c3..0000000000
--- a/app/assets/stylesheets/bitters/_bitters.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-// Neat Settings -- uncomment if using Neat
-///////////////////////////////////////////////////////////////////////////////
-// @import "neat-helpers"; // or "neat/neat-helpers" when not in Rails
-// @import "grid-settings";
-
-// Bitters
-///////////////////////////////////////////////////////////////////////////////
-@import "variables";
-@import "extends/base";
-@import "mixins/base";
-//@import "typography";
-//@import "forms";
-//@import "tables";
-//@import "lists";
-//@import "flashes";
diff --git a/app/assets/stylesheets/bitters/_flashes.scss b/app/assets/stylesheets/bitters/_flashes.scss
deleted file mode 100644
index 8714ae87a0..0000000000
--- a/app/assets/stylesheets/bitters/_flashes.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-%flash-error {
-  @include flash($error-color);
-}
-
-%flash-notice {
-  @include flash($notice-color);
-}
-
-%flash-success {
-  @include flash($success-color);
-}
diff --git a/app/assets/stylesheets/bitters/_forms.scss b/app/assets/stylesheets/bitters/_forms.scss
deleted file mode 100644
index 585dee6557..0000000000
--- a/app/assets/stylesheets/bitters/_forms.scss
+++ /dev/null
@@ -1,95 +0,0 @@
-$form-border-color: $base-border-color;
-$form-border-color-hover: darken($base-border-color, 10);
-$form-border-color-focus: $base-accent-color;
-$form-border-radius: $base-border-radius;
-$form-box-shadow: inset 0 1px 3px hsla(0, 0%, 0%, 0.06);
-$form-box-shadow-focus: $form-box-shadow, 0 0 5px rgba(darken($form-border-color-focus, 5), 0.7);
-$form-font-size: $base-font-size;
-$form-font-family: $base-font-family;
-
-fieldset {
-  background: lighten($base-border-color, 10);
-  border: 1px solid $base-border-color;
-  margin: 0 0 ($base-line-height / 2) 0;
-  padding: $base-line-height;
-}
-
-input,
-label,
-select {
-  display: block;
-  font-family: $form-font-family;
-  font-size: $form-font-size;
-}
-
-label {
-  font-weight: bold;
-  margin-bottom: $base-line-height / 4;
-
-  &.required:after {
-    content: "*";
-  }
-
-  abbr {
-    display: none;
-  }
-}
-
-textarea,
-#{$all-text-inputs},
-select[multiple=multiple] {
-  @include box-sizing(border-box);
-  @include transition(border-color);
-  background-color: white;
-  border-radius: $form-border-radius;
-  border: 1px solid $form-border-color;
-  box-shadow: $form-box-shadow;
-  font-family: $form-font-family;
-  font-size: $form-font-size;
-  margin-bottom: $base-line-height / 2;
-  padding: ($base-line-height / 3) ($base-line-height / 3);
-  width: 100%;
-
-  &:hover {
-    border-color: $form-border-color-hover;
-  }
-
-  &:focus {
-    border-color: $form-border-color-focus;
-    box-shadow: $form-box-shadow-focus;
-    outline: none;
-  }
-}
-
-textarea {
-  resize: vertical;
-}
-
-input[type="search"] {
-  @include appearance(none);
-}
-
-input[type="checkbox"], input[type="radio"] {
-  display: inline;
-  margin-right: $base-line-height / 4;
-}
-
-input[type="file"] {
-  width: 100%;
-}
-
-select {
-  width: auto;
-  max-width: 100%;
-  margin-bottom: $base-line-height;
-}
-
-button,
-input[type="submit"] {
-  @extend %button;
-  @include appearance(none);
-  cursor: pointer;
-  user-select: none;
-  vertical-align: middle;
-  white-space: nowrap;
-}
diff --git a/app/assets/stylesheets/bitters/_grid-settings.scss b/app/assets/stylesheets/bitters/_grid-settings.scss
deleted file mode 100644
index 7f9652cb54..0000000000
--- a/app/assets/stylesheets/bitters/_grid-settings.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-// Neat Overrides
-///////////////////////////////////////////////////////////////////////////////
-// $column: 90px;
-// $gutter: 30px;
-// $grid-columns: 12;
-// $max-width: em(1088);
-
-// Neat Breakpoints
-///////////////////////////////////////////////////////////////////////////////
-$medium-screen: em(640);
-$large-screen: em(860);
-
-$medium-screen-up: new-breakpoint(min-width $medium-screen 4);
-$large-screen-up: new-breakpoint(min-width $large-screen 8);
diff --git a/app/assets/stylesheets/bitters/_lists.scss b/app/assets/stylesheets/bitters/_lists.scss
deleted file mode 100644
index 370267ab92..0000000000
--- a/app/assets/stylesheets/bitters/_lists.scss
+++ /dev/null
@@ -1,31 +0,0 @@
-ul, ol {
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
-
-  &%default-ul {
-    list-style-type: disc;
-    margin-bottom: $base-line-height / 2;
-    padding-left: $base-line-height;
-  }
-
-  &%default-ol {
-    list-style-type: decimal;
-    margin-bottom: $base-line-height / 2;
-    padding-left: $base-line-height;
-  }
-}
-
-dl {
-  line-height: $base-line-height;
-  margin-bottom: $base-line-height / 2;
-
-  dt {
-    font-weight: bold;
-    margin-top: $base-line-height / 2;
-  }
-
-  dd {
-    margin: 0;
-  }
-}
diff --git a/app/assets/stylesheets/bitters/_tables.scss b/app/assets/stylesheets/bitters/_tables.scss
deleted file mode 100644
index 31e78f4a55..0000000000
--- a/app/assets/stylesheets/bitters/_tables.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-table {
-  border-collapse: collapse;
-  margin: ($base-line-height / 2) 0;
-  table-layout: fixed;
-  width: 100%;
-}
-
-th {
-  border-bottom: 1px solid darken($base-border-color, 15%);
-  font-weight: bold;
-  padding: ($base-line-height / 2) 0;
-  text-align: left;
-}
-
-td {
-  border-bottom: 1px solid $base-border-color;
-  padding: ($base-line-height / 2) 0;
-}
-
-tr, td, th {
-  vertical-align: middle;
-}
diff --git a/app/assets/stylesheets/bitters/_typography.scss b/app/assets/stylesheets/bitters/_typography.scss
deleted file mode 100644
index 170765007f..0000000000
--- a/app/assets/stylesheets/bitters/_typography.scss
+++ /dev/null
@@ -1,104 +0,0 @@
-body {
-  color: $base-font-color;
-  font-family: $base-font-family;
-  font-size: $base-font-size;
-  -webkit-font-smoothing: antialiased;
-  line-height: $base-line-height;
-}
-
-h1, h2, h3, h4, h5, h6 {
-  font-family: $header-font-family;
-  line-height: 1.25em;
-  margin: 0;
-  text-rendering: optimizeLegibility; // Fix the character spacing for headings
-}
-
-h1 {
-  font-size: $base-font-size * 2.25; // 16 * 2.25 = 36px
-}
-
-h2 {
-  font-size: $base-font-size * 2; // 16 * 2 = 32px
-}
-
-h3 {
-  font-size: $base-font-size * 1.75; // 16 * 1.75 = 28px
-}
-
-h4 {
-  font-size: $base-font-size * 1.5; // 16 * 1.5 = 24px
-}
-
-h5 {
-  font-size: $base-font-size * 1.25; // 16 * 1.25 = 20px
-}
-
-h6 {
-  font-size: $base-font-size;
-}
-
-p {
-  margin: 0 0 ($base-line-height * .5);
-}
-
-a {
-  color: $base-link-color;
-  text-decoration: none;
-  @include transition(color 0.1s linear);
-
-  &:hover {
-    color: $hover-link-color;
-  }
-
-  &:active, &:focus {
-    color: $hover-link-color;
-    outline: none;
-  }
-}
-
-hr {
-  border-bottom: 1px solid $base-border-color;
-  border-left: none;
-  border-right: none;
-  border-top: none;
-  margin: $base-line-height 0;
-}
-
-img {
-  margin: 0;
-  max-width: 100%;
-}
-
-abbr, acronym {
-  border-bottom: 1px dotted $base-border-color;
-  cursor: help;
-}
-
-address {
-  display: block;
-  margin: 0 0 ($base-line-height / 2);
-}
-
-hgroup {
-  margin-bottom: $base-line-height / 2;
-}
-
-del {
-  color: lighten($base-font-color, 15);
-}
-
-blockquote {
-  border-left: 2px solid $base-border-color;
-  color: lighten($base-font-color, 15);
-  margin: $base-line-height 0;
-  padding-left: $base-line-height / 2;
-}
-
-cite {
-  color: lighten($base-font-color, 25);
-  font-style: italic;
-
-  &:before {
-    content: '\2014 \00A0';
-  }
-}
diff --git a/app/assets/stylesheets/bitters/_variables.scss b/app/assets/stylesheets/bitters/_variables.scss
deleted file mode 100644
index 517d6f73d4..0000000000
--- a/app/assets/stylesheets/bitters/_variables.scss
+++ /dev/null
@@ -1,43 +0,0 @@
-// Typography
-///////////////////////////////////////////////////////////////////////////////
-$sans-serif: $helvetica;
-$serif: $georgia;
-
-$base-font-family: $sans-serif;
-$header-font-family: $base-font-family;
-
-// Sizes
-///////////////////////////////////////////////////////////////////////////////
-$base-font-size: 1em;
-$base-line-height: $base-font-size * 1.5;
-$base-border-radius: em(3);
-
-// Colors
-///////////////////////////////////////////////////////////////////////////////
-
-$blue: #477DCA;
-$dark-gray: #333;
-$medium-gray: #999;
-$light-gray: #DDD;
-$light-red: #FBE3E4;
-$light-yellow: #FFF6BF;
-$light-green: #E6EFC2;
-
-// Body Color
-$base-body-color: white;
-
-//  Font Colors
-$base-font-color: $dark-gray;
-$base-accent-color: $blue;
-
-//  Text Link Colors
-$base-link-color: $base-accent-color;
-$hover-link-color: darken($base-accent-color, 15);
-
-// Border color
-$base-border-color: $light-gray;
-
-// Flash Colors
-$error-color: $light-red;
-$notice-color: $light-yellow;
-$success-color: $light-green;
diff --git a/app/assets/stylesheets/bitters/extends/_base.scss b/app/assets/stylesheets/bitters/extends/_base.scss
deleted file mode 100644
index ac3b5deddb..0000000000
--- a/app/assets/stylesheets/bitters/extends/_base.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import "button";
diff --git a/app/assets/stylesheets/bitters/extends/_button.scss b/app/assets/stylesheets/bitters/extends/_button.scss
deleted file mode 100644
index 4feb4f3398..0000000000
--- a/app/assets/stylesheets/bitters/extends/_button.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-%button {
-  @include button(simple, $base-accent-color);
-  -webkit-font-smoothing: antialiased;
-  font-size: $base-font-size;
-  font-weight: bold;
-  line-height: 1em;
-}
diff --git a/app/assets/stylesheets/bitters/mixins/_base.scss b/app/assets/stylesheets/bitters/mixins/_base.scss
deleted file mode 100644
index b134fef765..0000000000
--- a/app/assets/stylesheets/bitters/mixins/_base.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import "flash";
diff --git a/app/assets/stylesheets/bitters/mixins/_flash.scss b/app/assets/stylesheets/bitters/mixins/_flash.scss
deleted file mode 100644
index 55afd61431..0000000000
--- a/app/assets/stylesheets/bitters/mixins/_flash.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-@mixin flash($color) {
-  background: $color;
-  color: darken($color, 60);
-  font-weight: bold;
-  margin-bottom: $base-line-height / 2;
-  padding: $base-line-height / 2;
-
-  a {
-    color: darken($color, 70);
-
-    &:hover {
-      color: darken($color, 90);
-    }
-  }
-}
diff --git a/app/assets/stylesheets/content/_grid_table.sass b/app/assets/stylesheets/content/_grid_table.sass
index f157b1f703..e56865f3d6 100644
--- a/app/assets/stylesheets/content/_grid_table.sass
+++ b/app/assets/stylesheets/content/_grid_table.sass
@@ -4,10 +4,10 @@
 .grid-items-lines
   $grid-items-background: $base-body-color
   $grid-item-background: $base-body-color
-  $grid-item-border: 1px solid transparentize($base-font-color, 0.8)
+  $grid-item-border: 1px solid transparentize($global_font_color, 0.8)
   $grid-item-columns: 4
   $grid-item-big-columns: 8
-  $grid-item-color: $base-font-color
+  $grid-item-color: $global_font_color
   $grid-item-height: 14em
   +clearfix
   position: relative
diff --git a/app/assets/stylesheets/default.css.sass b/app/assets/stylesheets/default.css.sass
index b5cc22353f..389132c9d7 100644
--- a/app/assets/stylesheets/default.css.sass
+++ b/app/assets/stylesheets/default.css.sass
@@ -27,7 +27,6 @@
  */
 
 @import bourbon
-@import bitters/bitters
 @import global/all
 @import fonts/lato
 @import fonts/openproject_icon_font
diff --git a/app/assets/stylesheets/default_simple.css.sass b/app/assets/stylesheets/default_simple.css.sass
index 742d606ffe..c9a898ab0a 100644
--- a/app/assets/stylesheets/default_simple.css.sass
+++ b/app/assets/stylesheets/default_simple.css.sass
@@ -27,7 +27,6 @@
  */
 
 @import bourbon
-@import bitters/bitters
 
 @import global/accessibility
 @import global/variables
diff --git a/app/assets/stylesheets/global/_variables.sass b/app/assets/stylesheets/global/_variables.sass
index 140a02b74e..5594d216ab 100644
--- a/app/assets/stylesheets/global/_variables.sass
+++ b/app/assets/stylesheets/global/_variables.sass
@@ -25,6 +25,9 @@
  *
  * See doc/COPYRIGHT.rdoc for more details.  ++*/
 
+$base-body-color: white
+$light-gray: #ccc
+
 $font_family_normal:                            'Lato', 'Lucida Grande', Helvetica, Arial, sans-serif !default
 $global_font_color:                             #555555 !default
 $global_font_size:                              13px !default