diff --git a/src/Theme.ts b/src/Theme.ts
index 19b1876c..0c61fcac 100644
--- a/src/Theme.ts
+++ b/src/Theme.ts
@@ -1,4 +1,4 @@
-import { createMuiTheme } from "@material-ui/core";
+import createMuiTheme from "@material-ui/core/styles/createMuiTheme";
 
 const Theme = createMuiTheme({
   spacing: 4,
diff --git a/src/components/ColumnDrawer.tsx b/src/components/ColumnDrawer.tsx
index 68f106af..494a329a 100644
--- a/src/components/ColumnDrawer.tsx
+++ b/src/components/ColumnDrawer.tsx
@@ -1,18 +1,17 @@
 import React, { useState, useEffect } from "react";
 import _camelCase from "lodash/camelCase";
 
-import {
-  makeStyles,
-  createStyles,
-  Drawer,
-  List,
-  Divider,
-  ListItem,
-  ListItemIcon,
-  ListItemText,
-  IconButton,
-  TextField,
-} from "@material-ui/core";
+import makeStyles from "@material-ui/core/styles/makeStyles";
+import createStyles from "@material-ui/core/styles/createStyles";
+import Drawer from "@material-ui/core/Drawer";
+import List from "@material-ui/core/List";
+import Divider from "@material-ui/core/Divider";
+import ListItem from "@material-ui/core/ListItem";
+import ListItemIcon from "@material-ui/core/ListItemIcon";
+import ListItemText from "@material-ui/core/ListItemText";
+import IconButton from "@material-ui/core/IconButton";
+import TextField from "@material-ui/core/TextField";
+
 import AddIcon from "@material-ui/icons/Add";
 
 import { FIELDS } from "./Fields";
diff --git a/src/components/Confirmation.tsx b/src/components/Confirmation.tsx
index 9854a6d2..1db05543 100644
--- a/src/components/Confirmation.tsx
+++ b/src/components/Confirmation.tsx
@@ -7,7 +7,7 @@ import DialogContent from "@material-ui/core/DialogContent";
 import DialogContentText from "@material-ui/core/DialogContentText";
 import DialogTitle from "@material-ui/core/DialogTitle";
 import TextField from "@material-ui/core/TextField";
-import { makeStyles, createStyles } from "@material-ui/core";
+import { makeStyles, createStyles } from "@material-ui/core/styles";
 
 const useStyles = makeStyles(theme =>
   createStyles({
diff --git a/src/components/CreateTableDialog.tsx b/src/components/CreateTableDialog.tsx
index fbf8c045..88f9b0a7 100644
--- a/src/components/CreateTableDialog.tsx
+++ b/src/components/CreateTableDialog.tsx
@@ -2,16 +2,14 @@ import React, { useState, useEffect } from "react";
 import AddIcon from "@material-ui/icons/Add";
 import _camelCase from "lodash/camelCase";
 import useRouter from "../hooks/useRouter";
-import {
-  Button,
-  TextField,
-  Dialog,
-  DialogActions,
-  DialogContent,
-  DialogContentText,
-  DialogTitle,
-  Fab,
-} from "@material-ui/core";
+import Button from "@material-ui/core/Button";
+import TextField from "@material-ui/core/TextField";
+import Dialog from "@material-ui/core/Dialog";
+import DialogActions from "@material-ui/core/DialogActions";
+import DialogContent from "@material-ui/core/DialogContent";
+import DialogContentText from "@material-ui/core/DialogContentText";
+import DialogTitle from "@material-ui/core/DialogTitle";
+import Fab from "@material-ui/core/Fab";
 
 // TODO: Create an interface for props
 export default function CreateTableDialog(props: any) {
diff --git a/src/components/Fields/CheckBox.tsx b/src/components/Fields/CheckBox.tsx
index 47e59bad..7c1ff747 100644
--- a/src/components/Fields/CheckBox.tsx
+++ b/src/components/Fields/CheckBox.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 
-import { Checkbox } from "@material-ui/core";
+import Checkbox from "@material-ui/core/Checkbox";
 
 // TODO: Create an interface for props
 interface Props {
diff --git a/src/components/Fields/MultiSelect.tsx b/src/components/Fields/MultiSelect.tsx
index b37bd0d9..e670ae4f 100644
--- a/src/components/Fields/MultiSelect.tsx
+++ b/src/components/Fields/MultiSelect.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 
-import { Select } from "@material-ui/core";
+import Select from "@material-ui/core/Select";
 import { createStyles, makeStyles, Theme } from "@material-ui/core/styles";
 
 import Input from "@material-ui/core/Input";
diff --git a/src/components/Fields/Number.tsx b/src/components/Fields/Number.tsx
index 23051ebf..5f6c2f60 100644
--- a/src/components/Fields/Number.tsx
+++ b/src/components/Fields/Number.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 
-import { TextField } from "@material-ui/core";
+import TextField from "@material-ui/core/TextField";
 
 // TODO: Create an interface for props
 const Number = (props: any) => {
diff --git a/src/components/ImportCSV.tsx b/src/components/ImportCSV.tsx
index 268cc3c7..7ef2465c 100644
--- a/src/components/ImportCSV.tsx
+++ b/src/components/ImportCSV.tsx
@@ -2,17 +2,17 @@ import React, { useState, useCallback } from "react";
 import _camelCase from "lodash/camelCase";
 import { useDropzone } from "react-dropzone";
 import parse from "csv-parse";
-import {
-  Button,
-  TextField,
-  Dialog,
-  DialogActions,
-  DialogContent,
-  DialogContentText,
-  DialogTitle,
-  Grid,
-  IconButton,
-} from "@material-ui/core";
+
+import Button from "@material-ui/core/Button";
+import TextField from "@material-ui/core/TextField";
+import DialogActions from "@material-ui/core/DialogActions";
+import DialogContent from "@material-ui/core/DialogContent";
+import DialogContentText from "@material-ui/core/DialogContentText";
+import DialogTitle from "@material-ui/core/DialogTitle";
+import Grid from "@material-ui/core/Grid";
+import IconButton from "@material-ui/core/IconButton";
+import Dialog from "@material-ui/core/Dialog";
+
 import Select from "@material-ui/core/Select";
 import FormControl from "@material-ui/core/FormControl";
 import InputLabel from "@material-ui/core/InputLabel";
@@ -21,7 +21,7 @@ import AddCSVIcon from "@material-ui/icons/PlaylistAdd";
 import ArrowIcon from "@material-ui/icons/TrendingFlatOutlined";
 import AddIcon from "@material-ui/icons/Add";
 import DeleteIcon from "@material-ui/icons/Delete";
-import { makeStyles, createStyles } from "@material-ui/core";
+import { makeStyles, createStyles } from "@material-ui/core/styles";
 import Typography from "@material-ui/core/Typography";
 
 import CloudIcon from "@material-ui/icons/CloudUpload";
diff --git a/src/components/Navigation.tsx b/src/components/Navigation.tsx
index 5dceeb7a..998d263f 100644
--- a/src/components/Navigation.tsx
+++ b/src/components/Navigation.tsx
@@ -1,14 +1,14 @@
 import React from "react";
 
-import {
-  makeStyles,
-  createStyles,
-  AppBar,
-  CssBaseline,
-  Toolbar,
-  IconButton,
-  Button,
-} from "@material-ui/core";
+import CssBaseline from "@material-ui/core/CssBaseline";
+import createStyles from "@material-ui/core/styles/createStyles";
+import makeStyles from "@material-ui/core/styles/makeStyles";
+
+import AppBar from "@material-ui/core/AppBar";
+import Toolbar from "@material-ui/core/Toolbar";
+import IconButton from "@material-ui/core/IconButton";
+import Button from "@material-ui/core/Button";
+
 import MenuIcon from "@material-ui/icons/Menu";
 import Skeleton from "@material-ui/lab/Skeleton";
 
diff --git a/src/components/SearchBox.tsx b/src/components/SearchBox.tsx
index be3f9a49..d8eba919 100644
--- a/src/components/SearchBox.tsx
+++ b/src/components/SearchBox.tsx
@@ -10,7 +10,7 @@ import Paper from "@material-ui/core/Paper";
 import Modal from "@material-ui/core/Modal";
 import Backdrop from "@material-ui/core/Backdrop";
 import Fade from "@material-ui/core/Fade";
-import { TextField } from "@material-ui/core";
+import TextField from "@material-ui/core/TextField";
 
 const searchClient = algoliasearch(
   process.env.REACT_APP_ALGOLIA_APP_ID
diff --git a/src/components/Table/ColumnEditor/DocInput.tsx b/src/components/Table/ColumnEditor/DocInput.tsx
index ac0f0f46..2601d94f 100644
--- a/src/components/Table/ColumnEditor/DocInput.tsx
+++ b/src/components/Table/ColumnEditor/DocInput.tsx
@@ -1,7 +1,11 @@
 import React, { useContext, useEffect, useState } from "react";
 import { createStyles, makeStyles, Theme } from "@material-ui/core/styles";
 import Chip from "@material-ui/core/Chip";
-import { TextField, Grid, Divider, Select } from "@material-ui/core";
+import Grid from "@material-ui/core/Grid";
+import TextField from "@material-ui/core/TextField";
+import Divider from "@material-ui/core/Divider";
+import Select from "@material-ui/core/Select";
+
 import TablesContext from "../../../contexts/tablesContext";
 import MenuItem from "@material-ui/core/MenuItem";
 import useTableConfig from "../../../hooks/useFiretable/useTableConfig";
diff --git a/src/components/Table/ColumnEditor/SelectOptionsInput.tsx b/src/components/Table/ColumnEditor/SelectOptionsInput.tsx
index 6cbfec76..94f3c09b 100644
--- a/src/components/Table/ColumnEditor/SelectOptionsInput.tsx
+++ b/src/components/Table/ColumnEditor/SelectOptionsInput.tsx
@@ -1,7 +1,9 @@
 import React, { useEffect, useState } from "react";
 import { createStyles, makeStyles, Theme } from "@material-ui/core/styles";
 import Chip from "@material-ui/core/Chip";
-import { TextField, Grid, Divider } from "@material-ui/core";
+import TextField from "@material-ui/core/TextField";
+import Grid from "@material-ui/core/Grid";
+import Divider from "@material-ui/core/Divider";
 import _includes from "lodash/includes";
 import _camelCase from "lodash/camelCase";
 
diff --git a/src/components/Table/ColumnEditor/index.tsx b/src/components/Table/ColumnEditor/index.tsx
index 35f5d6c5..d4a1e010 100644
--- a/src/components/Table/ColumnEditor/index.tsx
+++ b/src/components/Table/ColumnEditor/index.tsx
@@ -9,9 +9,11 @@ import FormControl from "@material-ui/core/FormControl";
 import Popper from "@material-ui/core/Popper";
 import Fade from "@material-ui/core/Fade";
 import Paper from "@material-ui/core/Paper";
+import TextField from "@material-ui/core/TextField";
+import Grid from "@material-ui/core/Grid";
+import Select from "@material-ui/core/Select";
 import ClickAwayListener from "@material-ui/core/ClickAwayListener";
 import { createStyles, makeStyles } from "@material-ui/core/styles";
-import { TextField, Grid, Select } from "@material-ui/core";
 import { FieldsDropDown, isFieldType, FieldType } from "../../Fields";
 import ToggleButton from "@material-ui/lab/ToggleButton";
 import ToggleButtonGroup from "@material-ui/lab/ToggleButtonGroup";
diff --git a/src/views/AuthView.tsx b/src/views/AuthView.tsx
index 69bdf2ba..0d05d70e 100644
--- a/src/views/AuthView.tsx
+++ b/src/views/AuthView.tsx
@@ -1,13 +1,11 @@
 import React from "react";
 
-import {
-  makeStyles,
-  createStyles,
-  Card,
-  CardContent,
-  Button,
-  Typography,
-} from "@material-ui/core";
+import createStyles from "@material-ui/core/styles/createStyles";
+import makeStyles from "@material-ui/core/styles/makeStyles";
+import Card from "@material-ui/core/Card";
+import CardContent from "@material-ui/core/CardContent";
+import Button from "@material-ui/core/Button";
+import Typography from "@material-ui/core/Typography";
 
 import { googleProvider, auth } from "../firebase";
 import useRouter from "../hooks/useRouter";
diff --git a/src/views/TablesView.tsx b/src/views/TablesView.tsx
index b14d1eaf..71b413e4 100644
--- a/src/views/TablesView.tsx
+++ b/src/views/TablesView.tsx
@@ -1,15 +1,13 @@
 import React from "react";
 
-import {
-  makeStyles,
-  createStyles,
-  Card,
-  CardActions,
-  CardContent,
-  Button,
-  Typography,
-  Grid,
-} from "@material-ui/core";
+import createStyles from "@material-ui/core/styles/createStyles";
+import makeStyles from "@material-ui/core/styles/makeStyles";
+import Card from "@material-ui/core/Card";
+import CardActions from "@material-ui/core/CardActions";
+import CardContent from "@material-ui/core/CardContent";
+import Button from "@material-ui/core/Button";
+import Typography from "@material-ui/core/Typography";
+import Grid from "@material-ui/core/Grid";
 
 import useSettings from "../hooks/useSettings";
 import useRouter from "../hooks/useRouter";