diff --git a/src/__tests__/BreadcrumbItem.js b/src/__tests__/BreadcrumbItem.js
index 4f0fd776ab0..4b1e25c573c 100644
--- a/src/__tests__/BreadcrumbItem.js
+++ b/src/__tests__/BreadcrumbItem.js
@@ -23,7 +23,7 @@ describe('Breadcrumb.Item', () => {
   })
 
   it('renders the given "as" prop', () => {
-    const Type = props => <b {...props} />
+    const Type = ({theme, ...props}) => <b {...props} />
     expect(render(<Breadcrumb.Item as={Type} />)).toMatchSnapshot()
   })
 
diff --git a/src/__tests__/FilterListItem.js b/src/__tests__/FilterListItem.js
index 02a5742e458..56d00c1bfab 100644
--- a/src/__tests__/FilterListItem.js
+++ b/src/__tests__/FilterListItem.js
@@ -28,7 +28,7 @@ describe('FilterList.Item', () => {
   })
 
   it('renders the given "as" prop', () => {
-    const Type = props => <b {...props} />
+    const Type = ({theme, ...props}) => <b {...props} />
     expect(render(<FilterList.Item as={Type} />)).toMatchSnapshot()
   })
 
diff --git a/src/__tests__/SubNavLink.js b/src/__tests__/SubNavLink.js
index e7794278302..d18e7676c6a 100644
--- a/src/__tests__/SubNavLink.js
+++ b/src/__tests__/SubNavLink.js
@@ -23,7 +23,7 @@ describe('SubNav.Link', () => {
   })
 
   it('renders the given "as" prop', () => {
-    const Type = props => <b {...props} />
+    const Type = ({theme, ...props}) => <b {...props} />
     expect(render(<SubNav.Link as={Type} />)).toMatchSnapshot()
   })
 
diff --git a/src/__tests__/UnderlineNavLink.js b/src/__tests__/UnderlineNavLink.js
index ece0cdc884d..c09b7fac3de 100644
--- a/src/__tests__/UnderlineNavLink.js
+++ b/src/__tests__/UnderlineNavLink.js
@@ -23,7 +23,7 @@ describe('UnderlineNav.Link', () => {
   })
 
   it('renders the given "as" prop', () => {
-    const Type = props => <b {...props} />
+    const Type = ({theme, ...props}) => <b {...props} />
     expect(render(<UnderlineNav.Link as={Type} />)).toMatchSnapshot()
   })
 
diff --git a/src/__tests__/__snapshots__/BreadcrumbItem.js.snap b/src/__tests__/__snapshots__/BreadcrumbItem.js.snap
index 4d31c8bffb4..f4419bc6c37 100644
--- a/src/__tests__/__snapshots__/BreadcrumbItem.js.snap
+++ b/src/__tests__/__snapshots__/BreadcrumbItem.js.snap
@@ -23,341 +23,6 @@ exports[`Breadcrumb.Item renders the given "as" prop 1`] = `
   activeClassName=""
   aria-current={null}
   className="c0"
-  theme={
-    Object {
-      "borders": Array [
-        0,
-        "1px solid",
-      ],
-      "breakpoints": Array [
-        "544px",
-        "768px",
-        "1012px",
-        "1280px",
-      ],
-      "buttons": Object {
-        "danger": Object {
-          "bg": Object {
-            "active": "#be222e",
-            "default": "#fafbfc",
-            "disabled": "#F3F4F6",
-            "hover": "#cb2431",
-          },
-          "border": Object {
-            "active": "#9e1c23",
-            "default": "#e1e4e8",
-            "hover": "#b31d28",
-          },
-          "color": Object {
-            "active": "#fff",
-            "default": "#cb2431",
-            "disabled": "rgba(203,36,49, .5)",
-            "hover": "#fff",
-          },
-          "shadow": Object {
-            "active": "inset 0px 2px 0px rgba(179, 29, 40, 0.4)",
-            "default": "0px 1px 0px rgba(149, 157, 165, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.25)",
-            "focus": "0 0 0 3px rgba(203, 36, 49, 0.4)",
-            "hover": "0px 1px 0px rgba(149, 157, 165, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.03)",
-          },
-        },
-        "default": Object {
-          "bg": Object {
-            "active": "#edeff2",
-            "default": "#fafbfc",
-            "disabled": "#fafbfc",
-            "hover": "#F3F4F6",
-          },
-          "border": Object {
-            "active": "#d1d5da",
-            "default": "#e1e4e8",
-            "disabled": "#eaecef",
-          },
-          "color": Object {
-            "default": "#24292e",
-            "disabled": "#959da5",
-          },
-          "shadow": Object {
-            "active": "inset 0px 2px 0px rgba(149, 157, 165, 0.1)",
-            "default": "0px 1px 0px rgba(149, 157, 165, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.25)",
-            "focus": "0 0 0 3px rgba(3, 102, 214, 0.3)",
-            "hover": "0px 1px 0px rgba(209, 213, 218, 0.2), inset 0px 2px 0px rgba(255, 255, 255, 0.1)",
-          },
-        },
-        "outline": Object {
-          "bg": Object {
-            "active": "#035fc7",
-            "default": "#fafbfc",
-            "disabled": "#F3F4F6",
-            "hover": "#0366d6",
-          },
-          "border": Object {
-            "active": "rgba(4, 66, 137, .5)",
-            "default": "#e1e4e8",
-            "hover": "#005cc5",
-          },
-          "color": Object {
-            "active": "#fff",
-            "default": "#005cc5",
-            "disabled": "#959da5",
-            "hover": "#fff",
-          },
-          "shadow": Object {
-            "active": "inset 0px 1px 0px rgba(4, 66, 137, 0.2)",
-            "default": "0px 1px 0px rgba(149, 157, 165, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.25)",
-            "focus": "0 0 0 3px rgba(3, 102, 214, 0.3)",
-            "hover": "0px 1px 0px rgba(149, 157, 165, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.03)",
-          },
-        },
-        "primary": Object {
-          "bg": Object {
-            "active": "#128031",
-            "default": "#159739",
-            "disabled": "#94D3A2",
-            "focus": "#138934",
-            "hover": "#138934",
-          },
-          "border": Object {
-            "active": "#176f2c",
-            "default": "#22863a",
-            "disabled": "rgba(34, 134, 58, 0.1)",
-            "hover": "#176f2c",
-          },
-          "color": Object {
-            "default": "#fff",
-            "disabled": "rgba(255, 255, 255, 0.50)",
-          },
-          "shadow": Object {
-            "active": "inset 0px 1px 0px rgba(20, 70, 32, 0.2)",
-            "default": " 0px 1px 0px rgba(20, 70, 32, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.03)",
-            "focus": "0 0 0 3px #94D3A2",
-          },
-        },
-      },
-      "colors": Object {
-        "accent": "#f66a0a",
-        "bg": Object {
-          "disabled": "#F3F4F6",
-          "gray": "#f6f8fa",
-          "grayLight": "#fafbfc",
-        },
-        "black": "#1b1f23",
-        "blackfade15": "rgba(27, 31, 35, 0.15)",
-        "blackfade20": "rgba(27, 31, 35, 0.20)",
-        "blackfade30": "rgba(27,31,35,0.3)",
-        "blackfade35": "rgba(27, 31, 35, 0.35)",
-        "blackfade50": "rgba(27, 31, 35, 0.5)",
-        "blue": Array [
-          "#f1f8ff",
-          "#dbedff",
-          "#c8e1ff",
-          "#79b8ff",
-          "#2188ff",
-          "#0366d6",
-          "#005cc5",
-          "#044289",
-          "#032f62",
-          "#05264c",
-        ],
-        "bodytext": "#24292e",
-        "border": Object {
-          "gray": "#e1e4e8",
-          "grayDark": "#d1d5da",
-          "grayLight": "#eaecef",
-        },
-        "counter": Object {
-          "bg": "rgba(27, 31, 35, 0.08)",
-        },
-        "filterList": Object {
-          "hoverBg": "#eaecef",
-        },
-        "gray": Array [
-          "#fafbfc",
-          "#f6f8fa",
-          "#e1e4e8",
-          "#d1d5da",
-          "#959da5",
-          "#6a737d",
-          "#586069",
-          "#444d56",
-          "#2f363d",
-          "#24292e",
-        ],
-        "green": Array [
-          "#f0fff4",
-          "#dcffe4",
-          "#bef5cb",
-          "#85e89d",
-          "#34d058",
-          "#28a745",
-          "#22863a",
-          "#176f2c",
-          "#165c26",
-          "#144620",
-        ],
-        "orange": Array [
-          "#fff8f2",
-          "#ffebda",
-          "#ffd1ac",
-          "#ffab70",
-          "#fb8532",
-          "#f66a0a",
-          "#e36209",
-          "#d15704",
-          "#c24e00",
-          "#a04100",
-        ],
-        "purple": Array [
-          "#f5f0ff",
-          "#e6dcfd",
-          "#d1bcf9",
-          "#b392f0",
-          "#8a63d2",
-          "#6f42c1",
-          "#5a32a3",
-          "#4c2889",
-          "#3a1d6e",
-          "#29134e",
-        ],
-        "red": Array [
-          "#ffeef0",
-          "#ffdce0",
-          "#fdaeb7",
-          "#f97583",
-          "#ea4a5a",
-          "#d73a49",
-          "#cb2431",
-          "#b31d28",
-          "#9e1c23",
-          "#86181d",
-        ],
-        "state": Object {
-          "error": "#d73a49",
-          "failure": "#d73a49",
-          "pending": "#dbab09",
-          "queued": "#dbab09",
-          "success": "#28a745",
-          "unknown": "#959da5",
-        },
-        "text": Object {
-          "gray": "#586069",
-          "grayDark": "#24292e",
-          "grayLight": "#6a737d",
-          "red": "#cb2431",
-        },
-        "white": "#fff",
-        "whitefade15": "rgba(255, 255, 255, 0.15)",
-        "whitefade50": "rgba(255, 255, 255, 0.50)",
-        "yellow": Array [
-          "#fffdef",
-          "#fffbdd",
-          "#fff5b1",
-          "#ffea7f",
-          "#ffdf5d",
-          "#ffd33d",
-          "#f9c513",
-          "#dbab09",
-          "#b08800",
-          "#735c0f",
-        ],
-      },
-      "fontSizes": Array [
-        "12px",
-        "14px",
-        "16px",
-        "20px",
-        "24px",
-        "32px",
-        "40px",
-        "48px",
-      ],
-      "fontWeights": Object {
-        "bold": 600,
-        "light": 300,
-        "normal": 400,
-        "semibold": 500,
-      },
-      "fonts": Object {
-        "mono": "SFMono-Regular, Consolas, \\"Liberation Mono\\", Menlo, Courier, monospace",
-        "normal": "-apple-system, BlinkMacSystemFont, \\"Segoe UI\\", Helvetica, Arial, sans-serif, \\"Apple Color Emoji\\", \\"Segoe UI Emoji\\", \\"Segoe UI Symbol\\"",
-      },
-      "lineHeights": Object {
-        "condensed": 1.25,
-        "condensedUltra": 1,
-        "default": 1.5,
-      },
-      "pagination": Object {
-        "borderRadius": "3px",
-        "colors": Object {
-          "disabled": Object {
-            "bg": "#fafbfc",
-            "border": "#e1e4e8",
-            "fg": "#d1d5da",
-          },
-          "hover": Object {
-            "bg": "#f6f8fa",
-            "border": "#e1e4e8",
-            "fg": "#0366d6",
-          },
-          "normal": Object {
-            "bg": "#fff",
-            "border": "#e1e4e8",
-            "fg": "#0366d6",
-          },
-          "selected": Object {
-            "bg": "#0366d6",
-            "border": "#0366d6",
-            "fg": "#fff",
-          },
-        },
-        "fontSize": "13px",
-        "fontWeight": 600,
-      },
-      "popovers": Object {
-        "colors": Object {
-          "caret": "rgba(27, 31, 35, 0.15)",
-        },
-      },
-      "radii": Array [
-        "0",
-        "3px",
-        "6px",
-        "100px",
-      ],
-      "shadows": Object {
-        "extra-large": "0 10px 50px rgba(27, 31, 35, 0.07)",
-        "formControl": "inset 0px 2px 0px rgba(225, 228, 232, 0.2)",
-        "formControlDisabled": "inset 0px 2px 0px rgba(220, 227, 237, 0.3)",
-        "formControlFocus": "rgba(3, 102, 214, 0.3) 0px 0px 0px 0.2em",
-        "large": "0 1px 15px rgba(27, 31, 35, 0.15)",
-        "medium": "0 1px 5px rgba(27, 31, 35, 0.15)",
-        "primaryActiveShadow": "inset 0px 1px 0px rgba(20, 70, 32, 0.2)",
-        "primaryShadow": "0px 1px 0px rgba(20, 70, 32, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.03)",
-        "small": "0 1px 1px rgba(27, 31, 35, 0.1)",
-      },
-      "sizes": Object {
-        "large": "1012px",
-        "medium": "768px",
-        "small": "544px",
-        "xlarge": "1280px",
-      },
-      "space": Array [
-        "0",
-        "4px",
-        "8px",
-        "16px",
-        "24px",
-        "32px",
-        "40px",
-        "48px",
-        "64px",
-        "80px",
-        "96px",
-        "112px",
-        "128px",
-      ],
-    }
-  }
 />
 `;
 
diff --git a/src/__tests__/__snapshots__/FilterListItem.js.snap b/src/__tests__/__snapshots__/FilterListItem.js.snap
index 46b6de7b6c7..935d9f62ad5 100644
--- a/src/__tests__/__snapshots__/FilterListItem.js.snap
+++ b/src/__tests__/__snapshots__/FilterListItem.js.snap
@@ -36,341 +36,6 @@ exports[`FilterList.Item renders the given "as" prop 1`] = `
 
 <b
   className="c0"
-  theme={
-    Object {
-      "borders": Array [
-        0,
-        "1px solid",
-      ],
-      "breakpoints": Array [
-        "544px",
-        "768px",
-        "1012px",
-        "1280px",
-      ],
-      "buttons": Object {
-        "danger": Object {
-          "bg": Object {
-            "active": "#be222e",
-            "default": "#fafbfc",
-            "disabled": "#F3F4F6",
-            "hover": "#cb2431",
-          },
-          "border": Object {
-            "active": "#9e1c23",
-            "default": "#e1e4e8",
-            "hover": "#b31d28",
-          },
-          "color": Object {
-            "active": "#fff",
-            "default": "#cb2431",
-            "disabled": "rgba(203,36,49, .5)",
-            "hover": "#fff",
-          },
-          "shadow": Object {
-            "active": "inset 0px 2px 0px rgba(179, 29, 40, 0.4)",
-            "default": "0px 1px 0px rgba(149, 157, 165, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.25)",
-            "focus": "0 0 0 3px rgba(203, 36, 49, 0.4)",
-            "hover": "0px 1px 0px rgba(149, 157, 165, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.03)",
-          },
-        },
-        "default": Object {
-          "bg": Object {
-            "active": "#edeff2",
-            "default": "#fafbfc",
-            "disabled": "#fafbfc",
-            "hover": "#F3F4F6",
-          },
-          "border": Object {
-            "active": "#d1d5da",
-            "default": "#e1e4e8",
-            "disabled": "#eaecef",
-          },
-          "color": Object {
-            "default": "#24292e",
-            "disabled": "#959da5",
-          },
-          "shadow": Object {
-            "active": "inset 0px 2px 0px rgba(149, 157, 165, 0.1)",
-            "default": "0px 1px 0px rgba(149, 157, 165, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.25)",
-            "focus": "0 0 0 3px rgba(3, 102, 214, 0.3)",
-            "hover": "0px 1px 0px rgba(209, 213, 218, 0.2), inset 0px 2px 0px rgba(255, 255, 255, 0.1)",
-          },
-        },
-        "outline": Object {
-          "bg": Object {
-            "active": "#035fc7",
-            "default": "#fafbfc",
-            "disabled": "#F3F4F6",
-            "hover": "#0366d6",
-          },
-          "border": Object {
-            "active": "rgba(4, 66, 137, .5)",
-            "default": "#e1e4e8",
-            "hover": "#005cc5",
-          },
-          "color": Object {
-            "active": "#fff",
-            "default": "#005cc5",
-            "disabled": "#959da5",
-            "hover": "#fff",
-          },
-          "shadow": Object {
-            "active": "inset 0px 1px 0px rgba(4, 66, 137, 0.2)",
-            "default": "0px 1px 0px rgba(149, 157, 165, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.25)",
-            "focus": "0 0 0 3px rgba(3, 102, 214, 0.3)",
-            "hover": "0px 1px 0px rgba(149, 157, 165, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.03)",
-          },
-        },
-        "primary": Object {
-          "bg": Object {
-            "active": "#128031",
-            "default": "#159739",
-            "disabled": "#94D3A2",
-            "focus": "#138934",
-            "hover": "#138934",
-          },
-          "border": Object {
-            "active": "#176f2c",
-            "default": "#22863a",
-            "disabled": "rgba(34, 134, 58, 0.1)",
-            "hover": "#176f2c",
-          },
-          "color": Object {
-            "default": "#fff",
-            "disabled": "rgba(255, 255, 255, 0.50)",
-          },
-          "shadow": Object {
-            "active": "inset 0px 1px 0px rgba(20, 70, 32, 0.2)",
-            "default": " 0px 1px 0px rgba(20, 70, 32, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.03)",
-            "focus": "0 0 0 3px #94D3A2",
-          },
-        },
-      },
-      "colors": Object {
-        "accent": "#f66a0a",
-        "bg": Object {
-          "disabled": "#F3F4F6",
-          "gray": "#f6f8fa",
-          "grayLight": "#fafbfc",
-        },
-        "black": "#1b1f23",
-        "blackfade15": "rgba(27, 31, 35, 0.15)",
-        "blackfade20": "rgba(27, 31, 35, 0.20)",
-        "blackfade30": "rgba(27,31,35,0.3)",
-        "blackfade35": "rgba(27, 31, 35, 0.35)",
-        "blackfade50": "rgba(27, 31, 35, 0.5)",
-        "blue": Array [
-          "#f1f8ff",
-          "#dbedff",
-          "#c8e1ff",
-          "#79b8ff",
-          "#2188ff",
-          "#0366d6",
-          "#005cc5",
-          "#044289",
-          "#032f62",
-          "#05264c",
-        ],
-        "bodytext": "#24292e",
-        "border": Object {
-          "gray": "#e1e4e8",
-          "grayDark": "#d1d5da",
-          "grayLight": "#eaecef",
-        },
-        "counter": Object {
-          "bg": "rgba(27, 31, 35, 0.08)",
-        },
-        "filterList": Object {
-          "hoverBg": "#eaecef",
-        },
-        "gray": Array [
-          "#fafbfc",
-          "#f6f8fa",
-          "#e1e4e8",
-          "#d1d5da",
-          "#959da5",
-          "#6a737d",
-          "#586069",
-          "#444d56",
-          "#2f363d",
-          "#24292e",
-        ],
-        "green": Array [
-          "#f0fff4",
-          "#dcffe4",
-          "#bef5cb",
-          "#85e89d",
-          "#34d058",
-          "#28a745",
-          "#22863a",
-          "#176f2c",
-          "#165c26",
-          "#144620",
-        ],
-        "orange": Array [
-          "#fff8f2",
-          "#ffebda",
-          "#ffd1ac",
-          "#ffab70",
-          "#fb8532",
-          "#f66a0a",
-          "#e36209",
-          "#d15704",
-          "#c24e00",
-          "#a04100",
-        ],
-        "purple": Array [
-          "#f5f0ff",
-          "#e6dcfd",
-          "#d1bcf9",
-          "#b392f0",
-          "#8a63d2",
-          "#6f42c1",
-          "#5a32a3",
-          "#4c2889",
-          "#3a1d6e",
-          "#29134e",
-        ],
-        "red": Array [
-          "#ffeef0",
-          "#ffdce0",
-          "#fdaeb7",
-          "#f97583",
-          "#ea4a5a",
-          "#d73a49",
-          "#cb2431",
-          "#b31d28",
-          "#9e1c23",
-          "#86181d",
-        ],
-        "state": Object {
-          "error": "#d73a49",
-          "failure": "#d73a49",
-          "pending": "#dbab09",
-          "queued": "#dbab09",
-          "success": "#28a745",
-          "unknown": "#959da5",
-        },
-        "text": Object {
-          "gray": "#586069",
-          "grayDark": "#24292e",
-          "grayLight": "#6a737d",
-          "red": "#cb2431",
-        },
-        "white": "#fff",
-        "whitefade15": "rgba(255, 255, 255, 0.15)",
-        "whitefade50": "rgba(255, 255, 255, 0.50)",
-        "yellow": Array [
-          "#fffdef",
-          "#fffbdd",
-          "#fff5b1",
-          "#ffea7f",
-          "#ffdf5d",
-          "#ffd33d",
-          "#f9c513",
-          "#dbab09",
-          "#b08800",
-          "#735c0f",
-        ],
-      },
-      "fontSizes": Array [
-        "12px",
-        "14px",
-        "16px",
-        "20px",
-        "24px",
-        "32px",
-        "40px",
-        "48px",
-      ],
-      "fontWeights": Object {
-        "bold": 600,
-        "light": 300,
-        "normal": 400,
-        "semibold": 500,
-      },
-      "fonts": Object {
-        "mono": "SFMono-Regular, Consolas, \\"Liberation Mono\\", Menlo, Courier, monospace",
-        "normal": "-apple-system, BlinkMacSystemFont, \\"Segoe UI\\", Helvetica, Arial, sans-serif, \\"Apple Color Emoji\\", \\"Segoe UI Emoji\\", \\"Segoe UI Symbol\\"",
-      },
-      "lineHeights": Object {
-        "condensed": 1.25,
-        "condensedUltra": 1,
-        "default": 1.5,
-      },
-      "pagination": Object {
-        "borderRadius": "3px",
-        "colors": Object {
-          "disabled": Object {
-            "bg": "#fafbfc",
-            "border": "#e1e4e8",
-            "fg": "#d1d5da",
-          },
-          "hover": Object {
-            "bg": "#f6f8fa",
-            "border": "#e1e4e8",
-            "fg": "#0366d6",
-          },
-          "normal": Object {
-            "bg": "#fff",
-            "border": "#e1e4e8",
-            "fg": "#0366d6",
-          },
-          "selected": Object {
-            "bg": "#0366d6",
-            "border": "#0366d6",
-            "fg": "#fff",
-          },
-        },
-        "fontSize": "13px",
-        "fontWeight": 600,
-      },
-      "popovers": Object {
-        "colors": Object {
-          "caret": "rgba(27, 31, 35, 0.15)",
-        },
-      },
-      "radii": Array [
-        "0",
-        "3px",
-        "6px",
-        "100px",
-      ],
-      "shadows": Object {
-        "extra-large": "0 10px 50px rgba(27, 31, 35, 0.07)",
-        "formControl": "inset 0px 2px 0px rgba(225, 228, 232, 0.2)",
-        "formControlDisabled": "inset 0px 2px 0px rgba(220, 227, 237, 0.3)",
-        "formControlFocus": "rgba(3, 102, 214, 0.3) 0px 0px 0px 0.2em",
-        "large": "0 1px 15px rgba(27, 31, 35, 0.15)",
-        "medium": "0 1px 5px rgba(27, 31, 35, 0.15)",
-        "primaryActiveShadow": "inset 0px 1px 0px rgba(20, 70, 32, 0.2)",
-        "primaryShadow": "0px 1px 0px rgba(20, 70, 32, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.03)",
-        "small": "0 1px 1px rgba(27, 31, 35, 0.1)",
-      },
-      "sizes": Object {
-        "large": "1012px",
-        "medium": "768px",
-        "small": "544px",
-        "xlarge": "1280px",
-      },
-      "space": Array [
-        "0",
-        "4px",
-        "8px",
-        "16px",
-        "24px",
-        "32px",
-        "40px",
-        "48px",
-        "64px",
-        "80px",
-        "96px",
-        "112px",
-        "128px",
-      ],
-    }
-  }
 />
 `;
 
diff --git a/src/__tests__/__snapshots__/SubNavLink.js.snap b/src/__tests__/__snapshots__/SubNavLink.js.snap
index a743fc0410d..dd39055d0a8 100644
--- a/src/__tests__/__snapshots__/SubNavLink.js.snap
+++ b/src/__tests__/__snapshots__/SubNavLink.js.snap
@@ -63,341 +63,6 @@ exports[`SubNav.Link renders the given "as" prop 1`] = `
 <b
   activeClassName=""
   className="c0 SubNav-item"
-  theme={
-    Object {
-      "borders": Array [
-        0,
-        "1px solid",
-      ],
-      "breakpoints": Array [
-        "544px",
-        "768px",
-        "1012px",
-        "1280px",
-      ],
-      "buttons": Object {
-        "danger": Object {
-          "bg": Object {
-            "active": "#be222e",
-            "default": "#fafbfc",
-            "disabled": "#F3F4F6",
-            "hover": "#cb2431",
-          },
-          "border": Object {
-            "active": "#9e1c23",
-            "default": "#e1e4e8",
-            "hover": "#b31d28",
-          },
-          "color": Object {
-            "active": "#fff",
-            "default": "#cb2431",
-            "disabled": "rgba(203,36,49, .5)",
-            "hover": "#fff",
-          },
-          "shadow": Object {
-            "active": "inset 0px 2px 0px rgba(179, 29, 40, 0.4)",
-            "default": "0px 1px 0px rgba(149, 157, 165, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.25)",
-            "focus": "0 0 0 3px rgba(203, 36, 49, 0.4)",
-            "hover": "0px 1px 0px rgba(149, 157, 165, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.03)",
-          },
-        },
-        "default": Object {
-          "bg": Object {
-            "active": "#edeff2",
-            "default": "#fafbfc",
-            "disabled": "#fafbfc",
-            "hover": "#F3F4F6",
-          },
-          "border": Object {
-            "active": "#d1d5da",
-            "default": "#e1e4e8",
-            "disabled": "#eaecef",
-          },
-          "color": Object {
-            "default": "#24292e",
-            "disabled": "#959da5",
-          },
-          "shadow": Object {
-            "active": "inset 0px 2px 0px rgba(149, 157, 165, 0.1)",
-            "default": "0px 1px 0px rgba(149, 157, 165, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.25)",
-            "focus": "0 0 0 3px rgba(3, 102, 214, 0.3)",
-            "hover": "0px 1px 0px rgba(209, 213, 218, 0.2), inset 0px 2px 0px rgba(255, 255, 255, 0.1)",
-          },
-        },
-        "outline": Object {
-          "bg": Object {
-            "active": "#035fc7",
-            "default": "#fafbfc",
-            "disabled": "#F3F4F6",
-            "hover": "#0366d6",
-          },
-          "border": Object {
-            "active": "rgba(4, 66, 137, .5)",
-            "default": "#e1e4e8",
-            "hover": "#005cc5",
-          },
-          "color": Object {
-            "active": "#fff",
-            "default": "#005cc5",
-            "disabled": "#959da5",
-            "hover": "#fff",
-          },
-          "shadow": Object {
-            "active": "inset 0px 1px 0px rgba(4, 66, 137, 0.2)",
-            "default": "0px 1px 0px rgba(149, 157, 165, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.25)",
-            "focus": "0 0 0 3px rgba(3, 102, 214, 0.3)",
-            "hover": "0px 1px 0px rgba(149, 157, 165, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.03)",
-          },
-        },
-        "primary": Object {
-          "bg": Object {
-            "active": "#128031",
-            "default": "#159739",
-            "disabled": "#94D3A2",
-            "focus": "#138934",
-            "hover": "#138934",
-          },
-          "border": Object {
-            "active": "#176f2c",
-            "default": "#22863a",
-            "disabled": "rgba(34, 134, 58, 0.1)",
-            "hover": "#176f2c",
-          },
-          "color": Object {
-            "default": "#fff",
-            "disabled": "rgba(255, 255, 255, 0.50)",
-          },
-          "shadow": Object {
-            "active": "inset 0px 1px 0px rgba(20, 70, 32, 0.2)",
-            "default": " 0px 1px 0px rgba(20, 70, 32, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.03)",
-            "focus": "0 0 0 3px #94D3A2",
-          },
-        },
-      },
-      "colors": Object {
-        "accent": "#f66a0a",
-        "bg": Object {
-          "disabled": "#F3F4F6",
-          "gray": "#f6f8fa",
-          "grayLight": "#fafbfc",
-        },
-        "black": "#1b1f23",
-        "blackfade15": "rgba(27, 31, 35, 0.15)",
-        "blackfade20": "rgba(27, 31, 35, 0.20)",
-        "blackfade30": "rgba(27,31,35,0.3)",
-        "blackfade35": "rgba(27, 31, 35, 0.35)",
-        "blackfade50": "rgba(27, 31, 35, 0.5)",
-        "blue": Array [
-          "#f1f8ff",
-          "#dbedff",
-          "#c8e1ff",
-          "#79b8ff",
-          "#2188ff",
-          "#0366d6",
-          "#005cc5",
-          "#044289",
-          "#032f62",
-          "#05264c",
-        ],
-        "bodytext": "#24292e",
-        "border": Object {
-          "gray": "#e1e4e8",
-          "grayDark": "#d1d5da",
-          "grayLight": "#eaecef",
-        },
-        "counter": Object {
-          "bg": "rgba(27, 31, 35, 0.08)",
-        },
-        "filterList": Object {
-          "hoverBg": "#eaecef",
-        },
-        "gray": Array [
-          "#fafbfc",
-          "#f6f8fa",
-          "#e1e4e8",
-          "#d1d5da",
-          "#959da5",
-          "#6a737d",
-          "#586069",
-          "#444d56",
-          "#2f363d",
-          "#24292e",
-        ],
-        "green": Array [
-          "#f0fff4",
-          "#dcffe4",
-          "#bef5cb",
-          "#85e89d",
-          "#34d058",
-          "#28a745",
-          "#22863a",
-          "#176f2c",
-          "#165c26",
-          "#144620",
-        ],
-        "orange": Array [
-          "#fff8f2",
-          "#ffebda",
-          "#ffd1ac",
-          "#ffab70",
-          "#fb8532",
-          "#f66a0a",
-          "#e36209",
-          "#d15704",
-          "#c24e00",
-          "#a04100",
-        ],
-        "purple": Array [
-          "#f5f0ff",
-          "#e6dcfd",
-          "#d1bcf9",
-          "#b392f0",
-          "#8a63d2",
-          "#6f42c1",
-          "#5a32a3",
-          "#4c2889",
-          "#3a1d6e",
-          "#29134e",
-        ],
-        "red": Array [
-          "#ffeef0",
-          "#ffdce0",
-          "#fdaeb7",
-          "#f97583",
-          "#ea4a5a",
-          "#d73a49",
-          "#cb2431",
-          "#b31d28",
-          "#9e1c23",
-          "#86181d",
-        ],
-        "state": Object {
-          "error": "#d73a49",
-          "failure": "#d73a49",
-          "pending": "#dbab09",
-          "queued": "#dbab09",
-          "success": "#28a745",
-          "unknown": "#959da5",
-        },
-        "text": Object {
-          "gray": "#586069",
-          "grayDark": "#24292e",
-          "grayLight": "#6a737d",
-          "red": "#cb2431",
-        },
-        "white": "#fff",
-        "whitefade15": "rgba(255, 255, 255, 0.15)",
-        "whitefade50": "rgba(255, 255, 255, 0.50)",
-        "yellow": Array [
-          "#fffdef",
-          "#fffbdd",
-          "#fff5b1",
-          "#ffea7f",
-          "#ffdf5d",
-          "#ffd33d",
-          "#f9c513",
-          "#dbab09",
-          "#b08800",
-          "#735c0f",
-        ],
-      },
-      "fontSizes": Array [
-        "12px",
-        "14px",
-        "16px",
-        "20px",
-        "24px",
-        "32px",
-        "40px",
-        "48px",
-      ],
-      "fontWeights": Object {
-        "bold": 600,
-        "light": 300,
-        "normal": 400,
-        "semibold": 500,
-      },
-      "fonts": Object {
-        "mono": "SFMono-Regular, Consolas, \\"Liberation Mono\\", Menlo, Courier, monospace",
-        "normal": "-apple-system, BlinkMacSystemFont, \\"Segoe UI\\", Helvetica, Arial, sans-serif, \\"Apple Color Emoji\\", \\"Segoe UI Emoji\\", \\"Segoe UI Symbol\\"",
-      },
-      "lineHeights": Object {
-        "condensed": 1.25,
-        "condensedUltra": 1,
-        "default": 1.5,
-      },
-      "pagination": Object {
-        "borderRadius": "3px",
-        "colors": Object {
-          "disabled": Object {
-            "bg": "#fafbfc",
-            "border": "#e1e4e8",
-            "fg": "#d1d5da",
-          },
-          "hover": Object {
-            "bg": "#f6f8fa",
-            "border": "#e1e4e8",
-            "fg": "#0366d6",
-          },
-          "normal": Object {
-            "bg": "#fff",
-            "border": "#e1e4e8",
-            "fg": "#0366d6",
-          },
-          "selected": Object {
-            "bg": "#0366d6",
-            "border": "#0366d6",
-            "fg": "#fff",
-          },
-        },
-        "fontSize": "13px",
-        "fontWeight": 600,
-      },
-      "popovers": Object {
-        "colors": Object {
-          "caret": "rgba(27, 31, 35, 0.15)",
-        },
-      },
-      "radii": Array [
-        "0",
-        "3px",
-        "6px",
-        "100px",
-      ],
-      "shadows": Object {
-        "extra-large": "0 10px 50px rgba(27, 31, 35, 0.07)",
-        "formControl": "inset 0px 2px 0px rgba(225, 228, 232, 0.2)",
-        "formControlDisabled": "inset 0px 2px 0px rgba(220, 227, 237, 0.3)",
-        "formControlFocus": "rgba(3, 102, 214, 0.3) 0px 0px 0px 0.2em",
-        "large": "0 1px 15px rgba(27, 31, 35, 0.15)",
-        "medium": "0 1px 5px rgba(27, 31, 35, 0.15)",
-        "primaryActiveShadow": "inset 0px 1px 0px rgba(20, 70, 32, 0.2)",
-        "primaryShadow": "0px 1px 0px rgba(20, 70, 32, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.03)",
-        "small": "0 1px 1px rgba(27, 31, 35, 0.1)",
-      },
-      "sizes": Object {
-        "large": "1012px",
-        "medium": "768px",
-        "small": "544px",
-        "xlarge": "1280px",
-      },
-      "space": Array [
-        "0",
-        "4px",
-        "8px",
-        "16px",
-        "24px",
-        "32px",
-        "40px",
-        "48px",
-        "64px",
-        "80px",
-        "96px",
-        "112px",
-        "128px",
-      ],
-    }
-  }
 />
 `;
 
diff --git a/src/__tests__/__snapshots__/UnderlineNavLink.js.snap b/src/__tests__/__snapshots__/UnderlineNavLink.js.snap
index a0c09bb9395..b3bd51bac03 100644
--- a/src/__tests__/__snapshots__/UnderlineNavLink.js.snap
+++ b/src/__tests__/__snapshots__/UnderlineNavLink.js.snap
@@ -40,341 +40,6 @@ exports[`UnderlineNav.Link renders the given "as" prop 1`] = `
 <b
   activeClassName=""
   className="c0 UnderlineNav-item"
-  theme={
-    Object {
-      "borders": Array [
-        0,
-        "1px solid",
-      ],
-      "breakpoints": Array [
-        "544px",
-        "768px",
-        "1012px",
-        "1280px",
-      ],
-      "buttons": Object {
-        "danger": Object {
-          "bg": Object {
-            "active": "#be222e",
-            "default": "#fafbfc",
-            "disabled": "#F3F4F6",
-            "hover": "#cb2431",
-          },
-          "border": Object {
-            "active": "#9e1c23",
-            "default": "#e1e4e8",
-            "hover": "#b31d28",
-          },
-          "color": Object {
-            "active": "#fff",
-            "default": "#cb2431",
-            "disabled": "rgba(203,36,49, .5)",
-            "hover": "#fff",
-          },
-          "shadow": Object {
-            "active": "inset 0px 2px 0px rgba(179, 29, 40, 0.4)",
-            "default": "0px 1px 0px rgba(149, 157, 165, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.25)",
-            "focus": "0 0 0 3px rgba(203, 36, 49, 0.4)",
-            "hover": "0px 1px 0px rgba(149, 157, 165, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.03)",
-          },
-        },
-        "default": Object {
-          "bg": Object {
-            "active": "#edeff2",
-            "default": "#fafbfc",
-            "disabled": "#fafbfc",
-            "hover": "#F3F4F6",
-          },
-          "border": Object {
-            "active": "#d1d5da",
-            "default": "#e1e4e8",
-            "disabled": "#eaecef",
-          },
-          "color": Object {
-            "default": "#24292e",
-            "disabled": "#959da5",
-          },
-          "shadow": Object {
-            "active": "inset 0px 2px 0px rgba(149, 157, 165, 0.1)",
-            "default": "0px 1px 0px rgba(149, 157, 165, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.25)",
-            "focus": "0 0 0 3px rgba(3, 102, 214, 0.3)",
-            "hover": "0px 1px 0px rgba(209, 213, 218, 0.2), inset 0px 2px 0px rgba(255, 255, 255, 0.1)",
-          },
-        },
-        "outline": Object {
-          "bg": Object {
-            "active": "#035fc7",
-            "default": "#fafbfc",
-            "disabled": "#F3F4F6",
-            "hover": "#0366d6",
-          },
-          "border": Object {
-            "active": "rgba(4, 66, 137, .5)",
-            "default": "#e1e4e8",
-            "hover": "#005cc5",
-          },
-          "color": Object {
-            "active": "#fff",
-            "default": "#005cc5",
-            "disabled": "#959da5",
-            "hover": "#fff",
-          },
-          "shadow": Object {
-            "active": "inset 0px 1px 0px rgba(4, 66, 137, 0.2)",
-            "default": "0px 1px 0px rgba(149, 157, 165, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.25)",
-            "focus": "0 0 0 3px rgba(3, 102, 214, 0.3)",
-            "hover": "0px 1px 0px rgba(149, 157, 165, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.03)",
-          },
-        },
-        "primary": Object {
-          "bg": Object {
-            "active": "#128031",
-            "default": "#159739",
-            "disabled": "#94D3A2",
-            "focus": "#138934",
-            "hover": "#138934",
-          },
-          "border": Object {
-            "active": "#176f2c",
-            "default": "#22863a",
-            "disabled": "rgba(34, 134, 58, 0.1)",
-            "hover": "#176f2c",
-          },
-          "color": Object {
-            "default": "#fff",
-            "disabled": "rgba(255, 255, 255, 0.50)",
-          },
-          "shadow": Object {
-            "active": "inset 0px 1px 0px rgba(20, 70, 32, 0.2)",
-            "default": " 0px 1px 0px rgba(20, 70, 32, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.03)",
-            "focus": "0 0 0 3px #94D3A2",
-          },
-        },
-      },
-      "colors": Object {
-        "accent": "#f66a0a",
-        "bg": Object {
-          "disabled": "#F3F4F6",
-          "gray": "#f6f8fa",
-          "grayLight": "#fafbfc",
-        },
-        "black": "#1b1f23",
-        "blackfade15": "rgba(27, 31, 35, 0.15)",
-        "blackfade20": "rgba(27, 31, 35, 0.20)",
-        "blackfade30": "rgba(27,31,35,0.3)",
-        "blackfade35": "rgba(27, 31, 35, 0.35)",
-        "blackfade50": "rgba(27, 31, 35, 0.5)",
-        "blue": Array [
-          "#f1f8ff",
-          "#dbedff",
-          "#c8e1ff",
-          "#79b8ff",
-          "#2188ff",
-          "#0366d6",
-          "#005cc5",
-          "#044289",
-          "#032f62",
-          "#05264c",
-        ],
-        "bodytext": "#24292e",
-        "border": Object {
-          "gray": "#e1e4e8",
-          "grayDark": "#d1d5da",
-          "grayLight": "#eaecef",
-        },
-        "counter": Object {
-          "bg": "rgba(27, 31, 35, 0.08)",
-        },
-        "filterList": Object {
-          "hoverBg": "#eaecef",
-        },
-        "gray": Array [
-          "#fafbfc",
-          "#f6f8fa",
-          "#e1e4e8",
-          "#d1d5da",
-          "#959da5",
-          "#6a737d",
-          "#586069",
-          "#444d56",
-          "#2f363d",
-          "#24292e",
-        ],
-        "green": Array [
-          "#f0fff4",
-          "#dcffe4",
-          "#bef5cb",
-          "#85e89d",
-          "#34d058",
-          "#28a745",
-          "#22863a",
-          "#176f2c",
-          "#165c26",
-          "#144620",
-        ],
-        "orange": Array [
-          "#fff8f2",
-          "#ffebda",
-          "#ffd1ac",
-          "#ffab70",
-          "#fb8532",
-          "#f66a0a",
-          "#e36209",
-          "#d15704",
-          "#c24e00",
-          "#a04100",
-        ],
-        "purple": Array [
-          "#f5f0ff",
-          "#e6dcfd",
-          "#d1bcf9",
-          "#b392f0",
-          "#8a63d2",
-          "#6f42c1",
-          "#5a32a3",
-          "#4c2889",
-          "#3a1d6e",
-          "#29134e",
-        ],
-        "red": Array [
-          "#ffeef0",
-          "#ffdce0",
-          "#fdaeb7",
-          "#f97583",
-          "#ea4a5a",
-          "#d73a49",
-          "#cb2431",
-          "#b31d28",
-          "#9e1c23",
-          "#86181d",
-        ],
-        "state": Object {
-          "error": "#d73a49",
-          "failure": "#d73a49",
-          "pending": "#dbab09",
-          "queued": "#dbab09",
-          "success": "#28a745",
-          "unknown": "#959da5",
-        },
-        "text": Object {
-          "gray": "#586069",
-          "grayDark": "#24292e",
-          "grayLight": "#6a737d",
-          "red": "#cb2431",
-        },
-        "white": "#fff",
-        "whitefade15": "rgba(255, 255, 255, 0.15)",
-        "whitefade50": "rgba(255, 255, 255, 0.50)",
-        "yellow": Array [
-          "#fffdef",
-          "#fffbdd",
-          "#fff5b1",
-          "#ffea7f",
-          "#ffdf5d",
-          "#ffd33d",
-          "#f9c513",
-          "#dbab09",
-          "#b08800",
-          "#735c0f",
-        ],
-      },
-      "fontSizes": Array [
-        "12px",
-        "14px",
-        "16px",
-        "20px",
-        "24px",
-        "32px",
-        "40px",
-        "48px",
-      ],
-      "fontWeights": Object {
-        "bold": 600,
-        "light": 300,
-        "normal": 400,
-        "semibold": 500,
-      },
-      "fonts": Object {
-        "mono": "SFMono-Regular, Consolas, \\"Liberation Mono\\", Menlo, Courier, monospace",
-        "normal": "-apple-system, BlinkMacSystemFont, \\"Segoe UI\\", Helvetica, Arial, sans-serif, \\"Apple Color Emoji\\", \\"Segoe UI Emoji\\", \\"Segoe UI Symbol\\"",
-      },
-      "lineHeights": Object {
-        "condensed": 1.25,
-        "condensedUltra": 1,
-        "default": 1.5,
-      },
-      "pagination": Object {
-        "borderRadius": "3px",
-        "colors": Object {
-          "disabled": Object {
-            "bg": "#fafbfc",
-            "border": "#e1e4e8",
-            "fg": "#d1d5da",
-          },
-          "hover": Object {
-            "bg": "#f6f8fa",
-            "border": "#e1e4e8",
-            "fg": "#0366d6",
-          },
-          "normal": Object {
-            "bg": "#fff",
-            "border": "#e1e4e8",
-            "fg": "#0366d6",
-          },
-          "selected": Object {
-            "bg": "#0366d6",
-            "border": "#0366d6",
-            "fg": "#fff",
-          },
-        },
-        "fontSize": "13px",
-        "fontWeight": 600,
-      },
-      "popovers": Object {
-        "colors": Object {
-          "caret": "rgba(27, 31, 35, 0.15)",
-        },
-      },
-      "radii": Array [
-        "0",
-        "3px",
-        "6px",
-        "100px",
-      ],
-      "shadows": Object {
-        "extra-large": "0 10px 50px rgba(27, 31, 35, 0.07)",
-        "formControl": "inset 0px 2px 0px rgba(225, 228, 232, 0.2)",
-        "formControlDisabled": "inset 0px 2px 0px rgba(220, 227, 237, 0.3)",
-        "formControlFocus": "rgba(3, 102, 214, 0.3) 0px 0px 0px 0.2em",
-        "large": "0 1px 15px rgba(27, 31, 35, 0.15)",
-        "medium": "0 1px 5px rgba(27, 31, 35, 0.15)",
-        "primaryActiveShadow": "inset 0px 1px 0px rgba(20, 70, 32, 0.2)",
-        "primaryShadow": "0px 1px 0px rgba(20, 70, 32, 0.1), inset 0px 2px 0px rgba(255, 255, 255, 0.03)",
-        "small": "0 1px 1px rgba(27, 31, 35, 0.1)",
-      },
-      "sizes": Object {
-        "large": "1012px",
-        "medium": "768px",
-        "small": "544px",
-        "xlarge": "1280px",
-      },
-      "space": Array [
-        "0",
-        "4px",
-        "8px",
-        "16px",
-        "24px",
-        "32px",
-        "40px",
-        "48px",
-        "64px",
-        "80px",
-        "96px",
-        "112px",
-        "128px",
-      ],
-    }
-  }
 />
 `;