diff --git a/elements/Circle.js b/elements/Circle.js
index ce3f1cea..115066f2 100644
--- a/elements/Circle.js
+++ b/elements/Circle.js
@@ -2,15 +2,13 @@ import React, {PropTypes} from 'react';
 import createNativeComponent from '../lib/createNativeComponent';
 import Shape from './Shape';
 import mergeContext from '../lib/mergeContext';
-import {circleProps, pathProps, fillProps, strokeProps, numberProp, touchableProps, responderProps} from '../lib/props';
+import {circleProps, pathProps, fillProps, strokeProps, numberProp} from '../lib/props';
 
 class Circle extends Shape {
     static displayName = 'Circle';
     static propTypes = {
         ...pathProps,
-        ...circleProps,
-        ...touchableProps,
-        ...responderProps
+        ...circleProps
     };
 
     static contextTypes = {
diff --git a/elements/Image.js b/elements/Image.js
index 5f872217..80ddf14c 100644
--- a/elements/Image.js
+++ b/elements/Image.js
@@ -1,6 +1,6 @@
 import React, {PropTypes} from 'react';
 import createNativeComponent from '../lib/createNativeComponent';
-import {numberProp} from '../lib/props';
+import {numberProp, touchableProps, responderProps} from '../lib/props';
 import Shape from './Shape';
 import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource';
 
@@ -12,7 +12,9 @@ class Image extends Shape {
         y: numberProp,
         width: numberProp,
         height: numberProp,
-        href: PropTypes.number.isRequired
+        href: PropTypes.number.isRequired,
+        ...responderProps,
+        ...touchableProps
         //preserveAspectRatio: PropTypes.string
     };
 
diff --git a/elements/Polygon.js b/elements/Polygon.js
index 86afd122..d7877b22 100644
--- a/elements/Polygon.js
+++ b/elements/Polygon.js
@@ -6,7 +6,7 @@ class Polygon extends Component{
     static displayName = 'Polygon';
     static propTypes = {
         ...pathProps,
-        points: PropTypes.string
+        points: PropTypes.oneOfType([PropTypes.string, PropTypes.array])
     };
 
     render() {
diff --git a/elements/Polyline.js b/elements/Polyline.js
index d6255cd7..207ecaf5 100644
--- a/elements/Polyline.js
+++ b/elements/Polyline.js
@@ -6,7 +6,7 @@ class Polyline extends Component{
     static displayName = 'Polyline';
     static propTypes = {
         ...pathProps,
-        points: PropTypes.string
+        points: PropTypes.oneOfType([PropTypes.string, PropTypes.array])
     };
 
     render() {
diff --git a/elements/Text.js b/elements/Text.js
index 7fdf2f77..2ab2a0c3 100644
--- a/elements/Text.js
+++ b/elements/Text.js
@@ -13,8 +13,6 @@ class Text extends Shape {
         dx: numberProp,
         dy: numberProp,
         ...textProps,
-        ...fillProps,
-        ...strokeProps,
         ...pathProps
     };
 
diff --git a/lib/props.js b/lib/props.js
index 03826127..a2bd71c3 100644
--- a/lib/props.js
+++ b/lib/props.js
@@ -76,7 +76,8 @@ const pathProps = {
     ...strokeProps,
     ...clipProps,
     ...transformProps,
-    ...responderProps
+    ...responderProps,
+    ...touchableProps
 };
 
 const circleProps = {