1 files changed, 19 insertions, 23 deletions
diff --git a/components/Layout.js b/components/Layout.js
index 0b8348c..e915285 100644
--- a/components/Layout.js
+++ b/components/Layout.js
@@ -1,30 +1,26 @@
 import styles from 'styles/Main.module.scss'
-import React, {useState} from 'react'
+import React from 'react'
 import Head from 'next/head'
-import Context from '../context';
-import Header from './Header'
-import Popup from './Popup'
+import {Header, Popup} from 'components'
 import PropTypes from 'prop-types'
 
-const Layout = ({ children, apps, setApps}) => {
-  const [options, setOptions] = useState({theme: 'dark'})
-  const [popup, setPopup] = useState({})
-
-  return (
-    <Context.Provider value={{ setPopup }}>
-      <section className={styles.layout+' '+options.theme}>
-        <Head>
-          <title>My Apps</title>
-        </Head>
-        <main>
-          <div className="container">{children}</div>
-        </main>
-        <Header apps={apps} setApps={setApps} />
-        <Popup popup={popup} />
-      </section>
-    </Context.Provider>
-  )
-}
+const Layout = ({
+  children,
+  apps,
+  setApps,
+  settings,
+}) => (
+  <section className={styles.layout +' '+ (settings ? settings.theme : 'green')}>
+    <Head>
+      <title>My Apps</title>
+    </Head>
+    <main>
+      <div className="container">{children}</div>
+    </main>
+    <Header apps={apps} setApps={setApps} />
+    <Popup/>
+  </section>
+)
 
 export default Layout