diff --git a/src/containers/App.js b/src/containers/App.js
index 74808844..23277f24 100644
--- a/src/containers/App.js
+++ b/src/containers/App.js
@@ -76,7 +76,7 @@ function mapStateToProps(state) {
   const { auth, config } = state;
   const user = auth && auth.get('user');
 
-  return {auth, config, user};
+  return { auth, config, user };
 }
 
 export default connect(mapStateToProps)(App);
diff --git a/src/containers/CollectionPage.js b/src/containers/CollectionPage.js
index 2311b8d3..8d8b12b4 100644
--- a/src/containers/CollectionPage.js
+++ b/src/containers/CollectionPage.js
@@ -1,4 +1,5 @@
-import React from 'react';
+import React, { PropTypes } from 'react';
+import ImmutablePropTypes from 'react-immutable-proptypes';
 import { Link } from 'react-router';
 import { connect } from 'react-redux';
 import { loadEntries } from '../actions/entries';
@@ -23,7 +24,6 @@ class DashboardPage extends React.Component {
 
   render() {
     const { collections, collection, entries } = this.props;
-
     if (collections == null) {
       return <h1>No collections defined in your config.yml</h1>;
     }
@@ -44,13 +44,20 @@ class DashboardPage extends React.Component {
   }
 }
 
+DashboardPage.propTypes = {
+  collection: ImmutablePropTypes.map.isRequired,
+  collections: ImmutablePropTypes.orderedMap.isRequired,
+  dispatch: PropTypes.func.isRequired,
+  entries: ImmutablePropTypes.list,
+};
+
 function mapStateToProps(state, ownProps) {
   const { collections } = state;
   const { name, slug } = ownProps.params;
   const collection = name ? collections.get(name) : collections.first();
   const entries = selectEntries(state, collection.get('name'));
 
-  return {slug, collection, collections, entries};
+  return { slug, collection, collections, entries };
 }
 
 export default connect(mapStateToProps)(DashboardPage);
diff --git a/src/containers/EntryPage.js b/src/containers/EntryPage.js
index aff9eb35..d03b744b 100644
--- a/src/containers/EntryPage.js
+++ b/src/containers/EntryPage.js
@@ -1,4 +1,5 @@
-import React from 'react';
+import React, { PropTypes } from 'react';
+import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 import {
   loadEntry,
@@ -39,6 +40,7 @@ class EntryPage extends React.Component {
   }
 
   render() {
+
     const {
       entry, entryDraft, boundGetMedia, collection, changeDraft, addMedia, removeMedia
     } = this.props;
@@ -60,13 +62,28 @@ class EntryPage extends React.Component {
   }
 }
 
+EntryPage.propTypes = {
+  addMedia: PropTypes.func.isRequired,
+  boundGetMedia: PropTypes.func.isRequired,
+  changeDraft: PropTypes.func.isRequired,
+  collection: ImmutablePropTypes.map.isRequired,
+  createDraft: PropTypes.func.isRequired,
+  discardDraft: PropTypes.func.isRequired,
+  entry: ImmutablePropTypes.map.isRequired,
+  entryDraft: ImmutablePropTypes.map.isRequired,
+  loadEntry: PropTypes.func.isRequired,
+  persist: PropTypes.func.isRequired,
+  removeMedia: PropTypes.func.isRequired,
+  slug: PropTypes.string.isRequired,
+};
+
 function mapStateToProps(state, ownProps) {
   const { collections, entryDraft } = state;
   const collection = collections.get(ownProps.params.name);
   const slug = ownProps.params.slug;
   const entry = selectEntry(state, collection.get('name'), slug);
   const boundGetMedia = getMedia.bind(null, state);
-  return {collection, collections, entryDraft, boundGetMedia, slug, entry};
+  return { collection, collections, entryDraft, boundGetMedia, slug, entry };
 }
 
 export default connect(