diff --git a/ts/themes/SessionTheme.tsx b/ts/themes/SessionTheme.tsx
index bac4019f6..892c0e605 100644
--- a/ts/themes/SessionTheme.tsx
+++ b/ts/themes/SessionTheme.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { createGlobalStyle } from 'styled-components';
-import { classicLight } from './classicLight';
+import { classicLight } from './';
 import { declareCSSVariables, THEME_GLOBALS } from './globals';
 
 export const whiteColor = '#ffffff';
@@ -350,7 +350,6 @@ export const switchHtmlToLightTheme = () => {
 // default to classic light theme
 export const SessionGlobalStyles = createGlobalStyle`
   html {
-    /* Old Theme Variables */
     /* FONTS */
     --font-default:  'Roboto';
     --font-font-accent:  'Loor';
diff --git a/ts/themes/classicDark.ts b/ts/themes/classicDark.ts
index 1b18926ff..a2b27ee19 100644
--- a/ts/themes/classicDark.ts
+++ b/ts/themes/classicDark.ts
@@ -2,7 +2,7 @@ import { hexColorToRGB } from '../util/hexColorToRGB';
 import { COLORS, THEMES } from './constants/colors';
 import { ThemeColorVariables } from './variableColors';
 
-export const classicDark: ThemeColorVariables = {
+const classicDark: ThemeColorVariables = {
   '--primary-color': THEMES.CLASSIC_DARK.PRIMARY,
   '--danger-color': THEMES.CLASSIC_DARK.DANGER,
   '--disabled-color': THEMES.CLASSIC_DARK.DISABLED,
@@ -142,3 +142,5 @@ export const classicDark: ThemeColorVariables = {
   '--input-text-color': 'var(--text-primary-color)',
   '--input-border-color': 'var(--border-color)',
 };
+
+export default classicDark;
diff --git a/ts/themes/classicLight.ts b/ts/themes/classicLight.ts
index aea169be2..361314059 100644
--- a/ts/themes/classicLight.ts
+++ b/ts/themes/classicLight.ts
@@ -2,7 +2,7 @@ import { hexColorToRGB } from '../util/hexColorToRGB';
 import { COLORS, THEMES } from './constants/colors';
 import { ThemeColorVariables } from './variableColors';
 
-export const classicLight: ThemeColorVariables = {
+const classicLight: ThemeColorVariables = {
   '--primary-color': THEMES.CLASSIC_LIGHT.PRIMARY,
   '--danger-color': THEMES.CLASSIC_LIGHT.DANGER,
   '--disabled-color': THEMES.CLASSIC_LIGHT.DISABLED,
@@ -142,3 +142,5 @@ export const classicLight: ThemeColorVariables = {
   '--input-text-color': 'var(--text-primary-color)',
   '--input-border-color': 'var(--border-color)',
 };
+
+export default classicLight;
diff --git a/ts/themes/index.ts b/ts/themes/index.ts
new file mode 100644
index 000000000..540c53113
--- /dev/null
+++ b/ts/themes/index.ts
@@ -0,0 +1,6 @@
+import classicLight from './classicLight';
+import classicDark from './classicDark';
+import oceanLight from './oceanLight';
+import oceanDark from './oceanDark';
+
+export { classicLight, classicDark, oceanLight, oceanDark };
diff --git a/ts/themes/oceanDark.ts b/ts/themes/oceanDark.ts
index d1ee99ad0..479c9b337 100644
--- a/ts/themes/oceanDark.ts
+++ b/ts/themes/oceanDark.ts
@@ -2,7 +2,7 @@ import { hexColorToRGB } from '../util/hexColorToRGB';
 import { COLORS, THEMES } from './constants/colors';
 import { ThemeColorVariables } from './variableColors';
 
-export const oceanDark: ThemeColorVariables = {
+const oceanDark: ThemeColorVariables = {
   '--primary-color': THEMES.OCEAN_DARK.PRIMARY,
   '--danger-color': THEMES.OCEAN_DARK.DANGER,
   '--disabled-color': THEMES.OCEAN_DARK.DISABLED,
@@ -142,3 +142,5 @@ export const oceanDark: ThemeColorVariables = {
   '--input-text-color': 'var(--text-primary-color)',
   '--input-border-color': 'var(--border-color)',
 };
+
+export default oceanDark;
diff --git a/ts/themes/oceanLight.ts b/ts/themes/oceanLight.ts
index 266e68b4f..9b48b0e1c 100644
--- a/ts/themes/oceanLight.ts
+++ b/ts/themes/oceanLight.ts
@@ -2,7 +2,7 @@ import { hexColorToRGB } from '../util/hexColorToRGB';
 import { COLORS, THEMES } from './constants/colors';
 import { ThemeColorVariables } from './variableColors';
 
-export const oceanLight: ThemeColorVariables = {
+const oceanLight: ThemeColorVariables = {
   '--primary-color': THEMES.OCEAN_LIGHT.PRIMARY,
   '--danger-color': THEMES.OCEAN_LIGHT.DANGER,
   '--disabled-color': THEMES.OCEAN_LIGHT.DISABLED,
@@ -142,3 +142,5 @@ export const oceanLight: ThemeColorVariables = {
   '--input-text-color': 'var(--text-primary-color)',
   '--input-border-color': 'var(--border-color)',
 };
+
+export default oceanLight;
diff --git a/ts/themes/switchTheme.tsx b/ts/themes/switchTheme.tsx
index 4b8567e52..21c5daee9 100644
--- a/ts/themes/switchTheme.tsx
+++ b/ts/themes/switchTheme.tsx
@@ -1,27 +1,8 @@
-import { classicDark } from './classicDark';
-import { classicLight } from './classicLight';
-import { COLORS, ThemeStateType } from './constants/colors';
-import { oceanDark } from './oceanDark';
-import { oceanLight } from './oceanLight';
+import { classicDark, classicLight, oceanDark, oceanLight } from '.';
+import { ThemeStateType } from './constants/colors';
 import { loadThemeColors } from './variableColors';
 
-// document.documentElement.style.setProperty(
-//   '--primary-color',
-//   primaryColor && primaryColor !== THEMES.OCEAN_DARK.PRIMARY
-//     ? primaryColor
-//     : THEMES.OCEAN_DARK.PRIMARY
-// );
-
-export async function switchTheme(theme: ThemeStateType, mainWindow: boolean = true) {
-  let primaryColor = null;
-
-  if (mainWindow) {
-    const selectedPrimaryColor = await window.Events.getPrimaryColorSetting();
-    primaryColor =
-      selectedPrimaryColor && (COLORS.PRIMARY as any)[`${selectedPrimaryColor.toUpperCase()}`];
-  }
-
-  // TODO Theming account for Primary colors again
+export async function switchTheme(theme: ThemeStateType) {
   switch (theme) {
     case 'classic-light':
       loadThemeColors(classicLight);