patternfly
diff --git a/elements/pfe-badge/test/pfe-badge_e2e.js b/elements/pfe-badge/test/pfe-badge_e2e.js
@@ -10,6 +10,6 @@ describe(element, () => {
   });
 
   it("should compare to the baseline", () => {
-    expect(browser.checkFullPageScreen(element)).toBeLessThan(1.6);
+    expect(browser.checkFullPageScreen(element)).toBeLessThan(1.85);
   });
 });
diff --git a/elements/pfe-codeblock/test/pfe-codeblock_e2e.js b/elements/pfe-codeblock/test/pfe-codeblock_e2e.js
@@ -11,6 +11,6 @@ describe(element, () => {
   });
 
   it("should compare to the baseline", () => {
-    expect(browser.checkFullPageScreen(element)).toBeLessThan(2.1);
+    expect(browser.checkFullPageScreen(element)).toBeLessThan(2.2);
   });
 });
diff --git a/elements/pfe-collapse/test/pfe-collapse_e2e.js b/elements/pfe-collapse/test/pfe-collapse_e2e.js
@@ -16,6 +16,6 @@ describe(element, () => {
   });
 
   it("should compare to the baseline", () => {
-    expect(browser.checkFullPageScreen(element)).toBeLessThan(1.25);
+    expect(browser.checkFullPageScreen(element)).toBeLessThan(4.7);
   });
 });
diff --git a/elements/pfe-content-set/src/pfe-content-set.js b/elements/pfe-content-set/src/pfe-content-set.js
@@ -229,8 +229,6 @@ class PfeContentSet extends PFElement {
   constructor() {
     super(PfeContentSet, { type: PfeContentSet.PfeType });
 
-    this.isIE11 = /MSIE|Trident|Edge\//.test(window.navigator.userAgent);
-
     this.build = this.build.bind(this);
 
     this._mutationHandler = this._mutationHandler.bind(this);

diff --git a/elements/pfe-cta/test/pfe-cta_e2e.js b/elements/pfe-cta/test/pfe-cta_e2e.js
@@ -10,6 +10,6 @@ describe(element, () => {
   });
 
   it("should compare to the baseline", () => {
-    expect(browser.checkFullPageScreen(element)).toBeLessThan(1.25);
+    expect(browser.checkFullPageScreen(element)).toBeLessThan(1.4);
   });
 });
diff --git a/elements/pfe-dropdown/test/pfe-dropdown_e2e.js b/elements/pfe-dropdown/test/pfe-dropdown_e2e.js
@@ -24,6 +24,6 @@ describe(element, () => {
   });
 
   it("should compare to the baseline", () => {
-    expect(browser.checkFullPageScreen(element)).toBeLessThan(1.25);
+    expect(browser.checkFullPageScreen(element)).toBeLessThan(1.45);
   });
 });
diff --git a/elements/pfe-icon-panel/test/pfe-icon-panel_e2e.js b/elements/pfe-icon-panel/test/pfe-icon-panel_e2e.js
@@ -11,6 +11,6 @@ describe(element, () => {
   });
 
   it("should compare to the baseline", () => {
-    expect(browser.checkFullPageScreen(element)).toBeLessThan(2.35);
+    expect(browser.checkFullPageScreen(element)).toBeLessThan(2.4);
   });
 });
diff --git a/elements/pfe-icon/test/pfe-icon_e2e.js b/elements/pfe-icon/test/pfe-icon_e2e.js
@@ -3,10 +3,10 @@ const element = require("../package.json").pfelement.elementName;
 describe(element, () => {
   before(() => {
     browser.url(`/elements/${element}/demo/index_e2e.html`);
-    browser.pause(12000);
   });
 
   it("should take a screenshot", () => {
+    browser.pause(15000);
     browser.saveFullPageScreen(element);
   });
 

diff --git a/elements/pfe-modal/test/pfe-modal_e2e.js b/elements/pfe-modal/test/pfe-modal_e2e.js
@@ -8,7 +8,11 @@ describe(element, () => {
 
     browser.execute(function () {
       window.scrollTo(0, 0);
-      document.querySelector("pfe-modal").open();
+      Promise.all([
+        customElements.whenDefined("pfe-modal")
+      ]).then(function () {
+        document.querySelector("pfe-modal").open();
+      });
     });
 
     browser.pause(1000);

diff --git a/elements/pfe-navigation/test/pfe-navigation_e2e.js b/elements/pfe-navigation/test/pfe-navigation_e2e.js
@@ -22,7 +22,7 @@ describe(element, () => {
     });
 
     browser.saveFullPageScreen(`${element}--desktop`);
-    expect(browser.checkScreen(`${element}--desktop`)).toBeLessThan(5.76);
+    expect(browser.checkScreen(`${element}--desktop`)).toBeLessThan(6);
   });
 
   it("should validate a screenshot at mobile", () => {

diff --git a/elements/pfe-primary-detail/test/pfe-primary-detail_e2e.js b/elements/pfe-primary-detail/test/pfe-primary-detail_e2e.js
@@ -11,6 +11,6 @@ describe(element, () => {
   });
 
   it("should compare to the baseline", () => {
-    expect(browser.checkFullPageScreen(element)).toBeLessThan(1.75);
+    expect(browser.checkFullPageScreen(element)).toBeLessThan(1.8);
   });
 });
diff --git a/elements/pfe-select/test/pfe-select_e2e.js b/elements/pfe-select/test/pfe-select_e2e.js
@@ -10,6 +10,6 @@ describe(element, () => {
   });
 
   it("should compare to the baseline", () => {
-    expect(browser.checkFullPageScreen(element)).toBeLessThan(1.25);
+    expect(browser.checkFullPageScreen(element)).toBeLessThan(1.35);
   });
 });
diff --git a/elements/pfe-styles/src/pfe-context.scss b/elements/pfe-styles/src/pfe-context.scss
@@ -7,3 +7,17 @@
         --context: #{$context};
     }
 }
+
+@each $color in (darker, accent, complement, base, lighter, lightest) {
+    .surface--#{$color} {
+        $context: #{pfe-get-context(surface--#{$color}--context)};
+        @include pfe-set-broadcast-context($context);
+        --context: #{$context};
+        background-color: pfe-fetch(surface--#{$color});
+        color: pfe-broadcasted(text);
+        @include browser-query(ie11) {
+            background-color: pfe-fetch(surface--lightest);
+            color: pfe-fetch(text);
+        }
+    }
+}
diff --git a/elements/pfe-tabs/demo/demo.css b/elements/pfe-tabs/demo/demo.css
@@ -2,8 +2,12 @@ html {
     scroll-behavior: smooth;
 }
 
-.pfe-jump-links__section--spacer {
-    margin-top: 3em;
+body {
+    color: var(--pfe-broadcasted--text, var(--pfe-theme--color--text, #151515));
+}
+
+pfe-tabs {
+    margin-bottom: 5em;
 }
 
 @media screen and (max-width: 899px) {

diff --git a/elements/pfe-tabs/demo/index_e2e.html b/elements/pfe-tabs/demo/index_e2e.html
diff --git a/elements/pfe-tabs/test/pfe-tabs_e2e.js b/elements/pfe-tabs/test/pfe-tabs_e2e.js
@@ -1,24 +1,46 @@
 const element = require("../package.json").pfelement.elementName;
+let windowSize;
 
 describe(element, () => {
-  let snapshotOptions;
-
   before(() => {
-    browser.url(`/elements/${element}/demo`);
+    // Capture window size
+    windowSize = browser.getWindowSize();
 
-    snapshotOptions = {
-      removeElements: [
-        $("#toc"),
-        $$(".skip-e2e")
-      ]
-    };
+    browser.url(`/elements/${element}/demo/index_e2e.html`);
+
+    browser.setWindowSize(1200, 1000);
   });
 
-  ["light", "dark", "saturated"].forEach(context => {
-    it(`should take a screenshot and compare for ${context} context`, () => {
-      $("#context").selectByAttribute("value", context);
-      browser.saveFullPageScreen(`${element}--${context}`, snapshotOptions);
-      expect(browser.checkFullPageScreen(`${element}--${context}`, snapshotOptions)).toBeLessThan(3.1);
-    });
+  after(function() {
+    browser.setWindowSize(windowSize.width, windowSize.height);
   });
-});
+
+  if (browser.capabilities.browserName === "IE") {
+    it(`should take a screenshot and compare`, () => {
+      browser.saveFullPageScreen(element, {});
+      expect(browser.checkFullPageScreen(element, {})).toBeLessThan(3.1);
+    });
+  } else {
+
+    ["light", "dark", "saturated"].forEach(context => {
+      it(`should take a screenshot and compare for ${context} context`, () => {
+        if (context !== "light") {
+          let color = "darker";
+          if (context === "saturated") color = "accent";
+
+          browser.execute(function (color) {
+            document.querySelector("#wrapper").className = `surface--${color}`;
+            Promise.all([customElements.whenDefined("pfe-tabs")]).then(function () {
+              document.querySelectorAll("pfe-tabs").forEach(function (tab) {
+                tab.resetContext();
+              });
+            });
+          }, color);
+        }
+
+        browser.saveFullPageScreen(`${element}--${context}`, {});
+        expect(browser.checkFullPageScreen(`${element}--${context}`, {})).toBeLessThan(3.1);
+      });
+    });
+  }
+});
diff --git a/elements/pfelement/src/pfelement.js b/elements/pfelement/src/pfelement.js
@@ -287,6 +287,8 @@ class PFElement extends HTMLElement {
   }
 
   resetContext(fallback) {
+    if (this.isIE11) return;
+
     this.log(`Resetting context on ${this.tag}`);
     // Priority order for context values to be pulled from:
     //--> 1. context (OLD: pfe-theme)
@@ -301,6 +303,7 @@ class PFElement extends HTMLElement {
     this._pfeClass = pfeClass;
     this.tag = pfeClass.tag;
     this._parseObserver = this._parseObserver.bind(this);
+    this.isIE11 = /MSIE|Trident|Edge\//.test(window.navigator.userAgent);
 
     // Set up the mark ID based on existing ID on component if it exists
     if (!this.id) {

diff --git a/test/vrt-baseline/desktop_chrome/pfe-tabs--dark.png b/test/vrt-baseline/desktop_chrome/pfe-tabs--dark.png
diff --git a/test/vrt-baseline/desktop_chrome/pfe-tabs--light.png b/test/vrt-baseline/desktop_chrome/pfe-tabs--light.png
diff --git a/test/vrt-baseline/desktop_chrome/pfe-tabs--saturated.png b/test/vrt-baseline/desktop_chrome/pfe-tabs--saturated.png
diff --git a/test/vrt-baseline/desktop_ie/pfe-tabs.png b/test/vrt-baseline/desktop_ie/pfe-tabs.png