diff --git a/client/index.js b/client/index.js
deleted file mode 100644
index fad1d375..00000000
--- a/client/index.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react'
-import { render } from 'react-dom'
-import { Provider } from 'react-redux'
-import { Router, browserHistory } from 'react-router'
-import configureStore from './store'
-import routes from './routes'
-
-require('./styles/main.scss');
-
-const history = browserHistory
-const initialState = window.__INITIAL_STATE__
-const store = configureStore(initialState)
-
-render(
-	<Provider store={store}>
-		<Router history={history} routes={routes(store)} />
-	</Provider>,
-	document.getElementById('root')
-)
\ No newline at end of file
diff --git a/client/index.jsx b/client/index.jsx
new file mode 100644
index 00000000..7d21c93a
--- /dev/null
+++ b/client/index.jsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { render } from 'react-dom';
+import { Provider } from 'react-redux';
+import { Router, browserHistory } from 'react-router';
+import configureStore from './store';
+import routes from './routes';
+
+require('./styles/main.scss');
+
+const history = browserHistory;
+const initialState = window.__INITIAL_STATE__;
+const store = configureStore(initialState);
+
+render(
+  <Provider store={store}>
+    <Router history={history} routes={routes(store)} />
+  </Provider>,
+	document.getElementById('root')
+);
diff --git a/client/modules/App/App.js b/client/modules/App/App.jsx
similarity index 100%
rename from client/modules/App/App.js
rename to client/modules/App/App.jsx
diff --git a/client/modules/App/components/DevTools.js b/client/modules/App/components/DevTools.jsx
similarity index 100%
rename from client/modules/App/components/DevTools.js
rename to client/modules/App/components/DevTools.jsx
diff --git a/client/modules/App/components/Overlay.js b/client/modules/App/components/Overlay.jsx
similarity index 100%
rename from client/modules/App/components/Overlay.js
rename to client/modules/App/components/Overlay.jsx
diff --git a/client/modules/IDE/components/About.js b/client/modules/IDE/components/About.jsx
similarity index 100%
rename from client/modules/IDE/components/About.js
rename to client/modules/IDE/components/About.jsx
diff --git a/client/modules/IDE/components/Console.js b/client/modules/IDE/components/Console.jsx
similarity index 100%
rename from client/modules/IDE/components/Console.js
rename to client/modules/IDE/components/Console.jsx
diff --git a/client/modules/IDE/components/Editor.js b/client/modules/IDE/components/Editor.jsx
similarity index 100%
rename from client/modules/IDE/components/Editor.js
rename to client/modules/IDE/components/Editor.jsx
diff --git a/client/modules/IDE/components/EditorAccessibility.js b/client/modules/IDE/components/EditorAccessibility.jsx
similarity index 100%
rename from client/modules/IDE/components/EditorAccessibility.js
rename to client/modules/IDE/components/EditorAccessibility.jsx
diff --git a/client/modules/IDE/components/FileNode.js b/client/modules/IDE/components/FileNode.jsx
similarity index 100%
rename from client/modules/IDE/components/FileNode.js
rename to client/modules/IDE/components/FileNode.jsx
diff --git a/client/modules/IDE/components/FileUploader.js b/client/modules/IDE/components/FileUploader.jsx
similarity index 100%
rename from client/modules/IDE/components/FileUploader.js
rename to client/modules/IDE/components/FileUploader.jsx
diff --git a/client/modules/IDE/components/KeyboardShortcutModal.js b/client/modules/IDE/components/KeyboardShortcutModal.jsx
similarity index 100%
rename from client/modules/IDE/components/KeyboardShortcutModal.js
rename to client/modules/IDE/components/KeyboardShortcutModal.jsx
diff --git a/client/modules/IDE/components/LoginForm.js b/client/modules/IDE/components/LoginForm.jsx
similarity index 100%
rename from client/modules/IDE/components/LoginForm.js
rename to client/modules/IDE/components/LoginForm.jsx
diff --git a/client/modules/IDE/components/LoginView.js b/client/modules/IDE/components/LoginView.jsx
similarity index 100%
rename from client/modules/IDE/components/LoginView.js
rename to client/modules/IDE/components/LoginView.jsx
diff --git a/client/modules/IDE/components/NewFileForm.js b/client/modules/IDE/components/NewFileForm.jsx
similarity index 100%
rename from client/modules/IDE/components/NewFileForm.js
rename to client/modules/IDE/components/NewFileForm.jsx
diff --git a/client/modules/IDE/components/NewFileModal.js b/client/modules/IDE/components/NewFileModal.jsx
similarity index 100%
rename from client/modules/IDE/components/NewFileModal.js
rename to client/modules/IDE/components/NewFileModal.jsx
diff --git a/client/modules/IDE/components/NewFolderForm.js b/client/modules/IDE/components/NewFolderForm.jsx
similarity index 100%
rename from client/modules/IDE/components/NewFolderForm.js
rename to client/modules/IDE/components/NewFolderForm.jsx
diff --git a/client/modules/IDE/components/NewFolderModal.js b/client/modules/IDE/components/NewFolderModal.jsx
similarity index 100%
rename from client/modules/IDE/components/NewFolderModal.js
rename to client/modules/IDE/components/NewFolderModal.jsx
diff --git a/client/modules/IDE/components/NewPasswordForm.js b/client/modules/IDE/components/NewPasswordForm.jsx
similarity index 100%
rename from client/modules/IDE/components/NewPasswordForm.js
rename to client/modules/IDE/components/NewPasswordForm.jsx
diff --git a/client/modules/IDE/components/NewPasswordView.js b/client/modules/IDE/components/NewPasswordView.jsx
similarity index 100%
rename from client/modules/IDE/components/NewPasswordView.js
rename to client/modules/IDE/components/NewPasswordView.jsx
diff --git a/client/modules/IDE/components/Preferences.js b/client/modules/IDE/components/Preferences.jsx
similarity index 100%
rename from client/modules/IDE/components/Preferences.js
rename to client/modules/IDE/components/Preferences.jsx
diff --git a/client/modules/IDE/components/PreviewFrame.js b/client/modules/IDE/components/PreviewFrame.jsx
similarity index 99%
rename from client/modules/IDE/components/PreviewFrame.js
rename to client/modules/IDE/components/PreviewFrame.jsx
index d9cc3971..74a9b10c 100644
--- a/client/modules/IDE/components/PreviewFrame.js
+++ b/client/modules/IDE/components/PreviewFrame.jsx
@@ -295,7 +295,6 @@ PreviewFrame.propTypes = {
   isPlaying: PropTypes.bool.isRequired,
   isTextOutputPlaying: PropTypes.bool.isRequired,
   textOutput: PropTypes.bool.isRequired,
-  head: PropTypes.object.isRequired,
   content: PropTypes.string,
   htmlFile: PropTypes.shape({
     content: PropTypes.string.isRequired
diff --git a/client/modules/IDE/components/ResetPasswordForm.js b/client/modules/IDE/components/ResetPasswordForm.jsx
similarity index 100%
rename from client/modules/IDE/components/ResetPasswordForm.js
rename to client/modules/IDE/components/ResetPasswordForm.jsx
diff --git a/client/modules/IDE/components/ResetPasswordView.js b/client/modules/IDE/components/ResetPasswordView.jsx
similarity index 100%
rename from client/modules/IDE/components/ResetPasswordView.js
rename to client/modules/IDE/components/ResetPasswordView.jsx
diff --git a/client/modules/IDE/components/ShareModal.js b/client/modules/IDE/components/ShareModal.jsx
similarity index 100%
rename from client/modules/IDE/components/ShareModal.js
rename to client/modules/IDE/components/ShareModal.jsx
diff --git a/client/modules/IDE/components/Sidebar.js b/client/modules/IDE/components/Sidebar.jsx
similarity index 100%
rename from client/modules/IDE/components/Sidebar.js
rename to client/modules/IDE/components/Sidebar.jsx
diff --git a/client/modules/IDE/components/SidebarItem.js b/client/modules/IDE/components/SidebarItem.jsx
similarity index 100%
rename from client/modules/IDE/components/SidebarItem.js
rename to client/modules/IDE/components/SidebarItem.jsx
diff --git a/client/modules/IDE/components/SignupForm.js b/client/modules/IDE/components/SignupForm.jsx
similarity index 100%
rename from client/modules/IDE/components/SignupForm.js
rename to client/modules/IDE/components/SignupForm.jsx
diff --git a/client/modules/IDE/components/SignupView.js b/client/modules/IDE/components/SignupView.jsx
similarity index 100%
rename from client/modules/IDE/components/SignupView.js
rename to client/modules/IDE/components/SignupView.jsx
diff --git a/client/modules/IDE/components/SketchList.js b/client/modules/IDE/components/SketchList.jsx
similarity index 100%
rename from client/modules/IDE/components/SketchList.js
rename to client/modules/IDE/components/SketchList.jsx
diff --git a/client/modules/IDE/components/TextOutput.js b/client/modules/IDE/components/TextOutput.jsx
similarity index 100%
rename from client/modules/IDE/components/TextOutput.js
rename to client/modules/IDE/components/TextOutput.jsx
diff --git a/client/modules/IDE/components/Toast.js b/client/modules/IDE/components/Toast.jsx
similarity index 100%
rename from client/modules/IDE/components/Toast.js
rename to client/modules/IDE/components/Toast.jsx
diff --git a/client/modules/IDE/components/Toolbar.js b/client/modules/IDE/components/Toolbar.jsx
similarity index 100%
rename from client/modules/IDE/components/Toolbar.js
rename to client/modules/IDE/components/Toolbar.jsx
diff --git a/client/modules/IDE/pages/FullView.js b/client/modules/IDE/pages/FullView.jsx
similarity index 100%
rename from client/modules/IDE/pages/FullView.js
rename to client/modules/IDE/pages/FullView.jsx
diff --git a/client/modules/IDE/pages/IDEView.js b/client/modules/IDE/pages/IDEView.jsx
similarity index 99%
rename from client/modules/IDE/pages/IDEView.js
rename to client/modules/IDE/pages/IDEView.jsx
index cacaa2fe..260727fd 100644
--- a/client/modules/IDE/pages/IDEView.js
+++ b/client/modules/IDE/pages/IDEView.jsx
@@ -324,9 +324,6 @@ class IDEView extends React.Component {
                   cssFiles={this.props.cssFiles}
                   files={this.props.files}
                   content={this.props.selectedFile.content}
-                  head={
-                    <link type="text/css" rel="stylesheet" href="/preview-styles.css" />
-                  }
                   isPlaying={this.props.ide.isPlaying}
                   isTextOutputPlaying={this.props.ide.isTextOutputPlaying}
                   textOutput={this.props.preferences.textOutput}
diff --git a/client/modules/User/components/GithubButton.js b/client/modules/User/components/GithubButton.jsx
similarity index 100%
rename from client/modules/User/components/GithubButton.js
rename to client/modules/User/components/GithubButton.jsx
diff --git a/client/routes.js b/client/routes.jsx
similarity index 100%
rename from client/routes.js
rename to client/routes.jsx
diff --git a/static/preview-styles.css b/static/preview-styles.css
deleted file mode 100644
index fa33bc1d..00000000
--- a/static/preview-styles.css
+++ /dev/null
@@ -1,4 +0,0 @@
-html, body {
-	margin: 0;
-	padding: 0;
-}
\ No newline at end of file
diff --git a/webpack.config.dev.js b/webpack.config.dev.js
index 6f79bbf7..b19e09bf 100644
--- a/webpack.config.dev.js
+++ b/webpack.config.dev.js
@@ -6,7 +6,7 @@ module.exports = {
 	entry: {
     app: ['babel-polyfill',
           'webpack-hot-middleware/client',
-          './client/index.js',
+          './client/index.jsx',
     ],
     vendor: [
       'react',
diff --git a/webpack.config.prod.js b/webpack.config.prod.js
index f0d41126..4cbd345f 100644
--- a/webpack.config.prod.js
+++ b/webpack.config.prod.js
@@ -14,7 +14,7 @@ module.exports = {
   entry: {
     app: [
       'babel-polyfill',
-      './client/index.js'
+      './client/index.jsx'
     ],
     vendor: [
       'react',