diff --git a/src/backends/github/AuthenticationPage.js b/src/backends/github/AuthenticationPage.js
index f7100604..c85dde2f 100644
--- a/src/backends/github/AuthenticationPage.js
+++ b/src/backends/github/AuthenticationPage.js
@@ -21,9 +21,9 @@ export default class AuthenticationPage extends React.Component {
       auth = new Authenticator();
     }
 
-    auth.authenticate({provider: 'github', scope: 'repo'}, (err, data) => {
+    auth.authenticate({ provider: 'github', scope: 'repo' }, (err, data) => {
       if (err) {
-        this.setState({loginError: err.toString()});
+        this.setState({ loginError: err.toString() });
         return;
       }
       this.props.onLogin(data);
diff --git a/src/backends/netlify-git/AuthenticationPage.js b/src/backends/netlify-git/AuthenticationPage.js
index 4503a660..3b4f1bf3 100644
--- a/src/backends/netlify-git/AuthenticationPage.js
+++ b/src/backends/netlify-git/AuthenticationPage.js
@@ -14,8 +14,8 @@ export default class AuthenticationPage extends React.Component {
 
   handleLogin(e) {
     e.preventDefault();
-    const {email, password} = this.state;
-    this.setState({authenticating: true});
+    const { email, password } = this.state;
+    this.setState({ authenticating: true });
     fetch(`${AuthenticationPage.url}/token`, {
       method: 'POST',
       body: 'grant_type=client_credentials',
@@ -27,18 +27,18 @@ export default class AuthenticationPage extends React.Component {
       console.log(response);
       if (response.ok) {
         return response.json().then((data) => {
-          this.props.onLogin(Object.assign({email}, data));
+          this.props.onLogin(Object.assign({ email }, data));
         });
       }
       response.json().then((data) => {
-        this.setState({loginError: data.msg});
-      })
-    })
+        this.setState({ loginError: data.msg });
+      });
+    });
   }
 
   handleChange(key) {
     return (e) => {
-      this.setState({[key]: e.target.value});
+      this.setState({ [key]: e.target.value });
     };
   }
 
diff --git a/src/backends/test-repo/AuthenticationPage.js b/src/backends/test-repo/AuthenticationPage.js
index fd5c3ddc..ce20b0bf 100644
--- a/src/backends/test-repo/AuthenticationPage.js
+++ b/src/backends/test-repo/AuthenticationPage.js
@@ -7,7 +7,7 @@ export default class AuthenticationPage extends React.Component {
 
   constructor(props) {
     super(props);
-    this.state = {email: ''};
+    this.state = { email: '' };
     this.handleLogin = this.handleLogin.bind(this);
     this.handleEmailChange = this.handleEmailChange.bind(this);
   }
@@ -18,7 +18,7 @@ export default class AuthenticationPage extends React.Component {
   }
 
   handleEmailChange(e) {
-    this.setState({email: e.target.value});
+    this.setState({ email: e.target.value });
   }
 
   render() {
diff --git a/src/components/EntryEditor.js b/src/components/EntryEditor.js
index ea83f7bb..fd308698 100644
--- a/src/components/EntryEditor.js
+++ b/src/components/EntryEditor.js
@@ -27,14 +27,14 @@ export default class EntryEditor extends React.Component {
   calculateHeight() {
     const height = window.innerHeight - 54;
     console.log('setting height to %s', height);
-    this.setState({height});
+    this.setState({ height });
   }
 
   render() {
     const { collection, entry, getMedia, onChange, onAddMedia, onRemoveMedia, onPersist } = this.props;
-    const {height} = this.state;
+    const { height } = this.state;
 
-    return <div className={styles.entryEditor} style={{height}}>
+    return <div className={styles.entryEditor} style={{ height }}>
       <div className={styles.container}>
         <div className={styles.controlPane}>
           <ControlPane
diff --git a/src/components/PreviewPane.js b/src/components/PreviewPane.js
index 9ce76ab5..d41185db 100644
--- a/src/components/PreviewPane.js
+++ b/src/components/PreviewPane.js
@@ -55,7 +55,7 @@ export default class PreviewPane extends React.Component {
   }
 
   renderPreview() {
-    const props = Object.assign({}, this.props, {widgetFor: this.widgetFor});
+    const props = Object.assign({}, this.props, { widgetFor: this.widgetFor });
     const component = registry.getPreviewTemplate(props.collection.get('name')) || Preview;
 
     render(React.createElement(component, props), this.previewEl);
diff --git a/src/components/UI/icon/Icon.js b/src/components/UI/icon/Icon.js
index a084f9ec..7368cd12 100644
--- a/src/components/UI/icon/Icon.js
+++ b/src/components/UI/icon/Icon.js
@@ -6,7 +6,7 @@ const availableIcons = [
   'bold', 'italic', 'list', 'font', 'text-height', 'text-width', 'align-left', 'align-center', 'align-right',
   'align-justify', 'indent-left', 'indent-right', 'list-bullet', 'list-numbered', 'strike', 'underline', 'table',
   'superscript', 'subscript', 'header', 'h1', 'h2', 'paragraph', 'link', 'unlink', 'quote-left', 'quote-right', 'code',
-  'picture','video',
+  'picture', 'video',
   // Entypo
   'note', 'note-beamed',
   'music',
@@ -199,7 +199,7 @@ const iconPropType = (props, propName) => {
 
 const noop = function() {};
 
-export default function Icon({ style, className = '', type, onClick = noop}) {
+export default function Icon({ style, className = '', type, onClick = noop }) {
   return <span className={`${styles.root} ${styles[type]} ${className}`} style={style} onClick={onClick} />;
 }
 
diff --git a/src/components/UnpublishedListing.js b/src/components/UnpublishedListing.js
index b57eebd9..01b35dcb 100644
--- a/src/components/UnpublishedListing.js
+++ b/src/components/UnpublishedListing.js
@@ -2,7 +2,7 @@ import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import moment from 'moment';
 import { Card } from './UI';
-import { Link } from 'react-router'
+import { Link } from 'react-router';
 import { statusDescriptions } from '../constants/publishModes';
 import styles from './UnpublishedListing.css';
 
diff --git a/src/components/Widgets/MarkdownControl.js b/src/components/Widgets/MarkdownControl.js
index 54abac8b..483be419 100644
--- a/src/components/Widgets/MarkdownControl.js
+++ b/src/components/Widgets/MarkdownControl.js
@@ -60,7 +60,7 @@ class MarkdownControl extends React.Component {
     return (
       <div>
 
-        { this.renderEditor() }
+        {this.renderEditor()}
       </div>
     );
   }
diff --git a/src/components/Widgets/MarkdownControlElements/VisualEditor/schema.js b/src/components/Widgets/MarkdownControlElements/VisualEditor/schema.js
index ea00ade2..412dae5e 100644
--- a/src/components/Widgets/MarkdownControlElements/VisualEditor/schema.js
+++ b/src/components/Widgets/MarkdownControlElements/VisualEditor/schema.js
@@ -62,4 +62,4 @@ export const SCHEMA = {
       borderRadius: '4px'
     }
   }
-}
+};
diff --git a/src/components/Widgets/richText.js b/src/components/Widgets/richText.js
index b5d4b323..082631e0 100644
--- a/src/components/Widgets/richText.js
+++ b/src/components/Widgets/richText.js
@@ -46,7 +46,7 @@ function processEditorPlugins(plugins) {
         <div {...props.attributes} className={className}>
           <div className="plugin_icon" contentEditable={false}><Icon type={plugin.icon}/></div>
           <div className="plugin_fields" contentEditable={false}>
-            { plugin.fields.map(field => `${field.label}: “${node.data.get(field.name)}”`) }
+            {plugin.fields.map(field => `${field.label}: “${node.data.get(field.name)}”`)}
           </div>
         </div>
       );
diff --git a/src/components/stories/Card.js b/src/components/stories/Card.js
index 95eeabe7..368a85cf 100644
--- a/src/components/stories/Card.js
+++ b/src/components/stories/Card.js
@@ -39,4 +39,4 @@ storiesOf('Card', module)
       <p>header and footer elements are also not subject to margin</p>
       <footer style={styles.footer}>&copy; Thousand Cats Corp</footer>
     </Card>
-  ))
+  ));
diff --git a/src/containers/EntryPage.js b/src/containers/EntryPage.js
index 1693b587..36cfb71a 100644
--- a/src/containers/EntryPage.js
+++ b/src/containers/EntryPage.js
@@ -57,7 +57,7 @@ class EntryPage extends React.Component {
     const {
       entry, entryDraft, boundGetMedia, collection, changeDraft, addMedia, removeMedia
     } = this.props;
-    
+
     if (entryDraft == null || entryDraft.get('entry') == undefined || entry && entry.get('isFetching')) {
       return <div>Loading...</div>;
     }
diff --git a/src/containers/FindBar.js b/src/containers/FindBar.js
index ce13254d..33f98441 100644
--- a/src/containers/FindBar.js
+++ b/src/containers/FindBar.js
@@ -290,7 +290,7 @@ class FindBar extends Component {
       let children;
       if (!command.search) {
         children = (
-          <span><span dangerouslySetInnerHTML={{__html: command.string}} /></span>
+          <span><span dangerouslySetInnerHTML={{ __html: command.string }} /></span>
         );
       } else {
         children = (
@@ -317,7 +317,7 @@ class FindBar extends Component {
     return commands.length === 0 ? null : (
       <div className={styles.menu}>
         <div className={styles.suggestions}>
-          { commands }
+          {commands}
         </div>
         <div className={styles.history}>
           Your past searches and commands
diff --git a/src/formats/yaml.js b/src/formats/yaml.js
index 9fd73c07..d939c068 100644
--- a/src/formats/yaml.js
+++ b/src/formats/yaml.js
@@ -41,6 +41,6 @@ export default class YAML {
   }
 
   toFile(data) {
-    return yaml.safeDump(data, {schema: OutputSchema});
+    return yaml.safeDump(data, { schema: OutputSchema });
   }
 }
diff --git a/src/lib/registry.js b/src/lib/registry.js
index 4d7f14e9..e4de5183 100644
--- a/src/lib/registry.js
+++ b/src/lib/registry.js
@@ -1,5 +1,5 @@
-import {List} from 'immutable';
-import {newEditorPlugin} from '../components/Widgets/MarkdownControlElements/plugins';
+import { List } from 'immutable';
+import { newEditorPlugin } from '../components/Widgets/MarkdownControlElements/plugins';
 
 const _registry = {
   templates: {},
diff --git a/test/reducers/auth.spec.js b/test/reducers/auth.spec.js
index 1d766f53..83830fd5 100644
--- a/test/reducers/auth.spec.js
+++ b/test/reducers/auth.spec.js
@@ -16,15 +16,15 @@ describe('auth', () => {
     expect(
       auth(undefined, authenticating())
     ).toEqual(
-      Immutable.Map({isFetching: true})
+      Immutable.Map({ isFetching: true })
     );
   });
 
   it('should handle authentication', () => {
     expect(
-      auth(undefined, authenticate({email: 'joe@example.com'}))
+      auth(undefined, authenticate({ email: 'joe@example.com' }))
     ).toEqual(
-      Immutable.fromJS({user: {email: 'joe@example.com'}})
+      Immutable.fromJS({ user: { email: 'joe@example.com' } })
     );
   });
 
diff --git a/test/reducers/collections.spec.js b/test/reducers/collections.spec.js
index f3f31583..18ba43d0 100644
--- a/test/reducers/collections.spec.js
+++ b/test/reducers/collections.spec.js
@@ -15,39 +15,39 @@ describe('collections', () => {
 
   it('should load the collections from the config', () => {
     expect(
-      collections(undefined, configLoaded({collections: [
-        {name: 'posts', folder: '_posts', fields: [{name: 'title', widget: 'string'}]}
-      ]}))
+      collections(undefined, configLoaded({ collections: [
+        { name: 'posts', folder: '_posts', fields: [{ name: 'title', widget: 'string' }] }
+      ] }))
     ).toEqual(
       OrderedMap({
-        posts: fromJS({name: 'posts', folder: '_posts', fields: [{name: 'title', widget: 'string'}]})
+        posts: fromJS({ name: 'posts', folder: '_posts', fields: [{ name: 'title', widget: 'string' }] })
       })
     );
   });
 
   it('should mark entries as loading', () => {
     const state = OrderedMap({
-      'posts': Map({name: 'posts'})
+      'posts': Map({ name: 'posts' })
     });
     expect(
-      collections(state, entriesLoading(Map({name: 'posts'})))
+      collections(state, entriesLoading(Map({ name: 'posts' })))
     ).toEqual(
       OrderedMap({
-        'posts': Map({name: 'posts', isFetching: true})
+        'posts': Map({ name: 'posts', isFetching: true })
       })
     );
   });
 
   it('should handle loaded entries', () => {
     const state = OrderedMap({
-      'posts': Map({name: 'posts'})
+      'posts': Map({ name: 'posts' })
     });
-    const entries = [{slug: 'a', path: ''}, {slug: 'b', title: 'B'}];
+    const entries = [{ slug: 'a', path: '' }, { slug: 'b', title: 'B' }];
     expect(
-      collections(state, entriesLoaded(Map({name: 'posts'}), entries))
+      collections(state, entriesLoaded(Map({ name: 'posts' }), entries))
     ).toEqual(
       OrderedMap({
-        'posts': fromJS({name: 'posts', entries: entries})
+        'posts': fromJS({ name: 'posts', entries: entries })
       })
     );
   });
diff --git a/test/reducers/config.spec.js b/test/reducers/config.spec.js
index 75aa9aad..9167e542 100644
--- a/test/reducers/config.spec.js
+++ b/test/reducers/config.spec.js
@@ -14,9 +14,9 @@ describe('config', () => {
 
   it('should handle an update', () => {
     expect(
-      config(Immutable.Map({'a': 'b', 'c': 'd'}), configLoaded({'a': 'changed', 'e': 'new'}))
+      config(Immutable.Map({ 'a': 'b', 'c': 'd' }), configLoaded({ 'a': 'changed', 'e': 'new' }))
     ).toEqual(
-      Immutable.Map({'a': 'changed', 'e': 'new'})
+      Immutable.Map({ 'a': 'changed', 'e': 'new' })
     );
   });
 
@@ -24,15 +24,15 @@ describe('config', () => {
     expect(
       config(undefined, configLoading())
     ).toEqual(
-      Immutable.Map({isFetching: true})
+      Immutable.Map({ isFetching: true })
     );
   });
 
   it('should handle an error', () => {
     expect(
-      config(Immutable.Map({isFetching: true}), configFailed(new Error('Config could not be loaded')))
+      config(Immutable.Map({ isFetching: true }), configFailed(new Error('Config could not be loaded')))
     ).toEqual(
-      Immutable.Map({error: 'Error: Config could not be loaded'})
+      Immutable.Map({ error: 'Error: Config could not be loaded' })
     );
   });
 });
diff --git a/webpack.config.js b/webpack.config.js
index b5dbcf83..32e97dd8 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -13,7 +13,7 @@ module.exports = {
       { test: /\.json$/, loader: 'json-loader' },
       {
         test: /\.css$/,
-        loader: ExtractTextPlugin.extract("style", "css?modules&importLoaders=1&&localIdentName=cms__[name]__[local]!postcss"),
+        loader: ExtractTextPlugin.extract('style', 'css?modules&importLoaders=1&&localIdentName=cms__[name]__[local]!postcss'),
       },
       {
         loader: 'babel',