diff --git a/client/.babelrc b/client/.babelrc
deleted file mode 100644
index 92571026..00000000
--- a/client/.babelrc
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "presets": [
-    [
-      "@babel/preset-env",
-      {
-        "modules": false,
-        "loose": true
-      }
-    ],
-    "@babel/preset-react",
-    [
-      "@babel/preset-stage-0",
-      {
-        "decoratorsLegacy": true
-      }
-    ]
-  ],
-  "env": {
-    "development": {
-      "plugins": ["react-hot-loader/babel"]
-    },
-    "test": {
-      "plugins": ["@babel/plugin-transform-modules-commonjs"]
-    },
-    "production": {
-      "plugins": [
-        "@babel/plugin-transform-react-inline-elements",
-        "@babel/plugin-transform-react-constant-elements"
-      ]
-    }
-  }
-}
diff --git a/client/.babelrc.js b/client/.babelrc.js
new file mode 100644
index 00000000..359bdefd
--- /dev/null
+++ b/client/.babelrc.js
@@ -0,0 +1,32 @@
+module.exports = {
+  presets: [
+    [
+      '@babel/preset-env',
+      {
+        modules: false,
+        loose: true
+      }
+    ],
+    '@babel/preset-react',
+    [
+      '@babel/preset-stage-0',
+      {
+        decoratorsLegacy: true
+      }
+    ]
+  ],
+  env: {
+    development: {
+      plugins: ['react-hot-loader/babel']
+    },
+    test: {
+      plugins: ['@babel/plugin-transform-modules-commonjs']
+    },
+    production: {
+      plugins: [
+        '@babel/plugin-transform-react-inline-elements',
+        '@babel/plugin-transform-react-constant-elements'
+      ]
+    }
+  }
+};
diff --git a/client/package.json b/client/package.json
index 1f470d56..71302f2f 100644
--- a/client/package.json
+++ b/client/package.json
@@ -41,7 +41,7 @@
     "mini-css-extract-plugin": "^0.4.0",
     "postcss-flexbugs-fixes": "^3.3.1",
     "postcss-loader": "^2.1.3",
-    "prettier": "1.12.1",
+    "prettier": "1.13.0",
     "style-loader": "^0.21.0",
     "through2": "^2.0.3",
     "webpack": "^4.9.1",
diff --git a/client/src/js/containers/App.js b/client/src/js/containers/App.js
index 9f4cc854..159e01ef 100644
--- a/client/src/js/containers/App.js
+++ b/client/src/js/containers/App.js
@@ -20,4 +20,7 @@ const mapState = createStructuredSelector({
 
 const mapDispatch = { push, select, hideMenu };
 
-export default connect(mapState, mapDispatch)(App);
+export default connect(
+  mapState,
+  mapDispatch
+)(App);
diff --git a/client/src/js/containers/Chat.js b/client/src/js/containers/Chat.js
index a0827c70..54435be6 100644
--- a/client/src/js/containers/Chat.js
+++ b/client/src/js/containers/Chat.js
@@ -81,4 +81,7 @@ const mapDispatch = dispatch => ({
   )
 });
 
-export default connect(mapState, mapDispatch)(Chat);
+export default connect(
+  mapState,
+  mapDispatch
+)(Chat);
diff --git a/client/src/js/containers/Connect.js b/client/src/js/containers/Connect.js
index 97c1c688..96ec552b 100644
--- a/client/src/js/containers/Connect.js
+++ b/client/src/js/containers/Connect.js
@@ -16,4 +16,7 @@ const mapDispatch = {
   select
 };
 
-export default connect(mapState, mapDispatch)(Connect);
+export default connect(
+  mapState,
+  mapDispatch
+)(Connect);
diff --git a/client/src/js/containers/Navicon.js b/client/src/js/containers/Navicon.js
index 8d3eafcd..6623de8e 100644
--- a/client/src/js/containers/Navicon.js
+++ b/client/src/js/containers/Navicon.js
@@ -6,4 +6,7 @@ const mapDispatch = {
   onClick: toggleMenu
 };
 
-export default connect(null, mapDispatch)(Navicon);
+export default connect(
+  null,
+  mapDispatch
+)(Navicon);
diff --git a/client/src/js/containers/Settings.js b/client/src/js/containers/Settings.js
index df4f9a7c..92cc592f 100644
--- a/client/src/js/containers/Settings.js
+++ b/client/src/js/containers/Settings.js
@@ -13,4 +13,7 @@ const mapDispatch = {
   uploadCert
 };
 
-export default connect(mapState, mapDispatch)(Settings);
+export default connect(
+  mapState,
+  mapDispatch
+)(Settings);
diff --git a/client/yarn.lock b/client/yarn.lock
index 25ce6fb2..fa135393 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -6318,9 +6318,9 @@ preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
-prettier@1.12.1:
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.12.1.tgz#c1ad20e803e7749faf905a409d2367e06bbe7325"
+prettier@1.13.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.0.tgz#054de8d5fb1a4405c845d16183f58a2c301f6f16"
 
 pretty-format@^23.0.0:
   version "23.0.0"