diff --git a/src/app.jsx b/src/app.jsx
index 7648b61b..446b9707 100644
--- a/src/app.jsx
+++ b/src/app.jsx
@@ -1,7 +1,11 @@
 import React from 'react'
 import {saveAs} from 'file-saver'
 
-import { Drawer, Container, Block, Fixed } from 'rebass'
+import Drawer from 'rebass/dist/Drawer'
+import Container from 'rebass/dist/Container'
+import Block from 'rebass/dist/Block'
+import Fixed from 'rebass/dist/Fixed'
+
 import { Map } from './map.jsx'
 import {Toolbar} from './toolbar.jsx'
 import { StyleManager } from './style.js'
diff --git a/src/fields/color.jsx b/src/fields/color.jsx
index 2757e231..735112d4 100644
--- a/src/fields/color.jsx
+++ b/src/fields/color.jsx
@@ -1,5 +1,4 @@
 import React from 'react'
-import { Label, Input } from 'rebass'
 import inputStyle from './input.js'
 
 /*** Number fields with support for min, max and units and documentation*/
diff --git a/src/fields/enum.jsx b/src/fields/enum.jsx
index 10672d24..46db1d85 100644
--- a/src/fields/enum.jsx
+++ b/src/fields/enum.jsx
@@ -1,5 +1,4 @@
 import React from 'react'
-import { Select, Input } from 'rebass'
 import inputStyle from './input.js'
 
 class EnumField extends React.Component {
diff --git a/src/fields/number.jsx b/src/fields/number.jsx
index 906f3263..77f2a4a4 100644
--- a/src/fields/number.jsx
+++ b/src/fields/number.jsx
@@ -1,5 +1,4 @@
 import React from 'react'
-import { Label, Input } from 'rebass'
 import inputStyle from './input.js'
 
 /*** Number fields with support for min, max and units and documentation*/
diff --git a/src/fields/string.jsx b/src/fields/string.jsx
index 45a3f9de..09ccea4f 100644
--- a/src/fields/string.jsx
+++ b/src/fields/string.jsx
@@ -1,5 +1,4 @@
 import React from 'react'
-import { Label, Input } from 'rebass'
 import inputStyle from './input.js'
 
 /*** Number fields with support for min, max and units and documentation*/
diff --git a/src/layers/background.jsx b/src/layers/background.jsx
index 1a161929..07eeeaac 100644
--- a/src/layers/background.jsx
+++ b/src/layers/background.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import Immutable from 'immutable'
-import { Input } from 'rebass'
+import Input from 'rebass/dist/Input'
 import { PropertyGroup } from '../fields/spec'
 import PureRenderMixin from 'react-addons-pure-render-mixin';
 
diff --git a/src/layers/editor.jsx b/src/layers/editor.jsx
index d39854cb..95612122 100644
--- a/src/layers/editor.jsx
+++ b/src/layers/editor.jsx
@@ -1,12 +1,15 @@
 import React from 'react'
 import Immutable from 'immutable'
-import { Toolbar, NavItem, Space} from 'rebass'
-import Collapse from 'react-collapse'
 
+import Toolbar from 'rebass/dist/Toolbar'
+import NavItem from 'rebass/dist/NavItem'
+import Space from 'rebass/dist/Space'
+
+import Collapse from 'react-collapse'
 import theme from '../theme.js'
 import FillLayer from './fill.jsx'
 import LineLayer from './line.jsx'
-import SymbolLayer from './line.jsx'
+import SymbolLayer from './symbol.jsx'
 import BackgroundLayer from './background.jsx'
 
 import MdVisibility from 'react-icons/lib/md/visibility'
diff --git a/src/layers/line.jsx b/src/layers/line.jsx
index 40607ef2..61b988b8 100644
--- a/src/layers/line.jsx
+++ b/src/layers/line.jsx
@@ -1,6 +1,7 @@
 import React from 'react'
 import Immutable from 'immutable'
 import { PropertyGroup } from '../fields/spec'
+import PureRenderMixin from 'react-addons-pure-render-mixin';
 
 export default class LineLayer extends React.Component {
 	static propTypes = {
@@ -9,6 +10,11 @@ export default class LineLayer extends React.Component {
     onLayoutChanged: React.PropTypes.func.isRequired,
   }
 
+	constructor(props) {
+		super(props);
+		this.shouldComponentUpdate = PureRenderMixin.shouldComponentUpdate.bind(this);
+	}
+
 	render() {
 		return <div>
 			<PropertyGroup
diff --git a/src/layers/list.jsx b/src/layers/list.jsx
index 807eb9b4..1adb4582 100644
--- a/src/layers/list.jsx
+++ b/src/layers/list.jsx
@@ -1,6 +1,11 @@
 import React from 'react'
 import Immutable from 'immutable'
-import { Heading, Toolbar, NavItem, Space} from 'rebass'
+
+import Heading from 'rebass/dist/Heading'
+import Toolbar from 'rebass/dist/Toolbar'
+import NavItem from 'rebass/dist/NavItem'
+import Space from 'rebass/dist/Space'
+
 import { LayerEditor } from './editor.jsx'
 import scrollbars from '../scrollbars.scss'
 import PureRenderMixin from 'react-addons-pure-render-mixin';
diff --git a/src/layers/symbol.jsx b/src/layers/symbol.jsx
index 61ce2430..8faefb0d 100644
--- a/src/layers/symbol.jsx
+++ b/src/layers/symbol.jsx
@@ -1,4 +1,7 @@
 import React from 'react'
+import Immutable from 'immutable'
+import PureRenderMixin from 'react-addons-pure-render-mixin';
+import { PropertyGroup } from '../fields/spec'
 
 export default class SymbolLayer extends React.Component {
 	static propTypes = {
diff --git a/src/settings.jsx b/src/settings.jsx
index 8744bee6..1d514f69 100644
--- a/src/settings.jsx
+++ b/src/settings.jsx
@@ -1,6 +1,13 @@
 import React from 'react'
 import theme from './theme.js'
-import { Heading, Container, Input, Toolbar, NavItem, Space } from 'rebass'
+
+import Heading from 'rebass/dist/Heading'
+import Container from 'rebass/dist/Container'
+import Input from 'rebass/dist/Input'
+import Toolbar from 'rebass/dist/Toolbar'
+import NavItem from 'rebass/dist/NavItem'
+import Space from 'rebass/dist/Space'
+
 import Immutable from 'immutable'
 import PureRenderMixin from 'react-addons-pure-render-mixin';
 
diff --git a/src/sources/editor.jsx b/src/sources/editor.jsx
index 247b1314..7580ff8a 100644
--- a/src/sources/editor.jsx
+++ b/src/sources/editor.jsx
@@ -1,6 +1,11 @@
 import React from 'react'
 import Immutable from 'immutable'
-import { Input, Toolbar, NavItem, Space} from 'rebass'
+
+import Input from 'rebass/dist/Input'
+import Toolbar from 'rebass/dist/Toolbar'
+import NavItem from 'rebass/dist/NavItem'
+import Space from 'rebass/dist/Space'
+
 import Collapse from 'react-collapse'
 import PureRenderMixin from 'react-addons-pure-render-mixin';
 
diff --git a/src/sources/list.jsx b/src/sources/list.jsx
index 33a5a56d..061a3d71 100644
--- a/src/sources/list.jsx
+++ b/src/sources/list.jsx
@@ -1,6 +1,11 @@
 import React from 'react'
 import Immutable from 'immutable'
-import { Heading, Toolbar, NavItem, Space} from 'rebass'
+
+import Heading from 'rebass/dist/Heading'
+import Toolbar from 'rebass/dist/Toolbar'
+import NavItem from 'rebass/dist/NavItem'
+import Space from 'rebass/dist/Space'
+
 import { SourceEditor } from './editor.jsx'
 import scrollbars from '../scrollbars.scss'
 import PureRenderMixin from 'react-addons-pure-render-mixin';
diff --git a/src/toolbar.jsx b/src/toolbar.jsx
index fbbb6931..098cdfa6 100644
--- a/src/toolbar.jsx
+++ b/src/toolbar.jsx
@@ -1,8 +1,14 @@
 import React from 'react';
 import FileReaderInput from 'react-file-reader-input';
 
-import { Button, Text } from 'rebass';
-import { Menu, NavItem, Tooltip, Container, Block, Fixed } from 'rebass'
+import Button from 'rebass/dist/Button'
+import Text from 'rebass/dist/Text'
+import Menu from 'rebass/dist/Menu'
+import NavItem from 'rebass/dist/NavItem'
+import Tooltip from 'rebass/dist/Tooltip'
+import Container from 'rebass/dist/Container'
+import Block from 'rebass/dist/Block'
+import Fixed from 'rebass/dist/Fixed'
 
 import MdFileDownload from 'react-icons/lib/md/file-download'
 import MdFileUpload from 'react-icons/lib/md/file-upload'
@@ -11,7 +17,6 @@ import MdLayers from 'react-icons/lib/md/layers'
 import MdSave from 'react-icons/lib/md/save'
 import MdMap from 'react-icons/lib/md/map'
 
-
 import style from './style.js'
 import { fullHeight } from './theme.js'
 import theme from './theme.js';