diff --git a/packages/theme/src/BackstageTheme.ts b/packages/theme/src/BackstageTheme.ts
index 4f61437400..aa920c6e6a 100644
--- a/packages/theme/src/BackstageTheme.ts
+++ b/packages/theme/src/BackstageTheme.ts
@@ -123,138 +123,137 @@ const extendedThemeConfig: BackstageMuiThemeOptions = {
 
 const createOverrides = (
   theme: BackstageMuiTheme,
-): Partial<BackstageMuiTheme> => {
+): Partial<BackstageMuiTheme['overrides']> => {
   return {
-    overrides: {
-      MuiTableRow: {
-        // Alternating row backgrounds
-        root: {
-          '&:nth-of-type(odd)': {
-            backgroundColor: theme.palette.background.default,
-          },
-        },
-        // Use pointer for hoverable rows
-        hover: {
-          '&:hover': {
-            cursor: 'pointer',
-          },
-        },
-        // Alternating head backgrounds
-        head: {
-          '&:nth-of-type(odd)': {
-            backgroundColor: COLORS.NAMED.WHITE,
-          },
+    MuiTableRow: {
+      // Alternating row backgrounds
+      root: {
+        '&:nth-of-type(odd)': {
+          backgroundColor: theme.palette.background.default,
         },
       },
-      // Tables are more dense than default mui tables
-      MuiTableCell: {
-        root: {
-          wordBreak: 'break-word',
-          overflow: 'hidden',
-          verticalAlign: 'middle',
-          lineHeight: '1',
-          margin: 0,
-          padding: '8px',
-          borderBottom: 0,
-        },
-        head: {
-          wordBreak: 'break-word',
-          overflow: 'hidden',
-          color: 'rgb(179, 179, 179)',
-          fontWeight: 'normal',
-          lineHeight: '1',
+      // Use pointer for hoverable rows
+      hover: {
+        '&:hover': {
+          cursor: 'pointer',
         },
       },
-      MuiTabs: {
-        // Tabs are smaller than default mui tab rows
-        root: {
-          minHeight: 24,
+      // Alternating head backgrounds
+      head: {
+        '&:nth-of-type(odd)': {
+          backgroundColor: COLORS.NAMED.WHITE,
         },
       },
-      MuiTab: {
-        // Tabs are smaller and have a hover background
-        root: {
-          color: theme.palette.link,
-          minHeight: 24,
-          textTransform: 'initial',
-          '&:hover': {
-            color: darken(theme.palette.link, 0.3),
-            background: lighten(theme.palette.link, 0.95),
-          },
-          [theme.breakpoints.up('md')]: {
-            minWidth: 120,
-            fontSize: theme.typography.pxToRem(14),
-            fontWeight: 500,
-          },
+    },
+    // Tables are more dense than default mui tables
+    MuiTableCell: {
+      root: {
+        wordBreak: 'break-word',
+        overflow: 'hidden',
+        verticalAlign: 'middle',
+        lineHeight: '1',
+        margin: 0,
+        padding: '8px',
+        borderBottom: 0,
+      },
+      head: {
+        wordBreak: 'break-word',
+        overflow: 'hidden',
+        color: 'rgb(179, 179, 179)',
+        fontWeight: 'normal',
+        lineHeight: '1',
+      },
+    },
+    MuiTabs: {
+      // Tabs are smaller than default mui tab rows
+      root: {
+        minHeight: 24,
+      },
+    },
+    MuiTab: {
+      // Tabs are smaller and have a hover background
+      root: {
+        color: theme.palette.link,
+        minHeight: 24,
+        textTransform: 'initial',
+        '&:hover': {
+          color: darken(theme.palette.link, 0.3),
+          background: lighten(theme.palette.link, 0.95),
         },
-        textColorPrimary: {
-          color: theme.palette.link,
+        [theme.breakpoints.up('md')]: {
+          minWidth: 120,
+          fontSize: theme.typography.pxToRem(14),
+          fontWeight: 500,
         },
       },
-      MuiTableSortLabel: {
-        // No color change on hover, just rely on the arrow showing up instead.
-        root: {
+      textColorPrimary: {
+        color: theme.palette.link,
+      },
+    },
+    MuiTableSortLabel: {
+      // No color change on hover, just rely on the arrow showing up instead.
+      root: {
+        color: 'inherit',
+        '&:hover': {
           color: 'inherit',
-          '&:hover': {
-            color: 'inherit',
-          },
-          '&:focus': {
-            color: 'inherit',
-          },
         },
-        // Bold font for highlighting selected column
-        active: {
-          fontWeight: 'bold',
+        '&:focus': {
           color: 'inherit',
         },
       },
-      MuiListItemText: {
-        dense: {
-          // Default dense list items to adding ellipsis for really long str...
-          whiteSpace: 'nowrap',
-          overflow: 'hidden',
-          textOverflow: 'ellipsis',
-        },
+      // Bold font for highlighting selected column
+      active: {
+        fontWeight: 'bold',
+        color: 'inherit',
       },
-      MuiButton: {
-        text: {
-          // Text buttons have less padding by default, but we want to keep the original padding
-          padding: undefined,
-        },
+    },
+    MuiListItemText: {
+      dense: {
+        // Default dense list items to adding ellipsis for really long str...
+        whiteSpace: 'nowrap',
+        overflow: 'hidden',
+        textOverflow: 'ellipsis',
       },
-      MuiChip: {
-        root: {
-          // By default there's no margin, but it's usually wanted, so we add some trailing margin
-          marginRight: theme.spacing(1),
-          marginBottom: theme.spacing(1),
-        },
+    },
+    MuiButton: {
+      text: {
+        // Text buttons have less padding by default, but we want to keep the original padding
+        padding: undefined,
       },
-      MuiCardHeader: {
-        root: {
-          // Reduce padding between header and content
-          paddingBottom: 0,
-        },
+    },
+    MuiChip: {
+      root: {
+        // By default there's no margin, but it's usually wanted, so we add some trailing margin
+        marginRight: theme.spacing(1),
+        marginBottom: theme.spacing(1),
       },
-      MuiCardActions: {
-        root: {
-          // We default to putting the card actions at the end
-          justifyContent: 'flex-end',
-        },
+    },
+    MuiCardHeader: {
+      root: {
+        // Reduce padding between header and content
+        paddingBottom: 0,
+      },
+    },
+    MuiCardActions: {
+      root: {
+        // We default to putting the card actions at the end
+        justifyContent: 'flex-end',
       },
     },
   };
 };
 
-const extendedTheme = createMuiTheme(extendedThemeConfig) as BackstageMuiTheme;
+function createBackstageTheme(
+  ...config: BackstageMuiThemeOptions[]
+): BackstageMuiTheme {
+  const withoutOverrides = createMuiTheme(...config) as BackstageMuiTheme;
 
-// V1 theming
-// https://material-ui-next.com/customization/themes/
-// For CSS it is advised to use JSS, see https://material-ui-next.com/customization/css-in-js/
-const BackstageTheme: BackstageMuiTheme = {
-  ...extendedTheme,
-  ...createOverrides(extendedTheme),
-};
+  return {
+    ...withoutOverrides,
+    overrides: createOverrides(withoutOverrides),
+  };
+}
 
-// Temporary workaround for files incorrectly importing the theme directly
-export const V1 = BackstageTheme;
-export default BackstageTheme;
+const defaultTheme = createBackstageTheme(extendedThemeConfig);
+
+export default defaultTheme;
diff --git a/packages/theme/src/muiComponentOverrides.ts b/packages/theme/src/muiComponentOverrides.ts
new file mode 100644
index 0000000000..50daf49e5e
--- /dev/null
+++ b/packages/theme/src/muiComponentOverrides.ts
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createMuiTheme } from '@material-ui/core';
+import { darken, lighten } from '@material-ui/core/styles/colorManipulator';
+
+import { BackstageMuiTheme, BackstageMuiThemeOptions } from './types';
+
+const createOverrides = (
+  theme: BackstageMuiTheme,
+): Partial<BackstageMuiTheme['overrides']> => {
+  return {
+    MuiTableRow: {
+      // Alternating row backgrounds
+      root: {
+        '&:nth-of-type(odd)': {
+          backgroundColor: theme.palette.background.default,
+        },
+      },
+      // Use pointer for hoverable rows
+      hover: {
+        '&:hover': {
+          cursor: 'pointer',
+        },
+      },
+      // Alternating head backgrounds
+      head: {
+        '&:nth-of-type(odd)': {
+          backgroundColor: theme.palette.background.paper,
+        },
+      },
+    },
+    // Tables are more dense than default mui tables
+    MuiTableCell: {
+      root: {
+        wordBreak: 'break-word',
+        overflow: 'hidden',
+        verticalAlign: 'middle',
+        lineHeight: '1',
+        margin: 0,
+        padding: '8px',
+        borderBottom: 0,
+      },
+      head: {
+        wordBreak: 'break-word',
+        overflow: 'hidden',
+        color: 'rgb(179, 179, 179)',
+        fontWeight: 'normal',
+        lineHeight: '1',
+      },
+    },
+    MuiTabs: {
+      // Tabs are smaller than default mui tab rows
+      root: {
+        minHeight: 24,
+      },
+    },
+    MuiTab: {
+      // Tabs are smaller and have a hover background
+      root: {
+        color: theme.palette.link,
+        minHeight: 24,
+        textTransform: 'initial',
+        '&:hover': {
+          color: darken(theme.palette.link, 0.3),
+          background: lighten(theme.palette.link, 0.95),
+        },
+        [theme.breakpoints.up('md')]: {
+          minWidth: 120,
+          fontSize: theme.typography.pxToRem(14),
+          fontWeight: 500,
+        },
+      },
+      textColorPrimary: {
+        color: theme.palette.link,
+      },
+    },
+    MuiTableSortLabel: {
+      // No color change on hover, just rely on the arrow showing up instead.
+      root: {
+        color: 'inherit',
+        '&:hover': {
+          color: 'inherit',
+        },
+        '&:focus': {
+          color: 'inherit',
+        },
+      },
+      // Bold font for highlighting selected column
+      active: {
+        fontWeight: 'bold',
+        color: 'inherit',
+      },
+    },
+    MuiListItemText: {
+      dense: {
+        // Default dense list items to adding ellipsis for really long str...
+        whiteSpace: 'nowrap',
+        overflow: 'hidden',
+        textOverflow: 'ellipsis',
+      },
+    },
+    MuiButton: {
+      text: {
+        // Text buttons have less padding by default, but we want to keep the original padding
+        padding: undefined,
+      },
+    },
+    MuiChip: {
+      root: {
+        // By default there's no margin, but it's usually wanted, so we add some trailing margin
+        marginRight: theme.spacing(1),
+        marginBottom: theme.spacing(1),
+      },
+    },
+    MuiCardHeader: {
+      root: {
+        // Reduce padding between header and content
+        paddingBottom: 0,
+      },
+    },
+    MuiCardActions: {
+      root: {
+        // We default to putting the card actions at the end
+        justifyContent: 'flex-end',
+      },
+    },
+  };
+};
+
+function applyComponentOverrides(
+  ...config: BackstageMuiThemeOptions[]
+): BackstageMuiTheme {
+  const withoutOverrides = createMuiTheme(...config) as BackstageMuiTheme;
+
+  return {
+    ...withoutOverrides,
+    overrides: createOverrides(withoutOverrides),
+  };
+}
+
+const defaultTheme = createBackstageTheme(extendedThemeConfig);
diff --git a/packages/theme/src/themes.ts b/packages/theme/src/themes.ts
new file mode 100644
index 0000000000..e7472463d6
--- /dev/null
+++ b/packages/theme/src/themes.ts
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+const darkColors = {
+  PAGE_BACKGROUND: '#282828',
+  DEFAULT_PAGE_THEME_COLOR: '#7C3699',
+  DEFAULT_PAGE_THEME_LIGHT_COLOR: '#ECDBF2',
+  ERROR_BACKGROUND_COLOR: '#FFEBEE',
+  ERROR_TEXT_COLOR: '#CA001B',
+  INFO_TEXT_COLOR: '#004e8a',
+  LINK_TEXT: '#0A6EBE',
+  LINK_TEXT_HOVER: '#2196F3',
+  NAMED: {
+    WHITE: '#FEFEFE',
+  },
+  STATUS: {
+    OK: '#1db855',
+    WARNING: '#f49b20',
+    ERROR: '#CA001B',
+  },
+};
+
+const lightColors = {
+  PAGE_BACKGROUND: '#F8F8F8',
+  DEFAULT_PAGE_THEME_COLOR: '#7C3699',
+  DEFAULT_PAGE_THEME_LIGHT_COLOR: '#ECDBF2',
+  ERROR_BACKGROUND_COLOR: '#FFEBEE',
+  ERROR_TEXT_COLOR: '#CA001B',
+  INFO_TEXT_COLOR: '#004e8a',
+  LINK_TEXT: '#0A6EBE',
+  LINK_TEXT_HOVER: '#2196F3',
+  NAMED: {
+    WHITE: '#FEFEFE',
+  },
+  STATUS: {
+    OK: '#1db855',
+    WARNING: '#f49b20',
+    ERROR: '#CA001B',
+  },
+};