diff --git a/assets/scss/_boxes.scss b/assets/scss/_boxes.scss
index 164b0f6f6e..b06d81e058 100644
--- a/assets/scss/_boxes.scss
+++ b/assets/scss/_boxes.scss
@@ -3,7 +3,7 @@
 
 // box-variant creates the main style for a colored section used on the site.
 @mixin box-variant($parent, $color-name, $color-value) {
-    $text-color: color-yiq($color-value);
+    $text-color: color-contrast($color-value);
     $link-color: mix($blue, $text-color, lightness($color-value));
     $link-hover-color: rgba($link-color, 0.5) !default;
 
diff --git a/assets/scss/_colors.scss b/assets/scss/_colors.scss
index 3f34aa84e3..9f0ee5344c 100644
--- a/assets/scss/_colors.scss
+++ b/assets/scss/_colors.scss
@@ -1,6 +1,6 @@
 // Add some local palette classes so you can do -bg-warning -text-warning etc. Even -bg-1 if you want to paint by numbers.
 @mixin palette-variant($color-name, $color-value) {
-    $text-color: color-yiq($color-value);
+    $text-color: color-contrast($color-value);
     $link-color: mix($blue, $text-color, lightness($color-value));
    
     $link-hover-color: rgba($link-color, .5) !default;
diff --git a/assets/vendor/bootstrap b/assets/vendor/bootstrap
index a716fb03f9..ad10f00d5e 160000
--- a/assets/vendor/bootstrap
+++ b/assets/vendor/bootstrap
@@ -1 +1 @@
-Subproject commit a716fb03f965dc0846df479e14388b1b4b93d7ce
+Subproject commit ad10f00d5e073f60b8d86d03812742b97037c336