diff --git a/app/modules/home/projects/home-project-list.jade b/app/modules/home/projects/home-project-list.jade
index 273f0009..9ed81a65 100644
--- a/app/modules/home/projects/home-project-list.jade
+++ b/app/modules/home/projects/home-project-list.jade
@@ -11,7 +11,10 @@ section.home-project-list(ng-if="vm.projects.size")
                 title="{{tag.get('name')}}"
                 tg-repeat="tag in project.get('colorized_tags') track by tag.get('name')"
             )
-        .project-card-inner(href="#", tg-nav="project:project=project.get('slug')")
+        .project-card-inner(
+            href="#"
+            tg-nav="project:project=project.get('slug')"
+        )
             .project-card-header
                 a.project-card-logo(
                     href="#"
@@ -22,7 +25,7 @@ section.home-project-list(ng-if="vm.projects.size")
                         tg-project-logo-small-src="::project"
                         alt="{{::project.get('name')}}"
                     )
-                h2.project-card-name
+                h3.project-card-name
                     a.project-title(
                         href="#"
                         tg-nav="project:project=project.get('slug')"
@@ -85,11 +88,16 @@ section.home-project-list(ng-if="vm.projects.size")
 section.projects-empty(ng-if="vm.projects != undefined && vm.projects.size === 0")
     tg-svg(svg-icon="icon-project")
     p(translate="HOME.EMPTY_PROJECT_LIST")
-    a.create-project-button.button-green(href="#", ng-click="vm.newProject()",
-                                      title="{{'PROJECT.NAVIGATION.TITLE_CREATE_PROJECT' | translate}}",
-                                      translate="PROJECT.NAVIGATION.ACTION_CREATE_PROJECT")
+    a.create-project-button.button-green(
+        href="#"
+        ng-click="vm.newProject()"
+        title="{{'PROJECT.NAVIGATION.TITLE_CREATE_PROJECT' | translate}}"
+        translate="PROJECT.NAVIGATION.ACTION_CREATE_PROJECT"
+    )
     span(tg-import-project-button)
-        a.import-project-button.button-blackish(href="#",
-                                                title="{{'PROJECT.NAVIGATION.TITLE_IMPORT_PROJECT' | translate}}",
-                                                translate="PROJECT.NAVIGATION.ACTION_IMPORT_PROJECT")
+        a.import-project-button.button-blackish(
+            href="#"
+            title="{{'PROJECT.NAVIGATION.TITLE_IMPORT_PROJECT' | translate}}"
+            translate="PROJECT.NAVIGATION.ACTION_IMPORT_PROJECT"
+        )
         input.import-file.hidden(type="file")
diff --git a/app/modules/home/working-on/working-on.jade b/app/modules/home/working-on/working-on.jade
index 6b301ba8..e434bfa5 100644
--- a/app/modules/home/working-on/working-on.jade
+++ b/app/modules/home/working-on/working-on.jade
@@ -1,11 +1,9 @@
+h1
+    span.green {{"HOME.DASHBOARD" | translate}}
+
 section.working-on-container
-
     header
-        h1
-            span.green {{"HOME.DASHBOARD" | translate}}
-
-
-    .title-bar.working-on-title(translate="HOME.WORKING_ON_SECTION")
+        h1.title-bar.working-on-title(translate="HOME.WORKING_ON_SECTION")
 
     .working-on(ng-if="vm.assignedTo.size")
         .duty-single(
@@ -17,7 +15,8 @@ section.working-on-container
         include empty.jade
 
 section.watching-container
-    .title-bar.watching-title(translate="HOME.WATCHING_SECTION")
+    header
+        h1.title-bar.watching-title(translate="HOME.WATCHING_SECTION")
 
     .watching(ng-if="vm.watching.size")
         .duty-single(
diff --git a/app/themes/high-contrast/custom.scss b/app/themes/high-contrast/custom.scss
index d4527fc9..92078437 100644
--- a/app/themes/high-contrast/custom.scss
+++ b/app/themes/high-contrast/custom.scss
@@ -11,7 +11,7 @@
 // Default body color and background
 body {
     background: $white; // fallback
-    color: $grayer;
+    color: $black;
 }
 
 // Main
@@ -128,6 +128,11 @@ cite {
 .summary {
     background: $grayer;
     color: $white;
+    .stats {
+        svg {
+            fill: $white;
+        }
+    }
 }
 
 
@@ -145,7 +150,7 @@ cite {
         :hover {
             color: $white;
         }
-        svg path {
+        svg {
             fill: $white;
         }
     }
@@ -169,6 +174,89 @@ tg-project-menu {
     }
 }
 
+//*****************************
+//** HOME
+//******************************
+
+.home-project-list {
+    li {
+        border: 1px solid $black;
+    }
+    p {
+        color: $black;
+    }
+}
+
+//*****************************
+//** WORKING ON
+//******************************
+.working-on-container {
+    .list-itemtype-ticket {
+        .ticket-status,
+        .ticket-status,
+        .ticket-type,
+        .ticket-project {
+            color: $black;
+        }
+    }
+}
+
+
+//*****************************
+//** PROJECT PAGE
+//******************************
+
+.single-project {
+    .title {
+        background: $whitish;
+        color: $black;
+    }
+}
+
+.watch-options {
+    a{
+        &.active  {
+            color: $primary;
+        }
+    }
+}
+
+//*****************************
+//** SCRUM
+//******************************
+
+.summary {
+    .data {
+        .number {
+            color: $white;
+        }
+    }
+}
+
+//*****************************
+//** WIKI
+//******************************
+
+.wiki-summary {
+    .username {
+        color: $white;
+    }
+}
+
+.drag-drop-help {
+    color: $black;
+}
+
+.wiki-content {
+    &.editable {
+        &:hover {
+            .wysiwyg {
+                background: $white;
+                border: 1px solid;
+            }
+        }
+    }
+}
 
 //*****************************
 //** TASKBOARD
@@ -222,11 +310,6 @@ tg-project-menu {
     color: $black;
 }
 
-
-.points-per-role > li:first-child {
-    background: $black;
-}
-
 //*****************************
 //** TICKET DETAIL
 //******************************
@@ -274,6 +357,15 @@ tg-project-menu {
     }
 }
 
+.us-story-main-data {
+    .us-title {
+        background: $white;
+        .us-name {
+            color: $black;
+        }
+    }
+}
+
 //*****************************
 //** LOGIN
 //******************************
@@ -285,18 +377,7 @@ tg-project-menu {
     }
 }
 
-//*****************************
-//** HOME
-//******************************
 
-.home-project-list {
-    li {
-        border: 1px solid $black;
-    }
-    p {
-        color: $black;
-    }
-}
 
 //*****************************
 //** PROFILE
@@ -336,7 +417,6 @@ tg-project-menu {
         }
     }
     label {
-        color: $black;
         &:hover {
             color: $white;
         }
diff --git a/app/themes/high-contrast/variables.scss b/app/themes/high-contrast/variables.scss
index b2ee93d6..de28f77c 100755
--- a/app/themes/high-contrast/variables.scss
+++ b/app/themes/high-contrast/variables.scss
@@ -8,7 +8,7 @@ $blackish: #212121;
 $grayer: #212121;
 $gray: #757575;
 $gray-light: #757575;
-$whitish: #757575;
+$whitish: #c1c1c1;
 $white: #fff;
 
 // Primary colors