diff --git a/client/less/lib/bootstrap/variables.less b/client/less/lib/bootstrap/variables.less
index 40b115431e0..0e411ce3c7c 100755
--- a/client/less/lib/bootstrap/variables.less
+++ b/client/less/lib/bootstrap/variables.less
@@ -37,6 +37,9 @@
 //** Link hover decoration.
 @link-hover-decoration: underline;
 
+//## Night mode styles
+@night-body-bg:         @gray-dark;
+@night-text-color:            #999;
 
 //== Typography
 //
diff --git a/client/less/main.less b/client/less/main.less
index 9f3879bedeb..672eccc002e 100644
--- a/client/less/main.less
+++ b/client/less/main.less
@@ -1134,13 +1134,16 @@ code {
 }
 
 .night {
-  background-color: #333;
-  color: #999;
+  background-color: @night-body-bg;
+  color: @night-text-color;
   .btn-group,
   .text-success,
   .challenge-list-header,
   .fcc-footer {
-    background-color: #333;
+    background-color: @night-body-bg;
+  }
+  hr {
+    background-image: linear-gradient(to right, rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.7), rgba(255, 255, 255, 0));
   }
   .navbar-default .navbar-nav > li > a {
     color: #CCC;
@@ -1148,32 +1151,53 @@ code {
       background-color: #666;
     }
   }
-  a, .input-group-addon {
+  a, .input-group-addon, .challenge-instructions a, .challenge-instructions #MDN-links a {
     color: #CCC;
   }
+  .fa-github-square {
+    color: @brand-primary;
+    &:hover {
+      color: #CCC;
+    }
+  }
   .black-text {
     color:#111;
   }
   code {
-    background-color: #2A2A2A;
-    color: #006400;
+    background-color: #999;
+    color: @brand-primary;
   }
   .fcc-footer {
     a {
       &hover {
-        background-color: #333;
+        background-color: @night-body-bg;
       }
     }
   }
   .btn-primary {
-    background-color: #006400;
+    background-color: @brand-primary;
+    border-color: #292929;
     color:#CCC;
     transition: color 0.2s, background-color 0.2s;
     &:hover {
       background-color: #ABABAB!important;
-      color: #333!important;
+      color: @night-body-bg!important;
     }
   }
+  //** Profile's activity board
+  .cal-heatmap-container {
+    background-color: @night-body-bg;
+  }
+  .graph-rect {
+    fill: @night-text-color !important
+  }
+  //** Profile's odd rows
+  .table-striped > tbody > tr:nth-child(odd) {
+    background-color: @gray;
+  }
+  .table > thead > tr > th, .table > tbody > tr > th, .table > tfoot > tr > th, .table > thead > tr > td, .table > tbody > tr > td, .table > tfoot > tr > td {
+    border-color: @night-text-color;
+  }
 }
 
 @import "chat.less";
diff --git a/client/less/map.less b/client/less/map.less
index 15251f36f0d..b96cc734444 100644
--- a/client/less/map.less
+++ b/client/less/map.less
@@ -318,7 +318,7 @@
 
 .night {
   .map-fixed-header {
-    background-color: #333;
+    background-color: @night-body-bg;
   }
   .map-aside {
     border-left-color:#222;
@@ -328,10 +328,13 @@
     }
   }
   #map-filter, .input-group-addon {
-    border-color: #222;
+    border-color: #292929;
     background-color: #666;
     color:#ABABAB;
   }
+  .map-accordion span.no-link-underline {
+    color: @brand-primary;
+  }
   .map-accordion h2 > a {
     background:#666;
   }
@@ -340,12 +343,12 @@
   }
   .input-group-addon {
     &.filled{
-      background: #555;
-      border-color: #000d00;
+      background: @gray;
+      border-color: #292929;
       color: white;
     }
   }
   .challenge-title {
-    color: #999;
+    color: @night-text-color;
   }
 }