diff --git a/cms/static/sass/_shame.scss b/cms/static/sass/_shame.scss
index 6d0ceb35a8..1be5d2a836 100644
--- a/cms/static/sass/_shame.scss
+++ b/cms/static/sass/_shame.scss
@@ -107,6 +107,23 @@ div.wrapper-comp-editor.is-inactive ~ div.launch-latex-compiler{
 
 // ====================
 
+// JQuery UI tabs font-weight override
+.ui-tabs-nav {
+
+  .ui-state-default {
+    font-weight: normal;
+  }
+}
+
+// ====================
+
+// xmodule editor tab font-weight override
+.xmodule_edit.xmodule_VideoDescriptor .editor-with-tabs .editor-tabs .inner_tab_wrap a.tab {
+  font-weight: normal !important;
+}
+
+// ====================
+
 // TODOs:
 
 // * font-weight syncing
diff --git a/cms/static/sass/_variables.scss b/cms/static/sass/_variables.scss
index 84cd91407b..c046742721 100644
--- a/cms/static/sass/_variables.scss
+++ b/cms/static/sass/_variables.scss
@@ -170,6 +170,7 @@ $color-staff-only: $black;
 
 $color-heading-base: $gray-d2;
 $color-copy-base: $gray-l1;
+$color-copy-emphasized: $gray-d2;
 
 // ====================
 
diff --git a/cms/static/sass/elements/_forms.scss b/cms/static/sass/elements/_forms.scss
index ea0e144ec8..71f9c06488 100644
--- a/cms/static/sass/elements/_forms.scss
+++ b/cms/static/sass/elements/_forms.scss
@@ -9,13 +9,14 @@ textarea.text {
   @include box-sizing(border-box);
   @include linear-gradient($gray-l5, $white);
   @extend %t-copy-sub2;
+  @extend %t-demi-strong;
   padding: 6px 8px 8px;
   border: 1px solid $gray-l2;
   border-radius: 2px;
   background-color: $gray-l5;
   box-shadow: inset 0 1px 2px $shadow-l1;
   font-family: 'Open Sans', sans-serif;
-  color: $baseFontColor;
+  color: $color-copy-emphasized;
   outline: 0;
 
   &::-webkit-input-placeholder,
diff --git a/cms/static/sass/elements/_modal-window.scss b/cms/static/sass/elements/_modal-window.scss
index 907ba57cfc..bc679d5b86 100644
--- a/cms/static/sass/elements/_modal-window.scss
+++ b/cms/static/sass/elements/_modal-window.scss
@@ -25,7 +25,7 @@
 
     .title {
       @extend %t-title5;
-      @extend %t-strong;
+      @extend %t-demi-strong;
       margin: ($baseline/4) ($baseline/2) ($baseline/2) ($baseline/2);
       color: $black;
     }
diff --git a/cms/static/sass/elements/_modules.scss b/cms/static/sass/elements/_modules.scss
index 9894fffcab..2ad444e5b9 100644
--- a/cms/static/sass/elements/_modules.scss
+++ b/cms/static/sass/elements/_modules.scss
@@ -198,7 +198,7 @@
     a {
       @include clearfix();
       @include transition(none);
-      @extend %t-strong;
+      @extend %t-demi-strong;
       display: block;
       border: 0px;
       padding: 7px $baseline;
diff --git a/cms/static/sass/elements/_typography.scss b/cms/static/sass/elements/_typography.scss
index 356b8f9517..cb930f3960 100644
--- a/cms/static/sass/elements/_typography.scss
+++ b/cms/static/sass/elements/_typography.scss
@@ -10,6 +10,9 @@
 %t-strong {
  font-weight: 600;
 }
+%t-demi-strong {
+ font-weight: 500;
+}
 %t-regular {
  font-weight: 400;
 }
diff --git a/cms/static/sass/elements/_xblocks.scss b/cms/static/sass/elements/_xblocks.scss
index 2054fa928a..c75daf9b94 100644
--- a/cms/static/sass/elements/_xblocks.scss
+++ b/cms/static/sass/elements/_xblocks.scss
@@ -497,18 +497,21 @@
       &:first-child {
         border-top: 0;
       }
-    }
 
-    &:hover {
-      opacity: 1.0;
-    }
 
-    &.is-set {
-      opacity: 1.0;
-      background-color: $white;
 
-      .setting-input {
-        color: $blue-l1;
+      // STATE: hover & focus
+      &:hover, &:focus {
+        opacity: 1.0;
+      }
+
+      &.is-set {
+        opacity: 1.0;
+        background-color: $white;
+
+        .setting-input {
+          color: $blue-l1;
+        }
       }
     }