diff --git a/.gitignore b/.gitignore
index 060ae6c2..e2386dbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .sass-cache
 *.css.map
 .idea
+.vscode
\ No newline at end of file
diff --git a/scss/modules/flexpane/_base.scss b/scss/modules/flexpane/_base.scss
index 3f1e34eb..ec891e42 100644
--- a/scss/modules/flexpane/_base.scss
+++ b/scss/modules/flexpane/_base.scss
@@ -133,8 +133,11 @@
     border-color: $color-shade-light;
     color: $base-font-color;
   }
+  &__body {
+    background: $color-base;
+  }
 }
 
 #client_body:not(.onboarding):not(.feature_global_nav_layout):before {
-  background: $color-shade-dark;
+  background: $color-base;
 }
diff --git a/scss/modules/flexpane/_channel.scss b/scss/modules/flexpane/_channel.scss
index 65515908..25b1377f 100644
--- a/scss/modules/flexpane/_channel.scss
+++ b/scss/modules/flexpane/_channel.scss
@@ -240,3 +240,24 @@
     color: $color-highlight;
   }
 }
+
+.c-message_kit {
+  &__pillow {
+    background: $color-base;
+
+    &:hover {
+      border-color: $color-shade-light;
+    }
+  }
+}
+
+.p-highlights_section {
+  &__group_title_line {
+    border-color: $color-shade-light;
+  }
+
+  &__group_title_label {
+    background-color: $color-base;
+    color: $base-font-color;
+  }
+}
diff --git a/scss/modules/flexpane/_files.scss b/scss/modules/flexpane/_files.scss
index 35283470..c4a961b4 100644
--- a/scss/modules/flexpane/_files.scss
+++ b/scss/modules/flexpane/_files.scss
@@ -433,6 +433,9 @@ html.no_touch a.filetype_button_web:hover {
   &__title {
     color: $base-font-color;
   }
+  &__content--collapsed::after {
+    background: linear-gradient(0deg, $color-shade-darkest, $color-shadow-transparent 40px);
+  }
 }
 
 .p-file_list {
@@ -481,3 +484,11 @@ html.no_touch a.filetype_button_web:hover {
     }
   }
 }
+
+.c-pillow_file__post {
+  &__content {
+    ul.checklist {
+      background-color: $color-base;
+    }
+  }
+}
diff --git a/scss/modules/flexpane/_unreads.scss b/scss/modules/flexpane/_unreads.scss
new file mode 100644
index 00000000..7132d0c8
--- /dev/null
+++ b/scss/modules/flexpane/_unreads.scss
@@ -0,0 +1,51 @@
+.p-pages {
+  &__legacy_page_header {
+    color: $base-font-color;
+  }
+}
+
+.p-classic_nav {
+  &__channel_header {
+    &__subtitle {
+      color: $base-font-color;
+    }
+  }
+}
+
+.p-unreads_view {
+  background: $color-base;
+  
+  &__header {
+    background: $color-base;
+
+    &__channel_name {
+      color: $base-font-color;
+    }
+
+    &--collapsed {
+      box-shadow: inset 0 -1px $color-shade-dark;
+    }
+  }
+
+  &__spacer {
+    &--bottom {
+      border-color: $color-shade-dark;
+    }
+  }
+
+  &__empty {
+    background: $color-base;
+  }
+}
+
+.c-icon_button--light,
+.c-icon_button--light.c-button-unstyled,
+.c-icon_button--light:link {
+  color: $base-font-color;
+}
+
+.c-icon_button--light.c-button-unstyled:hover,
+.c-icon_button--light:hover,
+.c-icon_button--light:link:hover {
+  color: $base-font-color;
+}
diff --git a/scss/modules/header/_base.scss b/scss/modules/header/_base.scss
index 61e0db9c..c275d251 100644
--- a/scss/modules/header/_base.scss
+++ b/scss/modules/header/_base.scss
@@ -135,3 +135,37 @@
 #edit_topic_trigger {
   color: $base-link-color;
 }
+
+.p-classic_nav {
+  background: $color-base;
+
+  &__model {
+    &__title {
+      &__info {
+        color: $base-font-color;
+      }
+    }
+
+    &__button {
+      color: $base-font-color;
+    }
+  }
+
+  &__right {
+    &__search {
+      border-color: $base-font-color;
+
+      &__icon {
+        color: $base-font-color;
+      }
+
+      &__placeholder {
+        color: $base-font-color;
+      }
+    }
+
+    &__button {
+      color: $base-font-color;
+    }
+  }
+}
diff --git a/scss/modules/header/_search.scss b/scss/modules/header/_search.scss
index 8ad1492e..ddf2550b 100644
--- a/scss/modules/header/_search.scss
+++ b/scss/modules/header/_search.scss
@@ -119,3 +119,7 @@
 .c-search__input_and_close__close {
   color: $base-font-color;
 }
+
+.c-pillow_file_container {
+  background: $color-base;
+}
diff --git a/scss/modules/inputs/_base.scss b/scss/modules/inputs/_base.scss
index be1975c3..9e7b14e3 100644
--- a/scss/modules/inputs/_base.scss
+++ b/scss/modules/inputs/_base.scss
@@ -49,6 +49,18 @@ textarea {
   }
 }
 
+.c-input_textarea {
+  background: $color-shade-light;
+  border: 1px solid $color-shade-darkest;
+  color: $base-font-color;
+
+  &:active,
+  &:focus {
+    border-color: $color-shade-dark;
+    box-shadow: 0 0 7px rgba($color-shade-lightest, 0.15);
+  }
+}
+
 input:disabled,
 input:disabled:active,
 select:disabled,
@@ -347,4 +359,23 @@ textarea {
   .ql-placeholder {
     color: $base-font-color;
   }
+
+  &.focus {
+    .c-texty_input {
+      &__button {
+        color: $white;
+      }
+    }
+  }
 }
+
+.p-workspace__input {
+  .p-message_input_field,
+  .p-message_input_field.focus {
+    background: $color-shade-light;
+
+    &~.p-message_input_file_button:not(:hover) {
+      color: $white;
+    }
+  }
+}
\ No newline at end of file
diff --git a/scss/modules/inputs/_messaging.scss b/scss/modules/inputs/_messaging.scss
index f1f64163..5459de3c 100644
--- a/scss/modules/inputs/_messaging.scss
+++ b/scss/modules/inputs/_messaging.scss
@@ -199,6 +199,13 @@
     &__warning {
       color: $color-red;
     }
+
+    &__emoji_happy_icon,
+    &__emoji_smile_icon,
+    &__emoji_circle_icon {
+      color: rgba($base-font-color, 0.3);
+    }
+
   }
 
   .c-button {
diff --git a/scss/modules/inputs/_select.scss b/scss/modules/inputs/_select.scss
index 67874018..6a2959f7 100644
--- a/scss/modules/inputs/_select.scss
+++ b/scss/modules/inputs/_select.scss
@@ -22,3 +22,35 @@
     color: $base-font-color;
   }
 }
+
+.c-select_button {
+  background: $color-shade-light;
+
+  &:active {
+    background: $color-shade-dark;
+  }
+
+  &__icon,
+  &:hover,
+  &:hover .c-select_button__icon {
+    color: $white;
+  }
+
+  &:focus {
+    box-shadow: 0 0 0 1px $white, 0 0 0 5px $color-shadow-transparent;
+  }
+}
+
+.c-select_options_list {
+  &__wrapper {
+    background-color: $color-shade-light;
+  }
+
+  &__option {
+    color: $color-highlight;
+
+    &--selected {
+      color: $base-font-color;
+    }
+  }
+}
diff --git a/scss/modules/menu/_tabcomplete.scss b/scss/modules/menu/_tabcomplete.scss
index d4e71431..ecc6762a 100644
--- a/scss/modules/menu/_tabcomplete.scss
+++ b/scss/modules/menu/_tabcomplete.scss
@@ -80,3 +80,16 @@
     color: $color-highlight;
   }
 }
+
+.c-texty_autocomplete {
+  background: $color-base;
+  border: 1px solid $color-shade-dark;
+  box-shadow: 0 1px 15px $color-shadow-dark;
+
+  &__help {
+    background: $black;
+    border-bottom: 1px solid $color-shade-dark;
+    color: $base-font-color;
+    text-shadow: 0 1px $color-shadow-light;
+  }
+}
diff --git a/scss/modules/messaging/_threads.scss b/scss/modules/messaging/_threads.scss
index 5ce9acc8..b07b37b2 100644
--- a/scss/modules/messaging/_threads.scss
+++ b/scss/modules/messaging/_threads.scss
@@ -146,3 +146,51 @@ ts-thread .thread_participants {
     color: $color-highlight;
   }
 }
+
+.p-threads_view_root,
+.p-threads_view_reply,
+.p-threads_view__footer {
+  border-color: $color-shade-mid;
+}
+
+.p_threads_view_load_newer_button,
+.p_threads_view_load_older_button {
+  background: $color-base;
+  border-color: $color-shade-mid;
+}
+
+.p-threads_view {
+  background: $color-base;
+
+  &__divider_line {
+    border-color: $color-shade-dark;
+  }
+
+  &__divider_label {
+    background: $color-base;
+    color: $color-highlight;
+  }
+
+  &__default_background {
+    background: $color-base;
+  }
+}
+
+.p-threads_view_header {
+  &__channel_name {
+    color: $base-font-color;
+  }
+}
+
+.p-threads_footer {
+  &__input--legacy {
+    .p-message_input_file_button,
+    .p-message_input_field {
+      border-color: $color-shade-mid;
+    }
+  }
+}
+
+.c-scrollbar__bar {
+  background: rgba($white, 0.25);
+}
diff --git a/scss/modules/messaging/_unreads.scss b/scss/modules/messaging/_unreads.scss
index 2cb5fc31..8c34a9b6 100644
--- a/scss/modules/messaging/_unreads.scss
+++ b/scss/modules/messaging/_unreads.scss
@@ -110,3 +110,30 @@
   background: $color-base;
   background-image: none;
 }
+
+.sli_briefing {
+  background: $color-base;
+}
+
+.sli_briefing_preview {
+  background-color: $color-base;
+  border-color: $color-shade-mid;
+
+  &__title {
+    color: $base-font-color;
+  }
+
+  &__description_text {
+    b {
+      color: $base-font-color;
+    }
+  }
+}
+
+.sli_briefing_preview_container {
+  &::after,
+  &::before {
+    background-color: $color-base;
+    border-color: $color-shade-mid;
+  }
+}
diff --git a/scss/modules/modals/_base.scss b/scss/modules/modals/_base.scss
index 10f61ca8..c9a8e614 100644
--- a/scss/modules/modals/_base.scss
+++ b/scss/modules/modals/_base.scss
@@ -88,3 +88,30 @@
     background-color: $color-shade-dark;
   }
 }
+
+.c-fullscreen_modal {
+  &__content {
+    background: $color-base;
+  }
+
+  &__header {
+    background: $color-base;
+  }
+
+  &__body {
+    color: $base-font-color;
+  }
+
+  &__back,
+  &__close {
+    color: rgba($base-font-color, 0.5);
+
+    &:hover {
+      color: $base-font-color;
+    }
+
+    &:active {
+      color: $base-font-color;
+    }
+  }
+}
diff --git a/scss/modules/modals/_channel.scss b/scss/modules/modals/_channel.scss
index 7287dd32..eb49eed2 100644
--- a/scss/modules/modals/_channel.scss
+++ b/scss/modules/modals/_channel.scss
@@ -107,3 +107,23 @@
 .notification_prefs_icon::before {
   color: $base-font-color;
 }
+
+.channel_options_modal {
+  .c-fullscreen_modal {
+    &__title {
+      color: $base-font-color;
+    }
+  }
+}
+
+.channel_option_item {
+  border-top-color: $color-shade-dark;
+
+  .title {
+    color: $base-font-color;
+  }
+
+  &:hover {
+    background: $color-shade-dark;
+  }
+}
diff --git a/scss/modules/modals/_direct-messages.scss b/scss/modules/modals/_direct-messages.scss
index 6d2b53ee..4e01bf40 100644
--- a/scss/modules/modals/_direct-messages.scss
+++ b/scss/modules/modals/_direct-messages.scss
@@ -46,3 +46,15 @@
     }
   }
 }
+
+.c-multi_select_input {
+  background-color: $color-shade-light;
+}
+
+.c-truncate {
+  color: $base-font-color;
+}
+
+.c-token {
+  background: $color-highlight;
+}
diff --git a/scss/modules/modals/_file.scss b/scss/modules/modals/_file.scss
index bbf5a37d..af2391a4 100644
--- a/scss/modules/modals/_file.scss
+++ b/scss/modules/modals/_file.scss
@@ -103,3 +103,18 @@
     border-color: $color-shade-dark;
   }
 }
+
+.p-multi_file_upload {
+  &__container {
+    .p-galler_scroller {
+      &__wrapper {
+        background: $color-base;
+        border-color: $color-base;
+      }
+    }
+  }
+
+  &__file_gallery {
+    background: $color-base;
+  }
+}
diff --git a/scss/modules/modals/_preferences.scss b/scss/modules/modals/_preferences.scss
index 28b37451..5d53200c 100644
--- a/scss/modules/modals/_preferences.scss
+++ b/scss/modules/modals/_preferences.scss
@@ -114,3 +114,40 @@
 .jumbomoji_disabled_note {
   color: rgba($color-highlight, 0.6);
 }
+
+.c-sidebar_menu {
+  &__list_item {
+    color: $white;
+
+    &.is_active {
+      background: $color-shade-light;
+      border-color: $color-shade-light;
+    }
+  }
+}
+
+.p-prefs_modal__radiogroup {
+  label {
+    &.p-prefs_modal__radiogroup--selected {
+      background: $color-shade-light;
+      border-color: $color-shade-light;
+
+      .p-prefs_modal__radio_decorator {
+        background: $color-shade-light;
+      }
+    }
+  }
+
+  .p-prefs_modal__radio_decorator {
+    background: $color-base;
+  }
+}
+
+.c-link--button {
+  color: $base-link-color;
+
+  &:active,
+  &:hover {
+    color: $base-link-color-active;
+  }
+}
diff --git a/scss/modules/pages/admin/_base.scss b/scss/modules/pages/admin/_base.scss
index f0428d84..31cc3245 100644
--- a/scss/modules/pages/admin/_base.scss
+++ b/scss/modules/pages/admin/_base.scss
@@ -46,7 +46,7 @@ header {
 
 footer,
 #autocomplete_menu.search_menu footer.unified {
-  background-color: $color-shade-dark;
+  background-color: $color-base;
   border-color: $color-shade-darkest;
   color: $base-font-color;
 
diff --git a/scss/modules/tooltips/_member.scss b/scss/modules/tooltips/_member.scss
index 0767cc7c..495c441d 100644
--- a/scss/modules/tooltips/_member.scss
+++ b/scss/modules/tooltips/_member.scss
@@ -54,3 +54,13 @@
 .member_meta {
   color: $base-link-color;
 }
+
+.p-member_profile_card {
+  background: $black;
+}
+
+.p-member_profile_field {
+  &__label {
+    color: $color-shade-light;
+  }
+}
diff --git a/scss/styles.scss b/scss/styles.scss
index 2c20138c..df8dfa8d 100644
--- a/scss/styles.scss
+++ b/scss/styles.scss
@@ -15,6 +15,7 @@
 @import "modules/inputs/toggle";
 @import "modules/inputs/label";
 @import "modules/inputs/datepicker";
+@import "modules/inputs/select";
 
 @import "modules/menu/base";
 @import "modules/menu/autocomplete";
@@ -52,6 +53,7 @@
 @import "modules/flexpane/team";
 @import "modules/flexpane/threads";
 @import "modules/flexpane/whats-new";
+@import "modules/flexpane/unreads";
 
 @import "modules/team/base";
 
@@ -97,4 +99,4 @@
 @import "modules/pages/apps";
 @import "modules/pages/legal";
 @import "modules/pages/oauth";
-@import "modules/pages/spaces";
+@import "modules/pages/spaces";
\ No newline at end of file