diff --git a/lib/components/AppBar.js b/lib/components/AppBar.js
index f533d42..ea48c80 100644
--- a/lib/components/AppBar.js
+++ b/lib/components/AppBar.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/AppBar.js';var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _reactNative=require('react-native');
 var _uranium=require('uranium');var _uranium2=_interopRequireDefault(_uranium);
@@ -65,18 +65,18 @@ styles.base,
 !navIcon&&styles.baseWithoutNavIcon,
 (0,_uranium.animate)(_index.Elevation.dp0,_index.Elevation.dp4,this._elevateAV)]},
 
-otherWithoutAppBarProps),
+otherWithoutAppBarProps,{__source:{fileName:_jsxFileName,lineNumber:62}}),
 navIcon&&
 _react2.default.createElement(_index.IconToggle,{
 name:navIcon,
 style:styles.icon,
 iconStyle:styles.iconIcon,
 rippleColor:_index.Colors.white,
-onPress:onNavIconPress}),
+onPress:onNavIconPress,__source:{fileName:_jsxFileName,lineNumber:70}}),
 
-_react2.default.createElement(_reactNative.View,{style:styles.title},
+_react2.default.createElement(_reactNative.View,{style:styles.title,__source:{fileName:_jsxFileName,lineNumber:77}},
 typeof title==='string'?
-_react2.default.createElement(_index.Title,{style:styles.titleText},title):
+_react2.default.createElement(_index.Title,{style:styles.titleText,__source:{fileName:_jsxFileName,lineNumber:79}},title):
 title),
 
 
diff --git a/lib/components/BottomNavigation.js b/lib/components/BottomNavigation.js
index 5324ed6..852763e 100644
--- a/lib/components/BottomNavigation.js
+++ b/lib/components/BottomNavigation.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/BottomNavigation.js';var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _reactNative=require('react-native');
 var _index=require('../index');function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var
@@ -52,7 +52,7 @@ BottomNavigation=function(_Component){_inherits(BottomNavigation,_Component);fun
 {var
 children=this.props.children;
 return(
-_react2.default.createElement(_reactNative.View,{style:styles.base},
+_react2.default.createElement(_reactNative.View,{style:styles.base,__source:{fileName:_jsxFileName,lineNumber:55}},
 children));
 
 
diff --git a/lib/components/BottomNavigationIcon.js b/lib/components/BottomNavigationIcon.js
index 71c7d90..ef5f83e 100644
--- a/lib/components/BottomNavigationIcon.js
+++ b/lib/components/BottomNavigationIcon.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/BottomNavigationIcon.js';var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _reactNative=require('react-native');
 var _uranium=require('uranium');
@@ -36,17 +36,17 @@ _react2.default.createElement(_index.TouchableRipple,_extends({
 rippleCentered:true,
 rippleSpread:0.3,
 rippleColor:theme.colors.primary},
-other),
+other,{__source:{fileName:_jsxFileName,lineNumber:35}}),
 _react2.default.createElement(_reactNative.Animated.View,{
 style:[
 styles.base,
-(0,_uranium.animate)(styles.base,styles.active,this._activateAV)]},
+(0,_uranium.animate)(styles.base,styles.active,this._activateAV)],__source:{fileName:_jsxFileName,lineNumber:40}},
 
 _react2.default.createElement(AnimatedIcon,{
 name:name,
-style:(0,_uranium.animate)(styles.icon,styles.iconActive,this._activateAV)}),
+style:(0,_uranium.animate)(styles.icon,styles.iconActive,this._activateAV),__source:{fileName:_jsxFileName,lineNumber:45}}),
 _react2.default.createElement(AnimatedBody1,{
-style:(0,_uranium.animate)(styles.text,styles.textActive,this._activateAV)},
+style:(0,_uranium.animate)(styles.text,styles.textActive,this._activateAV),__source:{fileName:_jsxFileName,lineNumber:48}},
 text))));
 
 
diff --git a/lib/components/Card/Card.js b/lib/components/Card/Card.js
index fd7f997..c436d5f 100644
--- a/lib/components/Card/Card.js
+++ b/lib/components/Card/Card.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/Card/Card.js';var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _reactNative=require('react-native');
 var _uranium=require('uranium');var _uranium2=_interopRequireDefault(_uranium);
@@ -37,7 +37,7 @@ css:[
 styles.root,
 style]},
 
-other),
+other,{__source:{fileName:_jsxFileName,lineNumber:35}}),
 children));};
 
 
diff --git a/lib/components/Card/CardActions.js b/lib/components/Card/CardActions.js
index bbacb5c..cf72477 100644
--- a/lib/components/Card/CardActions.js
+++ b/lib/components/Card/CardActions.js
@@ -1,11 +1,11 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _jsxFileName='src/components/Card/CardActions.js';var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _reactNative=require('react-native');
 var _uranium=require('uranium');var _uranium2=_interopRequireDefault(_uranium);
 var _index=require('../../index');function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}
 
 var CardActions=function CardActions(_ref){var children=_ref.children,style=_ref.style;return(
-_react2.default.createElement(_reactNative.View,{css:[styles.root,style]},
+_react2.default.createElement(_reactNative.View,{css:[styles.root,style],__source:{fileName:_jsxFileName,lineNumber:8}},
 children));};
 
 
diff --git a/lib/components/Card/CardText.js b/lib/components/Card/CardText.js
index 488e214..b49e89b 100644
--- a/lib/components/Card/CardText.js
+++ b/lib/components/Card/CardText.js
@@ -1,12 +1,12 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _jsxFileName='src/components/Card/CardText.js';var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _reactNative=require('react-native');
 var _uranium=require('uranium');var _uranium2=_interopRequireDefault(_uranium);
 var _index=require('../../index');function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _defineProperty(obj,key,value){if(key in obj){Object.defineProperty(obj,key,{value:value,enumerable:true,configurable:true,writable:true});}else{obj[key]=value;}return obj;}
 
 var CardText=function CardText(_ref){var children=_ref.children,style=_ref.style,textStyle=_ref.textStyle;return(
-_react2.default.createElement(_reactNative.View,{css:[styles.root,style]},
-_react2.default.createElement(_reactNative.Text,{css:[styles.text,textStyle]},
+_react2.default.createElement(_reactNative.View,{css:[styles.root,style],__source:{fileName:_jsxFileName,lineNumber:8}},
+_react2.default.createElement(_reactNative.Text,{css:[styles.text,textStyle],__source:{fileName:_jsxFileName,lineNumber:9}},
 children)));};
 
 
diff --git a/lib/components/Card/CardTitle.js b/lib/components/Card/CardTitle.js
index 137ed65..67fc30c 100644
--- a/lib/components/Card/CardTitle.js
+++ b/lib/components/Card/CardTitle.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/Card/CardTitle.js';var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _reactNative=require('react-native');
 var _uranium=require('uranium');var _uranium2=_interopRequireDefault(_uranium);
@@ -13,11 +13,11 @@ title=_ref.title,
 titleStyle=_ref.titleStyle,
 other=_objectWithoutProperties(_ref,['children','style','subtitle','subtitleStyle','title','titleStyle']);return(
 
-_react2.default.createElement(_reactNative.View,_extends({},other,{css:[styles.root,style]}),
-_react2.default.createElement(_reactNative.Text,{css:[subtitle?styles.title:styles.subtitle,titleStyle]},
+_react2.default.createElement(_reactNative.View,_extends({},other,{css:[styles.root,style],__source:{fileName:_jsxFileName,lineNumber:16}}),
+_react2.default.createElement(_reactNative.Text,{css:[subtitle?styles.title:styles.subtitle,titleStyle],__source:{fileName:_jsxFileName,lineNumber:17}},
 title),
 
-subtitle&&_react2.default.createElement(_reactNative.Text,{css:[styles.subtitle,subtitleStyle]},
+subtitle&&_react2.default.createElement(_reactNative.Text,{css:[styles.subtitle,subtitleStyle],__source:{fileName:_jsxFileName,lineNumber:20}},
 subtitle),
 
 children));};
diff --git a/lib/components/DataTable/Cell.js b/lib/components/DataTable/Cell.js
index 058395c..dda9ea7 100644
--- a/lib/components/DataTable/Cell.js
+++ b/lib/components/DataTable/Cell.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/DataTable/Cell.js';var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _reactNative=require('react-native');
 
@@ -6,10 +6,10 @@ var _index=require('../../index');function _interopRequireDefault(obj){return ob
 
 var Cell=function Cell(_ref){var children=_ref.children,style=_ref.style,other=_objectWithoutProperties(_ref,['children','style']);
 var defaultedChildren=typeof children==='string'?
-_react2.default.createElement(_index.Body1,null,children):
+_react2.default.createElement(_index.Body1,{__source:{fileName:_jsxFileName,lineNumber:9}},children):
 children;
 return(
-_react2.default.createElement(_reactNative.View,_extends({style:[styles.base].concat(style)},other),
+_react2.default.createElement(_reactNative.View,_extends({style:[styles.base].concat(style)},other,{__source:{fileName:_jsxFileName,lineNumber:12}}),
 defaultedChildren));
 
 
@@ -17,7 +17,7 @@ defaultedChildren));
 
 Cell.propTypes={
 children:_propTypes2.default.node,
-style:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array])};exports.default=
+style:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array,_propTypes2.default.number])};exports.default=
 
 
 Cell;
diff --git a/lib/components/DataTable/HeaderCell.js b/lib/components/DataTable/HeaderCell.js
index 47822b6..b258287 100644
--- a/lib/components/DataTable/HeaderCell.js
+++ b/lib/components/DataTable/HeaderCell.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/DataTable/HeaderCell.js';var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _reactNative=require('react-native');
 
@@ -6,10 +6,10 @@ var _index=require('../../index');function _interopRequireDefault(obj){return ob
 
 var HeaderCell=function HeaderCell(_ref){var children=_ref.children,style=_ref.style,other=_objectWithoutProperties(_ref,['children','style']);
 var defaultedChildren=typeof children==='string'?
-_react2.default.createElement(_index.Body2,{ellipsizeMode:'tail',numberOfLines:1},children):
+_react2.default.createElement(_index.Body2,{ellipsizeMode:'tail',numberOfLines:1,__source:{fileName:_jsxFileName,lineNumber:9}},children):
 children;
 return(
-_react2.default.createElement(_reactNative.View,_extends({style:[styles.base].concat(style)},other),
+_react2.default.createElement(_reactNative.View,_extends({style:[styles.base].concat(style)},other,{__source:{fileName:_jsxFileName,lineNumber:12}}),
 defaultedChildren));
 
 
@@ -17,7 +17,7 @@ defaultedChildren));
 
 HeaderCell.propTypes={
 children:_propTypes2.default.node,
-style:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array])};exports.default=
+style:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array,_propTypes2.default.number])};exports.default=
 
 
 HeaderCell;
diff --git a/lib/components/DataTable/HeaderRow.js b/lib/components/DataTable/HeaderRow.js
index 415e00b..affedb4 100644
--- a/lib/components/DataTable/HeaderRow.js
+++ b/lib/components/DataTable/HeaderRow.js
@@ -1,11 +1,11 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/DataTable/HeaderRow.js';var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _reactNative=require('react-native');
 
 var _index=require('../../index');function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _objectWithoutProperties(obj,keys){var target={};for(var i in obj){if(keys.indexOf(i)>=0)continue;if(!Object.prototype.hasOwnProperty.call(obj,i))continue;target[i]=obj[i];}return target;}
 
 var HeaderRow=function HeaderRow(_ref){var children=_ref.children,style=_ref.style,other=_objectWithoutProperties(_ref,['children','style']);return(
-_react2.default.createElement(_reactNative.View,_extends({style:[styles.base].concat(style)},other),
+_react2.default.createElement(_reactNative.View,_extends({style:[styles.base].concat(style)},other,{__source:{fileName:_jsxFileName,lineNumber:8}}),
 _react2.default.Children.map(children,function(child,i){return(
 
 i===0?
diff --git a/lib/components/DataTable/Row.js b/lib/components/DataTable/Row.js
index 415e00b..e809306 100644
--- a/lib/components/DataTable/Row.js
+++ b/lib/components/DataTable/Row.js
@@ -1,11 +1,11 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/DataTable/Row.js';var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _reactNative=require('react-native');
 
 var _index=require('../../index');function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _objectWithoutProperties(obj,keys){var target={};for(var i in obj){if(keys.indexOf(i)>=0)continue;if(!Object.prototype.hasOwnProperty.call(obj,i))continue;target[i]=obj[i];}return target;}
 
 var HeaderRow=function HeaderRow(_ref){var children=_ref.children,style=_ref.style,other=_objectWithoutProperties(_ref,['children','style']);return(
-_react2.default.createElement(_reactNative.View,_extends({style:[styles.base].concat(style)},other),
+_react2.default.createElement(_reactNative.View,_extends({style:[styles.base].concat(style)},other,{__source:{fileName:_jsxFileName,lineNumber:8}}),
 _react2.default.Children.map(children,function(child,i){return(
 
 i===0?
diff --git a/lib/components/DataTable/index.js b/lib/components/DataTable/index.js
index ed50e8d..5465aa2 100644
--- a/lib/components/DataTable/index.js
+++ b/lib/components/DataTable/index.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/DataTable/index.js';var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _reactNative=require('react-native');
 
@@ -44,8 +44,8 @@ var _Cell=require('./Cell');var _Cell2=_interopRequireDefault(_Cell);function _i
 
 
 var DataTable=function DataTable(_ref){var children=_ref.children,style=_ref.style,other=_objectWithoutProperties(_ref,['children','style']);return(
-_react2.default.createElement(_reactNative.View,_extends({style:[styles.base].concat(style)},other),
-_react2.default.createElement(_reactNative.View,{style:styles.table},
+_react2.default.createElement(_reactNative.View,_extends({style:[styles.base].concat(style)},other,{__source:{fileName:_jsxFileName,lineNumber:47}}),
+_react2.default.createElement(_reactNative.View,{style:styles.table,__source:{fileName:_jsxFileName,lineNumber:48}},
 children)));};
 
 
diff --git a/lib/components/Dialog.js b/lib/components/Dialog.js
index 54e6985..48a0576 100644
--- a/lib/components/Dialog.js
+++ b/lib/components/Dialog.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/Dialog.js';var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _reactNative=require('react-native');
 var _uranium=require('uranium');
@@ -57,23 +57,23 @@ style:[
 styles.overlay,
 (0,_uranium.animate)(['backgroundColor'],styles.overlay,styles.overlayVisible,this._showAV),
 
-!visible&&styles.hidden]},
+!visible&&styles.hidden],__source:{fileName:_jsxFileName,lineNumber:55}},
 
-_react2.default.createElement(_reactNative.TouchableWithoutFeedback,{onPress:onOverlayPress},
-_react2.default.createElement(_reactNative.View,{style:styles.touchableBackground})),
+_react2.default.createElement(_reactNative.TouchableWithoutFeedback,{onPress:onOverlayPress,__source:{fileName:_jsxFileName,lineNumber:62}},
+_react2.default.createElement(_reactNative.View,{style:styles.touchableBackground,__source:{fileName:_jsxFileName,lineNumber:63}})),
 
 _react2.default.createElement(_reactNative.Animated.View,{
 style:[
 styles.dialog,
 (0,_uranium.animate)(['top','opacity'],styles.dialog,styles.dialogVisible,this._showAV),
-style]},
+style],__source:{fileName:_jsxFileName,lineNumber:65}},
 
 !!title&&
-_react2.default.createElement(_reactNative.View,{style:styles.title},_react2.default.createElement(_index.Title,null,title)),
+_react2.default.createElement(_reactNative.View,{style:styles.title,__source:{fileName:_jsxFileName,lineNumber:72}},_react2.default.createElement(_index.Title,{__source:{fileName:_jsxFileName,lineNumber:72}},title)),
 
-_react2.default.createElement(_reactNative.View,{style:[styles.body,!title&&styles.bodyWithoutTitle]},children),
+_react2.default.createElement(_reactNative.View,{style:[styles.body,!title&&styles.bodyWithoutTitle],__source:{fileName:_jsxFileName,lineNumber:74}},children),
 !!actions&&
-_react2.default.createElement(_reactNative.View,{style:styles.actions},
+_react2.default.createElement(_reactNative.View,{style:styles.actions,__source:{fileName:_jsxFileName,lineNumber:76}},
 Array.isArray(actions)?_react2.default.Children.toArray(actions):actions))));
 
 
@@ -104,7 +104,7 @@ onOverlayPress:_propTypes2.default.func,
 
 
 children:_propTypes2.default.node.isRequired,
-style:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array])};
+style:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array,_propTypes2.default.number])};
 
 
 Dialog.defaultProps={
diff --git a/lib/components/Divider.js b/lib/components/Divider.js
index 1208ca5..9756b9e 100644
--- a/lib/components/Divider.js
+++ b/lib/components/Divider.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/Divider.js';var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _reactNative=require('react-native');
 
@@ -29,7 +29,7 @@ tStyles(theme).base,
 color&&{borderColor:color},
 style]},
 
-other)));};
+other,{__source:{fileName:_jsxFileName,lineNumber:26}})));};
 
 Divider.propTypes={
 
diff --git a/lib/components/ExpansionPanel.js b/lib/components/ExpansionPanel.js
index 55178d9..b873bd0 100644
--- a/lib/components/ExpansionPanel.js
+++ b/lib/components/ExpansionPanel.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _jsxFileName='src/components/ExpansionPanel.js';var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _reactNative=require('react-native');
 var _uranium=require('uranium');
@@ -47,20 +47,20 @@ expanded=this.state.expanded;
 var AnimatedIcon=_reactNative.Animated.createAnimatedComponent(_index.Icon);
 
 var labelEl=typeof label==='string'?
-_react2.default.createElement(_index.Body1,{style:styles.labelText},label):
+_react2.default.createElement(_index.Body1,{style:styles.labelText,__source:{fileName:_jsxFileName,lineNumber:50}},label):
 label;
 
 
 
 return(
-_react2.default.createElement(_reactNative.Animated.View,{style:(0,_uranium.animate)('marginVertical',0,16,this._heightAV)},
-_react2.default.createElement(_index.Paper,{style:styles.base},
+_react2.default.createElement(_reactNative.Animated.View,{style:(0,_uranium.animate)('marginVertical',0,16,this._heightAV),__source:{fileName:_jsxFileName,lineNumber:56}},
+_react2.default.createElement(_index.Paper,{style:styles.base,__source:{fileName:_jsxFileName,lineNumber:57}},
 !expanded&&
 _react2.default.createElement(_index.TouchableRipple,{
 style:styles.label,
-onPress:onExpand},
+onPress:onExpand,__source:{fileName:_jsxFileName,lineNumber:59}},
 _react2.default.createElement(_reactNative.Animated.View,{
-style:(0,_uranium.animate)('opacity',0,1,this._labelOpacityAV)},
+style:(0,_uranium.animate)('opacity',0,1,this._labelOpacityAV),__source:{fileName:_jsxFileName,lineNumber:62}},
 labelEl)),
 
 
@@ -69,19 +69,19 @@ _react2.default.createElement(AnimatedIcon,{
 name:'keyboard_arrow_down',
 style:[
 styles.icon,
-(0,_uranium.animate)(['transform'],styles.icon,styles.iconExpanded,this._iconAV)]}),
+(0,_uranium.animate)(['transform'],styles.icon,styles.iconExpanded,this._iconAV)],__source:{fileName:_jsxFileName,lineNumber:68}}),
 
 _react2.default.createElement(_reactNative.Animated.View,{
 style:[
 styles.content,
 (0,_uranium.animate)('opacity',0,1,this._opacityAV),
-(0,_uranium.animate)('maxHeight',0,approximateHeight,this._heightAV)]},
+(0,_uranium.animate)('maxHeight',0,approximateHeight,this._heightAV)],__source:{fileName:_jsxFileName,lineNumber:74}},
 
-_react2.default.createElement(_reactNative.View,{style:styles.body},
+_react2.default.createElement(_reactNative.View,{style:styles.body,__source:{fileName:_jsxFileName,lineNumber:80}},
 children),
 
 !!actions&&
-_react2.default.createElement(_reactNative.View,{style:styles.actions},
+_react2.default.createElement(_reactNative.View,{style:styles.actions,__source:{fileName:_jsxFileName,lineNumber:84}},
 Array.isArray(actions)?_react2.default.Children.toArray(actions):actions)))));
 
 
diff --git a/lib/components/Icon.js b/lib/components/Icon.js
index daf339d..ee2ab15 100644
--- a/lib/components/Icon.js
+++ b/lib/components/Icon.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/Icon.js';var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _reactNative=require('react-native');function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _objectWithoutProperties(obj,keys){var target={};for(var i in obj){if(keys.indexOf(i)>=0)continue;if(!Object.prototype.hasOwnProperty.call(obj,i))continue;target[i]=obj[i];}return target;}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}
 
@@ -41,7 +41,7 @@ fontSize:SIZE,
 lineHeight:SIZE}].
 
 concat(style)},
-other),
+other,{__source:{fileName:_jsxFileName,lineNumber:33}}),
 name,
 children));
 
@@ -56,7 +56,7 @@ Icon.propTypes={
 name:_propTypes2.default.string.isRequired,
 
 children:_propTypes2.default.node,
-style:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array])};exports.default=
+style:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array,_propTypes2.default.number])};exports.default=
 
 
 Icon;
diff --git a/lib/components/List.js b/lib/components/List.js
index 9770d9f..bfcc61e 100644
--- a/lib/components/List.js
+++ b/lib/components/List.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/List.js';var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _reactNative=require('react-native');
 var _uranium=require('uranium');var _uranium2=_interopRequireDefault(_uranium);
@@ -67,7 +67,7 @@ var _index=require('../index');function _interopRequireDefault(obj){return obj&&
 
 
 var List=function List(_ref){var children=_ref.children,other=_objectWithoutProperties(_ref,['children']);return(
-_react2.default.createElement(_reactNative.ScrollView,_extends({css:styles.base},other),
+_react2.default.createElement(_reactNative.ScrollView,_extends({css:styles.base},other,{__source:{fileName:_jsxFileName,lineNumber:70}}),
 children));};
 
 
diff --git a/lib/components/ListItem.js b/lib/components/ListItem.js
index f6e7cd6..779391d 100644
--- a/lib/components/ListItem.js
+++ b/lib/components/ListItem.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/ListItem.js';var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _reactNative=require('react-native');
 var _uranium=require('uranium');var _uranium2=_interopRequireDefault(_uranium);
@@ -123,24 +123,24 @@ var otherWithoutCustomProps=(0,_omit2.default)(other,'expanded');
 var thereIsSomethingOnTheRight=rightText||rightIcon||childrenCount>0;
 
 return(
-_react2.default.createElement(_reactNative.View,null,
+_react2.default.createElement(_reactNative.View,{__source:{fileName:_jsxFileName,lineNumber:126}},
 _react2.default.createElement(_index.TouchableRipple,{
 style:styles.touchable,
 onMouseEnter:function onMouseEnter(){return _this3.setState({hovered:true});},
 onMouseLeave:function onMouseLeave(){return _this3.setState({hovered:false});},
-onPress:onPress},
+onPress:onPress,__source:{fileName:_jsxFileName,lineNumber:127}},
 _react2.default.createElement(_reactNative.Animated.View,_extends({
 css:styles.body,
 style:[
 (0,_uranium.animate)(['backgroundColor'],styles.body,styles.hovered,this._hoverAV)].
 concat(style)},
-otherWithoutCustomProps),
+otherWithoutCustomProps,{__source:{fileName:_jsxFileName,lineNumber:132}}),
 leftIcon&&
 _react2.default.createElement(_index.Icon,{
 name:leftIcon,
 style:[
 styles.leftIcon,
-active&&styles.active]}),
+active&&styles.active],__source:{fileName:_jsxFileName,lineNumber:139}}),
 
 
 _react2.default.createElement(_index.Subheading,{
@@ -149,7 +149,7 @@ active&&styles.active,
 thereIsSomethingOnTheRight&&styles.primaryTextGivenRightEl],
 
 numberOfLines:1,
-ellipsizeMode:'tail'},
+ellipsizeMode:'tail',__source:{fileName:_jsxFileName,lineNumber:146}},
 primaryText),
 
 secondaryText&&
@@ -158,7 +158,7 @@ numberOfLines:secondaryTextLines,
 ellipsizeMode:'tail',
 style:[
 styles.secondaryText,
-rightIcon&&styles.secondaryTextGivenRightEl]},
+rightIcon&&styles.secondaryTextGivenRightEl],__source:{fileName:_jsxFileName,lineNumber:156}},
 
 secondaryText),
 
@@ -167,7 +167,7 @@ rightText&&
 _react2.default.createElement(_index.Caption,{
 numberOfLines:1,
 ellipsizeMode:'tail',
-css:styles.rightText},
+css:styles.rightText,__source:{fileName:_jsxFileName,lineNumber:167}},
 rightText),
 
 
@@ -181,7 +181,7 @@ rightText&&styles.rightIconGivenRightText],
 style:(0,_uranium.animate)(
 styles.expandIconCollapsed,
 styles.expandIconExpanded,
-this._expandIconAV)}),
+this._expandIconAV),__source:{fileName:_jsxFileName,lineNumber:175}}),
 
 
 rightIcon&&
@@ -190,12 +190,12 @@ _react2.default.createElement(_index.Icon,{
 name:rightIcon,
 css:[
 styles.rightIcon,
-rightText&&styles.rightIconGivenRightText]}):
+rightText&&styles.rightIconGivenRightText],__source:{fileName:_jsxFileName,lineNumber:189}}):
 
 _react2.default.createElement(_reactNative.View,{
 css:[
 styles.rightIcon,
-rightText&&styles.rightIconGivenRightText]},
+rightText&&styles.rightIconGivenRightText],__source:{fileName:_jsxFileName,lineNumber:195}},
 
 rightIcon))),
 
@@ -208,7 +208,7 @@ style:[
 styles.nestedList,
 (0,_uranium.animate)('maxHeight',0,childrenCount*72+40,this._expandHeightAV),
 (0,_uranium.animate)('opacity',0,1,this._expandOpacityAV),
-this.state.fullyExpanded&&{maxHeight:undefined}]},
+this.state.fullyExpanded&&{maxHeight:undefined}],__source:{fileName:_jsxFileName,lineNumber:206}},
 
 children)));
 
@@ -258,7 +258,7 @@ expanded:_propTypes2.default.bool,
 
 
 children:_propTypes2.default.node,
-style:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array]),
+style:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array,_propTypes2.default.number]),
 onPress:_propTypes2.default.func,
 
 
diff --git a/lib/components/NavigationDrawer.js b/lib/components/NavigationDrawer.js
index dfaf5fa..164af9b 100644
--- a/lib/components/NavigationDrawer.js
+++ b/lib/components/NavigationDrawer.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/NavigationDrawer.js';var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _reactNative=require('react-native');
 var _uranium=require('uranium');var _uranium2=_interopRequireDefault(_uranium);
@@ -80,13 +80,13 @@ _react2.default.createElement(_reactNative.View,{
 style:[
 styles.base,
 !this.state.shown&&styles.hidden,
-style]},
+style],__source:{fileName:_jsxFileName,lineNumber:79}},
 
-_react2.default.createElement(_reactNative.TouchableWithoutFeedback,{onPress:onOverlayPress},
+_react2.default.createElement(_reactNative.TouchableWithoutFeedback,{onPress:onOverlayPress,__source:{fileName:_jsxFileName,lineNumber:85}},
 _react2.default.createElement(_reactNative.Animated.View,{
 style:[
 styles.overlay,
-(0,_uranium.animate)('opacity',0,0.54,this._openAV)]})),
+(0,_uranium.animate)('opacity',0,0.54,this._openAV)],__source:{fileName:_jsxFileName,lineNumber:86}})),
 
 
 _react2.default.createElement(_reactNative.Animated.View,{
@@ -96,7 +96,7 @@ style:[
 
 
 this.state.fullyOpen&&styles.menuFullyOpen].
-concat(menuStyle)},
+concat(menuStyle),__source:{fileName:_jsxFileName,lineNumber:92}},
 children)));
 
 
@@ -109,11 +109,11 @@ NavigationDrawer.propTypes={
 
 
 open:_propTypes2.default.bool,
-style:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array]),
+style:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array,_propTypes2.default.number]),
 
 
 
-menuStyle:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array]),
+menuStyle:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array,_propTypes2.default.number]),
 
 
 
diff --git a/lib/components/Paper.js b/lib/components/Paper.js
index 6a2f538..9818526 100644
--- a/lib/components/Paper.js
+++ b/lib/components/Paper.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/Paper.js';var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _reactNative=require('react-native');
 
@@ -26,7 +26,7 @@ style:[
 styles.base,
 _index.Elevation['dp'+elevation]].
 concat(style)},
-other),
+other,{__source:{fileName:_jsxFileName,lineNumber:24}}),
 children));
 
 
diff --git a/lib/components/Snackbar.js b/lib/components/Snackbar.js
index 123491a..d165b73 100644
--- a/lib/components/Snackbar.js
+++ b/lib/components/Snackbar.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/Snackbar.js';var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _reactNative=require('react-native');
 var _uranium=require('uranium');
@@ -38,13 +38,13 @@ return(
 _react2.default.createElement(_reactNative.Animated.View,{
 style:[
 styles.base,
-(0,_uranium.animate)(styles.base,styles.shown,this._showAV)]},
+(0,_uranium.animate)(styles.base,styles.shown,this._showAV)],__source:{fileName:_jsxFileName,lineNumber:38}},
 
-_react2.default.createElement(_index.Body1,{style:styles.text},children),
+_react2.default.createElement(_index.Body1,{style:styles.text,__source:{fileName:_jsxFileName,lineNumber:43}},children),
 actionText&&
 _react2.default.createElement(_index.FlatButton,{
 style:styles.action,
-onPress:onPressAction},
+onPress:onPressAction,__source:{fileName:_jsxFileName,lineNumber:45}},
 actionText)));
 
 
diff --git a/lib/components/TextField.js b/lib/components/TextField.js
index 13dee48..a778369 100644
--- a/lib/components/TextField.js
+++ b/lib/components/TextField.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/TextField.js';var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _reactNative=require('react-native');
 var _color=require('color');var _color2=_interopRequireDefault(_color);
@@ -125,7 +125,7 @@ this.props,style=_props.style,textInputStyle=_props.textInputStyle,placeholderSt
 styles=this.styles;
 
 return(
-_react2.default.createElement(_reactNative.View,{style:[styles.base,style]},
+_react2.default.createElement(_reactNative.View,{style:[styles.base,style],__source:{fileName:_jsxFileName,lineNumber:128}},
 _react2.default.createElement(_reactNative.TextInput,_extends({
 ref:function ref(c){_this2._textInput=c;},
 css:[
@@ -138,7 +138,7 @@ selectionColor:(0,_color2.default)(theme.colors.accent).alpha(0.87).rgbString(),
 underlineColorAndroid:'transparent'},
 other,{
 onFocus:this.handleFocus,
-onBlur:this.handleBlur})),
+onBlur:this.handleBlur,__source:{fileName:_jsxFileName,lineNumber:129}})),
 _react2.default.createElement(_reactNative.Animated.Text,{
 css:[
 styles.placeholder,
@@ -166,7 +166,7 @@ styles.placeholderSingleLineFocus,
 this.singleLineLabelAV)],
 
 
-onPress:this.focusInput},
+onPress:this.focusInput,__source:{fileName:_jsxFileName,lineNumber:142}},
 placeholder),
 
 _react2.default.createElement(AnimatedDivider,{
@@ -178,8 +178,8 @@ theme.colors.divider,
 
 
 type:disabled&&'dotted',
-css:styles.divider}),
-_react2.default.createElement(_index.TextFieldError,null,error)));
+css:styles.divider,__source:{fileName:_jsxFileName,lineNumber:172}}),
+_react2.default.createElement(_index.TextFieldError,{__source:{fileName:_jsxFileName,lineNumber:182}},error)));
 
 
 }},{key:'styles',get:function get(){return styles(this.props.theme);}}]);return TextField;}(_react.Component);
@@ -209,11 +209,11 @@ singleLine:_propTypes2.default.bool,
 
 
 
-textInputStyle:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array]),
+textInputStyle:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array,_propTypes2.default.number]),
 
 
 
-placeholderStyle:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array]),
+placeholderStyle:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array,_propTypes2.default.number]),
 
 
 
@@ -225,7 +225,7 @@ theme:_propTypes2.default.object.isRequired,
 
 
 
-style:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array])};
+style:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array,_propTypes2.default.number])};
 
 
 TextField.defaultProps={
diff --git a/lib/components/TextFieldError.js b/lib/components/TextFieldError.js
index 5057dec..9f34150 100644
--- a/lib/components/TextFieldError.js
+++ b/lib/components/TextFieldError.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();exports.
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/TextFieldError.js';var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();exports.
 
 
 
@@ -76,7 +76,7 @@ style,
 (0,_uranium.animate)('opacity',this.styles.base,this.styles.shown,this.opacityAV)]},
 
 (0,_omit2.default)(other,'children','theme'),{
-onLayout:this._setWidth}),
+onLayout:this._setWidth,__source:{fileName:_jsxFileName,lineNumber:70}}),
 this.state.text));
 
 
diff --git a/lib/components/TouchableRipple.js b/lib/components/TouchableRipple.js
index c9f4349..40c44ba 100644
--- a/lib/components/TouchableRipple.js
+++ b/lib/components/TouchableRipple.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};
+Object.defineProperty(exports,"__esModule",{value:true});var _jsxFileName='src/components/TouchableRipple.js';var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};
 
 var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _createReactClass=require('create-react-class');var _createReactClass2=_interopRequireDefault(_createReactClass);
@@ -41,7 +41,7 @@ var PRESS_RETENTION_OFFSET={top:20,left:20,right:20,bottom:30};
 
 
 
-var TouchableRipple=(0,_createReactClass2.default)({
+var TouchableRipple=(0,_createReactClass2.default)({displayName:'TouchableRipple',
 propTypes:_extends({},
 _reactNative.TouchableWithoutFeedback.propTypes,{
 
@@ -72,7 +72,7 @@ rippleCentered:_propTypes2.default.bool,
 
 
 children:_propTypes2.default.node,
-style:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array])}),
+style:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array,_propTypes2.default.number])}),
 
 
 mixins:[_reactNative.Touchable.Mixin],
@@ -247,8 +247,8 @@ background:_reactNative.TouchableNativeFeedback.Ripple(
 mergedStyle&&mergedStyle.overflow==='visible'),
 
 disabled:disabled},
-other),
-_react2.default.createElement(_reactNative.View,{style:style},
+other,{__source:{fileName:_jsxFileName,lineNumber:244}}),
+_react2.default.createElement(_reactNative.View,{style:style,__source:{fileName:_jsxFileName,lineNumber:251}},
 children)));
 
 
@@ -272,7 +272,7 @@ onResponderGrant:this.touchableHandleResponderGrant,
 onResponderMove:this.touchableHandleResponderMove,
 onResponderRelease:this.touchableHandleResponderRelease,
 onResponderTerminate:this.touchableHandleResponderTerminate},
-(0,_omit2.default)(other,Object.keys(TouchableRipple.propTypes))),
+(0,_omit2.default)(other,Object.keys(TouchableRipple.propTypes)),{__source:{fileName:_jsxFileName,lineNumber:259}}),
 children,
 
 this.state.ripples.map(function(ripple,i){return(
@@ -301,7 +301,7 @@ borderRadius:ripple.size/2,
 
 backgroundColor:rippleColor,
 
-opacity:ripple.opacity}}));})));
+opacity:ripple.opacity},__source:{fileName:_jsxFileName,lineNumber:279}}));})));
 
 
 
diff --git a/lib/components/Type.js b/lib/components/Type.js
index c65d8b1..2e0aed0 100644
--- a/lib/components/Type.js
+++ b/lib/components/Type.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});exports.Caption=exports.Body1=exports.Body2=exports.Subheading=exports.Title=exports.Headline=exports.Display1=exports.Display2=exports.Display3=exports.Display4=undefined;var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();
+Object.defineProperty(exports,"__esModule",{value:true});exports.Caption=exports.Body1=exports.Body2=exports.Subheading=exports.Title=exports.Headline=exports.Display1=exports.Display2=exports.Display3=exports.Display4=undefined;var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/Type.js';var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();
 
 var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
@@ -13,7 +13,7 @@ var _index=require('../index');function _interopRequireDefault(obj){return obj&&
 Display4=function(_Component){_inherits(Display4,_Component);function Display4(){_classCallCheck(this,Display4);return _possibleConstructorReturn(this,(Display4.__proto__||Object.getPrototypeOf(Display4)).apply(this,arguments));}_createClass(Display4,[{key:'render',value:function render()
 {var _props=
 this.props,children=_props.children,style=_props.style,theme=_props.theme,other=_objectWithoutProperties(_props,['children','style','theme']);
-return _react2.default.createElement(_reactNative.Text,_extends({style:[theme.type.display4,style]},other),children);
+return _react2.default.createElement(_reactNative.Text,_extends({style:[theme.type.display4,style]},other,{__source:{fileName:_jsxFileName,lineNumber:16}}),children);
 }}]);return Display4;}(_react.Component);
 
 
@@ -22,7 +22,7 @@ var ThemedDisplay4=(0,_index.connectTheme)(Display4);var
 Display3=function(_Component2){_inherits(Display3,_Component2);function Display3(){_classCallCheck(this,Display3);return _possibleConstructorReturn(this,(Display3.__proto__||Object.getPrototypeOf(Display3)).apply(this,arguments));}_createClass(Display3,[{key:'render',value:function render()
 {var _props2=
 this.props,children=_props2.children,style=_props2.style,theme=_props2.theme,other=_objectWithoutProperties(_props2,['children','style','theme']);
-return _react2.default.createElement(_reactNative.Text,_extends({style:[theme.type.display3,style]},other),children);
+return _react2.default.createElement(_reactNative.Text,_extends({style:[theme.type.display3,style]},other,{__source:{fileName:_jsxFileName,lineNumber:25}}),children);
 }}]);return Display3;}(_react.Component);
 
 
@@ -31,7 +31,7 @@ var ThemedDisplay3=(0,_index.connectTheme)(Display3);var
 Display2=function(_Component3){_inherits(Display2,_Component3);function Display2(){_classCallCheck(this,Display2);return _possibleConstructorReturn(this,(Display2.__proto__||Object.getPrototypeOf(Display2)).apply(this,arguments));}_createClass(Display2,[{key:'render',value:function render()
 {var _props3=
 this.props,children=_props3.children,style=_props3.style,theme=_props3.theme,other=_objectWithoutProperties(_props3,['children','style','theme']);
-return _react2.default.createElement(_reactNative.Text,_extends({style:[theme.type.display2,style]},other),children);
+return _react2.default.createElement(_reactNative.Text,_extends({style:[theme.type.display2,style]},other,{__source:{fileName:_jsxFileName,lineNumber:34}}),children);
 }}]);return Display2;}(_react.Component);
 
 
@@ -40,7 +40,7 @@ var ThemedDisplay2=(0,_index.connectTheme)(Display2);var
 Display1=function(_Component4){_inherits(Display1,_Component4);function Display1(){_classCallCheck(this,Display1);return _possibleConstructorReturn(this,(Display1.__proto__||Object.getPrototypeOf(Display1)).apply(this,arguments));}_createClass(Display1,[{key:'render',value:function render()
 {var _props4=
 this.props,children=_props4.children,style=_props4.style,theme=_props4.theme,other=_objectWithoutProperties(_props4,['children','style','theme']);
-return _react2.default.createElement(_reactNative.Text,_extends({style:[theme.type.display1,style]},other),children);
+return _react2.default.createElement(_reactNative.Text,_extends({style:[theme.type.display1,style]},other,{__source:{fileName:_jsxFileName,lineNumber:43}}),children);
 }}]);return Display1;}(_react.Component);
 
 
@@ -49,7 +49,7 @@ var ThemedDisplay1=(0,_index.connectTheme)(Display1);var
 Headline=function(_Component5){_inherits(Headline,_Component5);function Headline(){_classCallCheck(this,Headline);return _possibleConstructorReturn(this,(Headline.__proto__||Object.getPrototypeOf(Headline)).apply(this,arguments));}_createClass(Headline,[{key:'render',value:function render()
 {var _props5=
 this.props,children=_props5.children,style=_props5.style,theme=_props5.theme,other=_objectWithoutProperties(_props5,['children','style','theme']);
-return _react2.default.createElement(_reactNative.Text,_extends({style:[theme.type.headline,style]},other),children);
+return _react2.default.createElement(_reactNative.Text,_extends({style:[theme.type.headline,style]},other,{__source:{fileName:_jsxFileName,lineNumber:52}}),children);
 }}]);return Headline;}(_react.Component);
 
 
@@ -58,7 +58,7 @@ var ThemedHeadline=(0,_index.connectTheme)(Headline);var
 Title=function(_Component6){_inherits(Title,_Component6);function Title(){_classCallCheck(this,Title);return _possibleConstructorReturn(this,(Title.__proto__||Object.getPrototypeOf(Title)).apply(this,arguments));}_createClass(Title,[{key:'render',value:function render()
 {var _props6=
 this.props,children=_props6.children,style=_props6.style,theme=_props6.theme,other=_objectWithoutProperties(_props6,['children','style','theme']);
-return _react2.default.createElement(_reactNative.Text,_extends({style:[theme.type.title,style]},other),children);
+return _react2.default.createElement(_reactNative.Text,_extends({style:[theme.type.title,style]},other,{__source:{fileName:_jsxFileName,lineNumber:61}}),children);
 }}]);return Title;}(_react.Component);
 
 
@@ -67,7 +67,7 @@ var ThemedTitle=(0,_index.connectTheme)(Title);var
 Subheading=function(_Component7){_inherits(Subheading,_Component7);function Subheading(){_classCallCheck(this,Subheading);return _possibleConstructorReturn(this,(Subheading.__proto__||Object.getPrototypeOf(Subheading)).apply(this,arguments));}_createClass(Subheading,[{key:'render',value:function render()
 {var _props7=
 this.props,children=_props7.children,css=_props7.css,theme=_props7.theme,other=_objectWithoutProperties(_props7,['children','css','theme']);
-return _react2.default.createElement(_reactNative.Text,_extends({css:[theme.type.subheading,css]},other),children);
+return _react2.default.createElement(_reactNative.Text,_extends({css:[theme.type.subheading,css]},other,{__source:{fileName:_jsxFileName,lineNumber:70}}),children);
 }}]);return Subheading;}(_react.Component);
 
 
@@ -76,7 +76,7 @@ var ThemedSubheading=(0,_index.connectTheme)((0,_uranium2.default)(Subheading));
 Body2=function(_Component8){_inherits(Body2,_Component8);function Body2(){_classCallCheck(this,Body2);return _possibleConstructorReturn(this,(Body2.__proto__||Object.getPrototypeOf(Body2)).apply(this,arguments));}_createClass(Body2,[{key:'render',value:function render()
 {var _props8=
 this.props,children=_props8.children,css=_props8.css,theme=_props8.theme,other=_objectWithoutProperties(_props8,['children','css','theme']);
-return _react2.default.createElement(_reactNative.Text,_extends({css:[theme.type.body2,css]},other),children);
+return _react2.default.createElement(_reactNative.Text,_extends({css:[theme.type.body2,css]},other,{__source:{fileName:_jsxFileName,lineNumber:79}}),children);
 }}]);return Body2;}(_react.Component);
 
 
@@ -85,7 +85,7 @@ var ThemedBody2=(0,_index.connectTheme)((0,_uranium2.default)(Body2));var
 Body1=function(_Component9){_inherits(Body1,_Component9);function Body1(){_classCallCheck(this,Body1);return _possibleConstructorReturn(this,(Body1.__proto__||Object.getPrototypeOf(Body1)).apply(this,arguments));}_createClass(Body1,[{key:'render',value:function render()
 {var _props9=
 this.props,children=_props9.children,css=_props9.css,theme=_props9.theme,other=_objectWithoutProperties(_props9,['children','css','theme']);
-return _react2.default.createElement(_reactNative.Text,_extends({css:[theme.type.body1,css]},other),children);
+return _react2.default.createElement(_reactNative.Text,_extends({css:[theme.type.body1,css]},other,{__source:{fileName:_jsxFileName,lineNumber:88}}),children);
 }}]);return Body1;}(_react.Component);
 
 
@@ -94,7 +94,7 @@ var ThemedBody1=(0,_index.connectTheme)((0,_uranium2.default)(Body1));var
 Caption=function(_Component10){_inherits(Caption,_Component10);function Caption(){_classCallCheck(this,Caption);return _possibleConstructorReturn(this,(Caption.__proto__||Object.getPrototypeOf(Caption)).apply(this,arguments));}_createClass(Caption,[{key:'render',value:function render()
 {var _props10=
 this.props,children=_props10.children,style=_props10.style,theme=_props10.theme,other=_objectWithoutProperties(_props10,['children','style','theme']);
-return _react2.default.createElement(_reactNative.Text,_extends({style:[theme.type.caption,style]},other),children);
+return _react2.default.createElement(_reactNative.Text,_extends({style:[theme.type.caption,style]},other,{__source:{fileName:_jsxFileName,lineNumber:97}}),children);
 }}]);return Caption;}(_react.Component);
 
 
diff --git a/lib/components/buttons/FlatButton.js b/lib/components/buttons/FlatButton.js
index 25ab690..04997d0 100644
--- a/lib/components/buttons/FlatButton.js
+++ b/lib/components/buttons/FlatButton.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/buttons/FlatButton.js';var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _uranium=require('uranium');var _uranium2=_interopRequireDefault(_uranium);
 
@@ -44,7 +44,7 @@ _react2.default.createElement(_index.Body2,{
 style:[
 styles.text,
 disabled&&styles.disabledText,
-textStyle]},
+textStyle],__source:{fileName:_jsxFileName,lineNumber:43}},
 children.toUpperCase()):
 children;
 
@@ -53,7 +53,7 @@ _react2.default.createElement(_index.TouchableRipple,_extends({
 hitSlop:{top:6,right:6,bottom:6,left:6},
 css:[styles.base,disabled&&styles.disabled],
 disabled:disabled},
-other),
+other,{__source:{fileName:_jsxFileName,lineNumber:52}}),
 formattedChildren));
 
 
@@ -73,7 +73,7 @@ css:_propTypes2.default.object,
 
 
 
-textStyle:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array]),
+textStyle:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array,_propTypes2.default.number]),
 
 
 theme:_propTypes2.default.object.isRequired};
diff --git a/lib/components/buttons/FloatingActionButton.js b/lib/components/buttons/FloatingActionButton.js
index d6953ec..bde35d8 100644
--- a/lib/components/buttons/FloatingActionButton.js
+++ b/lib/components/buttons/FloatingActionButton.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/buttons/FloatingActionButton.js';var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _reactNative=require('react-native');
 var _uranium=require('uranium');
@@ -58,13 +58,13 @@ style:[
 styles.base,
 (0,_uranium.animate)(styles.base,styles.pressed,this._pressAV),
 accent&&{backgroundColor:theme.colors.accent}].
-concat(style)},
+concat(style),__source:{fileName:_jsxFileName,lineNumber:56}},
 _react2.default.createElement(TouchableComponent,_extends({
 rippleColor:'white'},
 other,{
 style:styles.touchableRipple,
 onPressIn:this._setPressed,
-onPressOut:this._setNotPressed}),
+onPressOut:this._setNotPressed,__source:{fileName:_jsxFileName,lineNumber:62}}),
 children)));
 
 
@@ -82,7 +82,7 @@ accent:_propTypes2.default.bool,
 
 
 children:_propTypes2.default.node,
-style:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array]),
+style:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array,_propTypes2.default.number]),
 onPressIn:_propTypes2.default.func,
 onPressOut:_propTypes2.default.func,
 
diff --git a/lib/components/buttons/IconToggle.js b/lib/components/buttons/IconToggle.js
index 32c9229..731b835 100644
--- a/lib/components/buttons/IconToggle.js
+++ b/lib/components/buttons/IconToggle.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/buttons/IconToggle.js';var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _index=require('../../index');function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _objectWithoutProperties(obj,keys){var target={};for(var i in obj){if(keys.indexOf(i)>=0)continue;if(!Object.prototype.hasOwnProperty.call(obj,i))continue;target[i]=obj[i];}return target;}
 
@@ -29,8 +29,8 @@ _react2.default.createElement(_index.TouchableRipple,_extends({
 rippleCentered:true,
 rippleSpread:0.34,
 style:[styles.base].concat(style)},
-other),
-_react2.default.createElement(_index.Icon,{name:name,style:iconStyle})));
+other,{__source:{fileName:_jsxFileName,lineNumber:28}}),
+_react2.default.createElement(_index.Icon,{name:name,style:iconStyle,__source:{fileName:_jsxFileName,lineNumber:33}})));
 
 
 };
@@ -44,7 +44,7 @@ name:_propTypes2.default.string.isRequired,
 
 
 
-style:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array]),
+style:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array,_propTypes2.default.number]),
 
 
 
diff --git a/lib/components/buttons/RaisedButton.js b/lib/components/buttons/RaisedButton.js
index f0d2e72..2229a78 100644
--- a/lib/components/buttons/RaisedButton.js
+++ b/lib/components/buttons/RaisedButton.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/components/buttons/RaisedButton.js';var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 var _uranium=require('uranium');var _uranium2=_interopRequireDefault(_uranium);
 var _color=require('color');var _color2=_interopRequireDefault(_color);
@@ -50,7 +50,7 @@ _react2.default.createElement(_index.Body2,{
 style:[
 styles.text,
 disabled&&styles.disabledText,
-textStyle]},
+textStyle],__source:{fileName:_jsxFileName,lineNumber:49}},
 
 children.toUpperCase()):
 
@@ -62,7 +62,7 @@ hitSlop:{top:6,right:6,bottom:6,left:6},
 css:[styles.base,disabled&&styles.disabled],
 rippleColor:_index.Colors.white,
 disabled:disabled},
-other),
+other,{__source:{fileName:_jsxFileName,lineNumber:60}}),
 formattedChildren));
 
 
@@ -81,7 +81,7 @@ children:_propTypes2.default.node,
 
 
 
-textStyle:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array]),
+textStyle:_propTypes2.default.oneOfType([_propTypes2.default.object,_propTypes2.default.array,_propTypes2.default.number]),
 
 
 theme:_propTypes2.default.object.isRequired};
diff --git a/lib/style/WebStyles.js b/lib/style/WebStyles.js
index cecbe9d..9c654ab 100644
--- a/lib/style/WebStyles.js
+++ b/lib/style/WebStyles.js
@@ -1,4 +1,4 @@
-Object.defineProperty(exports,"__esModule",{value:true});
+Object.defineProperty(exports,"__esModule",{value:true});var _jsxFileName='src/style/WebStyles.js';
 
 var _react=require('react');var _react2=_interopRequireDefault(_react);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}exports.default=
 
@@ -10,4 +10,4 @@ var _react=require('react');var _react2=_interopRequireDefault(_react);function
 
 function(){return(
 _react2.default.createElement('style',{
-dangerouslySetInnerHTML:{__html:'\n      @font-face {\n        font-family: \'Roboto-Thin\';\n        src: local(\'Roboto Thin\'), local(\'Roboto-Thin\'), url(https://fonts.gstatic.com/s/roboto/v15/vzIUHo9z-oJ4WgkpPOtg13YhjbSpvc47ee6xR_80Hnw.woff) format(\'woff\');\n      }\n      @font-face {\n        font-family: \'Roboto-Light\';\n        src: local(\'Roboto Light\'), local(\'Roboto-Light\'), url(https://fonts.gstatic.com/s/roboto/v15/Hgo13k-tfSpn0qi1SFdUfbO3LdcAZYWl9Si6vvxL-qU.woff) format(\'woff\');\n      }\n      @font-face {\n        font-family: \'Roboto-Regular\';\n        src: local(\'Roboto\'), local(\'Roboto-Regular\'), url(https://fonts.gstatic.com/s/roboto/v15/CrYjSnGjrRCn0pd9VQsnFOvvDin1pK8aKteLpeZ5c0A.woff) format(\'woff\');\n      }\n      @font-face {\n        font-family: \'Roboto-Medium\';\n        src: local(\'Roboto Medium\'), local(\'Roboto-Medium\'), url(https://fonts.gstatic.com/s/roboto/v15/RxZJdnzeo3R5zSexge8UUbO3LdcAZYWl9Si6vvxL-qU.woff) format(\'woff\');\n      }\n      @font-face {\n        font-family: \'Roboto-Bold\';\n        src: local(\'Roboto Bold\'), local(\'Roboto-Bold\'), url(https://fonts.gstatic.com/s/roboto/v15/d-6IYplOFocCacKzxwXSOLO3LdcAZYWl9Si6vvxL-qU.woff) format(\'woff\');\n      }\n      @font-face {\n        font-family: \'Roboto-Black\';\n        src: local(\'Roboto Black\'), local(\'Roboto-Black\'), url(https://fonts.gstatic.com/s/roboto/v15/mnpfi9pxYH-Go5UiibESIrO3LdcAZYWl9Si6vvxL-qU.woff) format(\'woff\');\n      }\n      @font-face {\n        font-family: \'Roboto-ThinItalic\';\n        src: local(\'Roboto Thin Italic\'), local(\'Roboto-ThinItalic\'), url(https://fonts.gstatic.com/s/roboto/v15/12mE4jfMSBTmg-81EiS-Yb3hpw3pgy2gAi-Ip7WPMi0.woff) format(\'woff\');\n      }\n      @font-face {\n        font-family: \'Roboto-LightItalic\';\n        src: local(\'Roboto Light Italic\'), local(\'Roboto-LightItalic\'), url(https://fonts.gstatic.com/s/roboto/v15/7m8l7TlFO-S3VkhHuR0at7rIa-7acMAeDBVuclsi6Gc.woff) format(\'woff\');\n      }\n      @font-face {\n        font-family: \'Roboto-Italic\';\n        src: local(\'Roboto Italic\'), local(\'Roboto-Italic\'), url(https://fonts.gstatic.com/s/roboto/v15/1pO9eUAp8pSF8VnRTP3xnnYhjbSpvc47ee6xR_80Hnw.woff) format(\'woff\');\n      }\n      @font-face {\n        font-family: \'Roboto-MediumItalic\';\n        src: local(\'Roboto Medium Italic\'), local(\'Roboto-MediumItalic\'), url(https://fonts.gstatic.com/s/roboto/v15/OLffGBTaF0XFOW1gnuHF0brIa-7acMAeDBVuclsi6Gc.woff) format(\'woff\');\n      }\n      @font-face {\n        font-family: \'Roboto-BoldItalic\';\n        src: local(\'Roboto Bold Italic\'), local(\'Roboto-BoldItalic\'), url(https://fonts.gstatic.com/s/roboto/v15/t6Nd4cfPRhZP44Q5QAjcC7rIa-7acMAeDBVuclsi6Gc.woff) format(\'woff\');\n      }\n      @font-face {\n        font-family: \'Roboto-BlackItalic\';\n        src: local(\'Roboto Black Italic\'), local(\'Roboto-BlackItalic\'), url(https://fonts.gstatic.com/s/roboto/v15/bmC0pGMXrhphrZJmniIZpbrIa-7acMAeDBVuclsi6Gc.woff) format(\'woff\');\n      }\n\n      @font-face {\n        font-family: \'MaterialIcons-Regular\';\n        src: local(\'Material Icons\'), local(\'MaterialIcons-Regular\'), url(https://fonts.gstatic.com/s/materialicons/v14/2fcrYFNaTjcS6g4U3t-Y5RV6cRhDpPC5P4GCEJpqGoc.woff) format(\'woff\');\n      }\n\n      @font-face {\n        font-family: \'RobotoMono-Regular\';\n        src: local(\'Roboto Mono\'), local(\'RobotoMono-Regular\'), url(https://fonts.gstatic.com/s/robotomono/v4/hMqPNLsu_dywMa4C_DEpY7rIa-7acMAeDBVuclsi6Gc.woff) format(\'woff\');\n      }\n      '}}));};
\ No newline at end of file
+dangerouslySetInnerHTML:{__html:'\n      @font-face {\n        font-family: \'Roboto-Thin\';\n        src: local(\'Roboto Thin\'), local(\'Roboto-Thin\'), url(https://fonts.gstatic.com/s/roboto/v15/vzIUHo9z-oJ4WgkpPOtg13YhjbSpvc47ee6xR_80Hnw.woff) format(\'woff\');\n      }\n      @font-face {\n        font-family: \'Roboto-Light\';\n        src: local(\'Roboto Light\'), local(\'Roboto-Light\'), url(https://fonts.gstatic.com/s/roboto/v15/Hgo13k-tfSpn0qi1SFdUfbO3LdcAZYWl9Si6vvxL-qU.woff) format(\'woff\');\n      }\n      @font-face {\n        font-family: \'Roboto-Regular\';\n        src: local(\'Roboto\'), local(\'Roboto-Regular\'), url(https://fonts.gstatic.com/s/roboto/v15/CrYjSnGjrRCn0pd9VQsnFOvvDin1pK8aKteLpeZ5c0A.woff) format(\'woff\');\n      }\n      @font-face {\n        font-family: \'Roboto-Medium\';\n        src: local(\'Roboto Medium\'), local(\'Roboto-Medium\'), url(https://fonts.gstatic.com/s/roboto/v15/RxZJdnzeo3R5zSexge8UUbO3LdcAZYWl9Si6vvxL-qU.woff) format(\'woff\');\n      }\n      @font-face {\n        font-family: \'Roboto-Bold\';\n        src: local(\'Roboto Bold\'), local(\'Roboto-Bold\'), url(https://fonts.gstatic.com/s/roboto/v15/d-6IYplOFocCacKzxwXSOLO3LdcAZYWl9Si6vvxL-qU.woff) format(\'woff\');\n      }\n      @font-face {\n        font-family: \'Roboto-Black\';\n        src: local(\'Roboto Black\'), local(\'Roboto-Black\'), url(https://fonts.gstatic.com/s/roboto/v15/mnpfi9pxYH-Go5UiibESIrO3LdcAZYWl9Si6vvxL-qU.woff) format(\'woff\');\n      }\n      @font-face {\n        font-family: \'Roboto-ThinItalic\';\n        src: local(\'Roboto Thin Italic\'), local(\'Roboto-ThinItalic\'), url(https://fonts.gstatic.com/s/roboto/v15/12mE4jfMSBTmg-81EiS-Yb3hpw3pgy2gAi-Ip7WPMi0.woff) format(\'woff\');\n      }\n      @font-face {\n        font-family: \'Roboto-LightItalic\';\n        src: local(\'Roboto Light Italic\'), local(\'Roboto-LightItalic\'), url(https://fonts.gstatic.com/s/roboto/v15/7m8l7TlFO-S3VkhHuR0at7rIa-7acMAeDBVuclsi6Gc.woff) format(\'woff\');\n      }\n      @font-face {\n        font-family: \'Roboto-Italic\';\n        src: local(\'Roboto Italic\'), local(\'Roboto-Italic\'), url(https://fonts.gstatic.com/s/roboto/v15/1pO9eUAp8pSF8VnRTP3xnnYhjbSpvc47ee6xR_80Hnw.woff) format(\'woff\');\n      }\n      @font-face {\n        font-family: \'Roboto-MediumItalic\';\n        src: local(\'Roboto Medium Italic\'), local(\'Roboto-MediumItalic\'), url(https://fonts.gstatic.com/s/roboto/v15/OLffGBTaF0XFOW1gnuHF0brIa-7acMAeDBVuclsi6Gc.woff) format(\'woff\');\n      }\n      @font-face {\n        font-family: \'Roboto-BoldItalic\';\n        src: local(\'Roboto Bold Italic\'), local(\'Roboto-BoldItalic\'), url(https://fonts.gstatic.com/s/roboto/v15/t6Nd4cfPRhZP44Q5QAjcC7rIa-7acMAeDBVuclsi6Gc.woff) format(\'woff\');\n      }\n      @font-face {\n        font-family: \'Roboto-BlackItalic\';\n        src: local(\'Roboto Black Italic\'), local(\'Roboto-BlackItalic\'), url(https://fonts.gstatic.com/s/roboto/v15/bmC0pGMXrhphrZJmniIZpbrIa-7acMAeDBVuclsi6Gc.woff) format(\'woff\');\n      }\n\n      @font-face {\n        font-family: \'MaterialIcons-Regular\';\n        src: local(\'Material Icons\'), local(\'MaterialIcons-Regular\'), url(https://fonts.gstatic.com/s/materialicons/v14/2fcrYFNaTjcS6g4U3t-Y5RV6cRhDpPC5P4GCEJpqGoc.woff) format(\'woff\');\n      }\n\n      @font-face {\n        font-family: \'RobotoMono-Regular\';\n        src: local(\'Roboto Mono\'), local(\'RobotoMono-Regular\'), url(https://fonts.gstatic.com/s/robotomono/v4/hMqPNLsu_dywMa4C_DEpY7rIa-7acMAeDBVuclsi6Gc.woff) format(\'woff\');\n      }\n      '},__source:{fileName:_jsxFileName,lineNumber:12}}));};
\ No newline at end of file
diff --git a/lib/theme/connectTheme.js b/lib/theme/connectTheme.js
index c44c876..cc0ba80 100644
--- a/lib/theme/connectTheme.js
+++ b/lib/theme/connectTheme.js
@@ -1,6 +1,7 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='src/theme/connectTheme.js';var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
-var _index=require('../index');function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}exports.default=
+var _merge=require('lodash/merge');var _merge2=_interopRequireDefault(_merge);
+var _index=require('../index');function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _objectWithoutProperties(obj,keys){var target={};for(var i in obj){if(keys.indexOf(i)>=0)continue;if(!Object.prototype.hasOwnProperty.call(obj,i))continue;target[i]=obj[i];}return target;}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}exports.default=
 
 function(component){
 var WrappedComponent=component;
@@ -17,27 +18,26 @@ return component(this.props,this.context);
 ConnectTheme=function(_Component2){_inherits(ConnectTheme,_Component2);function ConnectTheme(){var _ref;var _temp,_this2,_ret;_classCallCheck(this,ConnectTheme);for(var _len=arguments.length,args=Array(_len),_key=0;_key<_len;_key++){args[_key]=arguments[_key];}return _ret=(_temp=(_this2=_possibleConstructorReturn(this,(_ref=ConnectTheme.__proto__||Object.getPrototypeOf(ConnectTheme)).call.apply(_ref,[this].concat(args))),_this2),_this2.
 _node=null,_temp),_possibleConstructorReturn(_this2,_ret);}_createClass(ConnectTheme,[{key:'render',value:function render()
 
-{var _this3=this;
+{var _this3=this;var _props=
+this.props,mergeTheme=_props.mergeTheme,rest=_objectWithoutProperties(_props,['mergeTheme']);
 return(
 _react2.default.createElement(WrappedComponent,_extends({},
-this.props,{
+rest,{
 ref:function ref(c){_this3._node=c;},
-theme:this.context.theme||_index.themes.light})));
+theme:(0,_merge2.default)(this.context.theme||_index.themes.light,mergeTheme||{}),__source:{fileName:_jsxFileName,lineNumber:24}})));
 
 }}]);return ConnectTheme;}(_react.Component);
 
 
-ConnectTheme.displayName='ConnectTheme('+(
-_react.Component.displayName||_react.Component.name||'Component')+')';
+ConnectTheme.propTypes={
+mergeTheme:_propTypes2.default.object};
 
-ConnectTheme.contextTypes=_extends({},
-ConnectTheme.contextTypes,{
-theme:_propTypes2.default.object});
 
+ConnectTheme.displayName='ConnectTheme('+(
+_react.Component.displayName||_react.Component.name||'Component')+')';
 
-ConnectTheme.childContextTypes=_extends({},
-ConnectTheme.childContextTypes,{
-theme:_propTypes2.default.object});
+ConnectTheme.contextTypes={
+theme:_propTypes2.default.object};
 
 
 return ConnectTheme;
diff --git a/package.json b/package.json
index 2153fd5..b55917f 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,6 @@
   },
   "peerDependencies": {
     "prop-types": "^15.5.10",
-    "react": "^15.6.1"
+    "react": "^16.0.0"
   }
 }
diff --git a/src/components/DataTable/Cell.js b/src/components/DataTable/Cell.js
index fd0f8d0..a764891 100644
--- a/src/components/DataTable/Cell.js
+++ b/src/components/DataTable/Cell.js
@@ -17,7 +17,7 @@ const Cell = ({ children, style, ...other }) => {
 
 Cell.propTypes = {
   children: PropTypes.node,
-  style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+  style: PropTypes.oneOfType([PropTypes.object, PropTypes.array, PropTypes.number]),
 }
 
 export default Cell
diff --git a/src/components/DataTable/HeaderCell.js b/src/components/DataTable/HeaderCell.js
index c0f13b0..45d40a3 100644
--- a/src/components/DataTable/HeaderCell.js
+++ b/src/components/DataTable/HeaderCell.js
@@ -17,7 +17,7 @@ const HeaderCell = ({ children, style, ...other }) => {
 
 HeaderCell.propTypes = {
   children: PropTypes.node,
-  style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+  style: PropTypes.oneOfType([PropTypes.object, PropTypes.array, PropTypes.number]),
 }
 
 export default HeaderCell
diff --git a/src/components/Dialog.js b/src/components/Dialog.js
index 0eb8950..3faa8b6 100644
--- a/src/components/Dialog.js
+++ b/src/components/Dialog.js
@@ -104,7 +104,7 @@ Dialog.propTypes = {
    * The contents of the dialog
    */
   children: PropTypes.node.isRequired,
-  style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+  style: PropTypes.oneOfType([PropTypes.object, PropTypes.array, PropTypes.number]),
 }
 
 Dialog.defaultProps = {
diff --git a/src/components/Icon.js b/src/components/Icon.js
index 2bf5831..b30a744 100644
--- a/src/components/Icon.js
+++ b/src/components/Icon.js
@@ -56,7 +56,7 @@ Icon.propTypes = {
   name: PropTypes.string.isRequired,
 
   children: PropTypes.node,
-  style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+  style: PropTypes.oneOfType([PropTypes.object, PropTypes.array, PropTypes.number]),
 }
 
 export default Icon
diff --git a/src/components/ListItem.js b/src/components/ListItem.js
index afd6bca..9c8f004 100644
--- a/src/components/ListItem.js
+++ b/src/components/ListItem.js
@@ -258,7 +258,7 @@ ListItem.propTypes = {
    * and expandable.
    */
   children: PropTypes.node,
-  style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+  style: PropTypes.oneOfType([PropTypes.object, PropTypes.array, PropTypes.number]),
   onPress: PropTypes.func,
 
   // connectTheme
diff --git a/src/components/NavigationDrawer.js b/src/components/NavigationDrawer.js
index 675d68b..70eea4a 100644
--- a/src/components/NavigationDrawer.js
+++ b/src/components/NavigationDrawer.js
@@ -109,11 +109,11 @@ NavigationDrawer.propTypes = {
    * Will open the drawer if set to true.
    */
   open: PropTypes.bool,
-  style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+  style: PropTypes.oneOfType([PropTypes.object, PropTypes.array, PropTypes.number]),
   /**
    * The style of the menu.
    */
-  menuStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+  menuStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array, PropTypes.number]),
   /**
    * Callback for when the overlay is pressed
    */
diff --git a/src/components/TextField.js b/src/components/TextField.js
index fc55684..450f8f4 100644
--- a/src/components/TextField.js
+++ b/src/components/TextField.js
@@ -209,11 +209,11 @@ TextField.propTypes = {
   /**
    * The style passed to the React Native TextInput
    */
-  textInputStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+  textInputStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array, PropTypes.number]),
   /**
    * The style passed to the placeholder.
    */
-  placeholderStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+  placeholderStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array, PropTypes.number]),
   /**
    * Passed through to the underlying TextInput.
    */
@@ -225,7 +225,7 @@ TextField.propTypes = {
   /**
    * The style of the containing View.
    */
-  style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+  style: PropTypes.oneOfType([PropTypes.object, PropTypes.array, PropTypes.number]),
 }
 
 TextField.defaultProps = {
diff --git a/src/components/TouchableRipple.js b/src/components/TouchableRipple.js
index 58f577d..910fe5b 100644
--- a/src/components/TouchableRipple.js
+++ b/src/components/TouchableRipple.js
@@ -72,7 +72,7 @@ const TouchableRipple = createReactClass({
      * a single element.
      */
     children: PropTypes.node,
-    style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+    style: PropTypes.oneOfType([PropTypes.object, PropTypes.array, PropTypes.number]),
   },
 
   mixins: [Touchable.Mixin],
diff --git a/src/components/buttons/FlatButton.js b/src/components/buttons/FlatButton.js
index 8c29498..7383fc5 100644
--- a/src/components/buttons/FlatButton.js
+++ b/src/components/buttons/FlatButton.js
@@ -73,7 +73,7 @@ Button.propTypes = {
   /**
    * The style of the button text. Only applies if props.children isn't passed.
    */
-  textStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+  textStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array, PropTypes.number]),
 
   // connectTheme
   theme: PropTypes.object.isRequired,
diff --git a/src/components/buttons/FloatingActionButton.js b/src/components/buttons/FloatingActionButton.js
index ffc5cde..bca35ae 100644
--- a/src/components/buttons/FloatingActionButton.js
+++ b/src/components/buttons/FloatingActionButton.js
@@ -82,7 +82,7 @@ FloatingActionButton.propTypes = {
    * Usually an <Icon />
    */
   children: PropTypes.node,
-  style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+  style: PropTypes.oneOfType([PropTypes.object, PropTypes.array, PropTypes.number]),
   onPressIn: PropTypes.func,
   onPressOut: PropTypes.func,
 
diff --git a/src/components/buttons/IconToggle.js b/src/components/buttons/IconToggle.js
index 6611d1b..39bb096 100644
--- a/src/components/buttons/IconToggle.js
+++ b/src/components/buttons/IconToggle.js
@@ -44,7 +44,7 @@ IconToggle.propTypes = {
   /**
    * The style of the containing TouchableRipple (which is a View)
    */
-  style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+  style: PropTypes.oneOfType([PropTypes.object, PropTypes.array, PropTypes.number]),
   /**
    * The style of the Icon element
    */
diff --git a/src/components/buttons/RaisedButton.js b/src/components/buttons/RaisedButton.js
index b1b15a6..46850b1 100644
--- a/src/components/buttons/RaisedButton.js
+++ b/src/components/buttons/RaisedButton.js
@@ -81,7 +81,7 @@ RaisedButton.propTypes = {
   /**
    * The style of the button text. Only applies if props.children isn't passed.
    */
-  textStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+  textStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array, PropTypes.number]),
 
   // connectTheme
   theme: PropTypes.object.isRequired,
diff --git a/src/theme/connectTheme.js b/src/theme/connectTheme.js
index 11eae92..532b2b3 100644
--- a/src/theme/connectTheme.js
+++ b/src/theme/connectTheme.js
@@ -1,5 +1,6 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
+import merge from 'lodash/merge'
 import { themes } from '../index'
 
 export default component => {
@@ -18,25 +19,24 @@ export default component => {
     _node = null
 
     render() {
+      const { mergeTheme, ...rest } = this.props
       return (
         <WrappedComponent
-          {...this.props}
+          {...rest}
           ref={c => { this._node = c }}
-          theme={this.context.theme || themes.light} />
+          theme={merge(this.context.theme || themes.light, mergeTheme || {})} />
       )
     }
   }
 
+  ConnectTheme.propTypes = {
+    mergeTheme: PropTypes.object,
+  }
+
   ConnectTheme.displayName =
     `ConnectTheme(${Component.displayName || Component.name || 'Component'})`
 
   ConnectTheme.contextTypes = {
-    ...ConnectTheme.contextTypes,
-    theme: PropTypes.object,
-  }
-
-  ConnectTheme.childContextTypes = {
-    ...ConnectTheme.childContextTypes,
     theme: PropTypes.object,
   }