diff --git a/src/components/EditorComponent.js b/src/components/EditorComponent.js
index 11ead06..6305901 100644
--- a/src/components/EditorComponent.js
+++ b/src/components/EditorComponent.js
@@ -1,67 +1,28 @@
 import React, { useEffect, useState } from "react";
-import NameInput from "./InputComponents.js";
-import { createMuiTheme, ThemeProvider } from "@material-ui/core/styles";
-import Box from "@material-ui/core/Box";
-import { deepPurple } from "@material-ui/core/colors";
+import { Collapsible, Tab, Tabs, Grid, Box } from "grommet";
 
-const theme = createMuiTheme({
-    palette: {
-        primary: {
-            main: deepPurple[400],
-        },
-        secondary: {},
-    },
-});
+import TimbreComponent from "./TimbreComponent";
 
 function EditorComponent(props) {
-    const defaultSettings = {
-        name: "",
-        arpeggio: { length: 8, pattern: [0, 0, 0, 0, 0, 0, 0, 0] },
-        arpeggio2: {
-            tempo: 20,
-            seq: 0,
-            on: false,
-            latch: false,
-            target: 0,
-            keySync: false,
-            type: 0, // 0 - 5
-            range: 0, // 0 - 4
-            gate: 0, // 0 - 100
-            resolution: 0,
-            swing: 0,
-        },
-        voiceMode: 0,
-        scaleKey: 0, // C
-        scaleType: 0, // Equal Temperment
-        delayFX: { sync: false, timeBase: 5, delayTime: 0, depth: 0, type: 0 },
-        modFX: { lfoSpeed: 0, depth: 0, type: 0 },
-        eq: { hiFreq: 0, hiGain: 0, lowFreq: 0, lowGain: 0 },
-        octave: 0, // this is a 7 bit number so -1 is 127 and -3 is 125
-        synthParameter1: {}, // only use this one in single voice mode
-        synthParameter2: {}, // use this and the previous in multi voice mode
-        synthParameter3: {}, // this is for vocoder mode
-    };
-    const patch = props.patch;
-
-    const [settings, setSettings] = useState();
-
-    if (!props.show) {
-        return null;
-    }
-
     return (
-        // placeholder div
-        <ThemeProvider theme={theme}>
-            <Box bgcolor="primary">
-                <NameInput
-                    returnName={(name) => {
-                        let copyPatch = JSON.parse(JSON.stringify(patch));
-                        copyPatch.name = name;
-                        props.updatePatch(copyPatch);
-                    }}
-                />
-            </Box>
-        </ThemeProvider>
+        <Box
+            align="center"
+            justify="start"
+            fill
+            direction="column"
+            overflow="hidden">
+            <Tabs>
+                <Tab title="Timbre 1">
+                    <Box pad="medium" align="center" justify="center">
+                        <TimbreComponent />
+                    </Box>
+                </Tab>
+                <Tab title="Timbre 2"></Tab>
+                <Tab title="Vocoder"></Tab>
+                <Tab title="Effects"></Tab>
+                <Tab title="Arpeggio"></Tab>
+            </Tabs>
+        </Box>
     );
 }