diff --git a/client/main.js b/client/main.js
index 07f5d25427..d36009deb7 100644
--- a/client/main.js
+++ b/client/main.js
@@ -87,7 +87,9 @@ main = (function(main, global) {
         return null;
       }
       mainChatTitleAdded = true;
-
+      if ($('body').hasClass('night')) {
+        $('#chat-embed-main').addClass('night');
+      }
       $('#chat-embed-main > .gitter-chat-embed-action-bar').prepend(
         '<div class="chat-embed-main-title">' +
           '<span>Free Code Camp\'s Main Chat</span>' +
@@ -303,6 +305,9 @@ $(document).ready(function() {
         frameBorder: '0'
       });
       $('.map-aside').append(mapAside);
+      if ($('body').hasClass('night')) {
+        mapAside.addClass('night');
+      }
       main.isMapAsideLoad = true;
     }
     $('.map-aside').removeClass('is-collapsed');
@@ -370,6 +375,9 @@ $(document).ready(function() {
       });
       $('.wiki-aside').append(wikiAside);
       main.isWikiAsideLoad = true;
+      if ($('body').hasClass('night')) {
+        wikiAside.addClass('night');
+      }
     }
     $('.wiki-aside').removeClass('is-collapsed');
   }
diff --git a/server/views/layout-wide.jade b/server/views/layout-wide.jade
index cf548c3edc..8484936c90 100644
--- a/server/views/layout-wide.jade
+++ b/server/views/layout-wide.jade
@@ -4,7 +4,7 @@ html(lang='en')
     include partials/meta
     include partials/stylesheets
   if showAside
-      body.map-aside-body
+      body.map-aside-body(class=theme !== 'default' ? theme : '')
           include partials/scripts
           block content
   else
diff --git a/server/views/layout.jade b/server/views/layout.jade
index eefd4090e0..ca093688e5 100644
--- a/server/views/layout.jade
+++ b/server/views/layout.jade
@@ -3,7 +3,7 @@ html(lang='en')
   head
     include partials/meta
     include partials/stylesheets
-  body.top-and-bottom-margins
+  body.top-and-bottom-margins(class=theme !== 'default' ? theme : '')
     include partials/scripts
     include partials/navbar
     include partials/flash