diff --git a/Example/examples/G.js b/Example/examples/G.js
index f46f2655..57288fde 100644
--- a/Example/examples/G.js
+++ b/Example/examples/G.js
@@ -30,6 +30,7 @@ class GExample extends Component{
                 <Circle
                     cx="25"
                     cy="75"
+                    stroke="red"
                 />
                 <Circle
                     cx="50"
@@ -39,6 +40,7 @@ class GExample extends Component{
                 <Circle
                     cx="75"
                     cy="25"
+                    stroke="red"
                 />
                 <Circle
                     cx="75"
diff --git a/elements/Circle.js b/elements/Circle.js
index b60f9c94..b87a0193 100644
--- a/elements/Circle.js
+++ b/elements/Circle.js
@@ -3,7 +3,7 @@ import React, {
     PropTypes
 } from 'react-native';
 import Shape, {CIRCLE} from './Shape';
-import {circleProps, pathProps} from '../lib/props';
+import {circleProps, pathProps, fillProps, strokeProps} from '../lib/props';
 import _ from 'lodash';
 
 class Circle extends Shape{
@@ -13,13 +13,9 @@ class Circle extends Shape{
         ...circleProps
     };
 
-    static defaultProps = {
-        cx: 0,
-        cy: 0,
-        r: 0
-    };
-
     static contextTypes = {
+        ...fillProps,
+        ...strokeProps,
         ...circleProps,
         isInGroup: PropTypes.bool
     };
diff --git a/elements/Defs.js b/elements/Defs.js
index 64e6e9e3..e8699205 100644
--- a/elements/Defs.js
+++ b/elements/Defs.js
@@ -61,11 +61,10 @@ class DefsUse extends Component{
             if (matched) {
                 let template = map[matched[1] + ':' + this.props.svgId];
                 if (template) {
-                    let props = {
+                    return cloneElement(template, {
                         ...this.props,
                         href: null
-                    };
-                    return cloneElement(template, props);
+                    });
                 }
             }
         }
diff --git a/elements/Ellipse.js b/elements/Ellipse.js
index 290973cc..8357998f 100644
--- a/elements/Ellipse.js
+++ b/elements/Ellipse.js
@@ -3,7 +3,7 @@ import React, {
     PropTypes
 } from 'react-native';
 import Shape, {ELLIPSE} from './Shape';
-import {ellipseProps, pathProps} from '../lib/props';
+import {ellipseProps, pathProps, fillProps, strokeProps} from '../lib/props';
 
 class Ellipse extends Shape{
     static displayName = 'Ellipse';
@@ -12,14 +12,9 @@ class Ellipse extends Shape{
         ...ellipseProps
     };
 
-    static defaultProps = {
-        cx: 0,
-        cy: 0,
-        rx: 0,
-        ry: 0
-    };
-
     static contextTypes = {
+        ...fillProps,
+        ...strokeProps,
         ...ellipseProps,
         isInGroup: PropTypes.bool
     };
diff --git a/elements/Line.js b/elements/Line.js
index 8720c056..b7a45221 100644
--- a/elements/Line.js
+++ b/elements/Line.js
@@ -3,7 +3,7 @@ import React, {
     PropTypes
 } from 'react-native';
 import Shape, {LINE} from './Shape';
-import {lineProps, pathProps} from '../lib/props';
+import {lineProps, pathProps, fillProps, strokeProps} from '../lib/props';
 
 class Line extends Shape{
     static displayName = 'Line';
@@ -12,14 +12,9 @@ class Line extends Shape{
         ...lineProps
     };
 
-    static defaultProps = {
-        x1: 0,
-        x2: 0,
-        y1: 0,
-        y2: 0
-    };
-
     static contextTypes = {
+        ...fillProps,
+        ...strokeProps,
         ...lineProps,
         isInGroup: PropTypes.bool
     };
diff --git a/elements/Rect.js b/elements/Rect.js
index b9da6091..2f31f8e7 100644
--- a/elements/Rect.js
+++ b/elements/Rect.js
@@ -3,7 +3,7 @@ import React, {
     PropTypes
 } from 'react-native';
 import Shape, {RECT} from './Shape';
-import {rectProps, pathProps} from '../lib/props';
+import {rectProps, pathProps, fillProps, strokeProps} from '../lib/props';
 
 class Rect extends Shape{
     static displayName = 'Rect';
@@ -12,16 +12,9 @@ class Rect extends Shape{
         ...rectProps
     };
 
-    static defaultProps = {
-        x: 0,
-        y: 0,
-        width: 0,
-        height: 0,
-        rx: 0,
-        ry: 0
-    };
-
     static contextTypes = {
+        ...fillProps,
+        ...strokeProps,
         ...rectProps,
         isInGroup: PropTypes.bool
     };
diff --git a/elements/Shape.js b/elements/Shape.js
index 6e5b755b..741bcbf9 100644
--- a/elements/Shape.js
+++ b/elements/Shape.js
@@ -51,7 +51,7 @@ class Shape extends Component{
         let props = this.props;
 
         if (this.context.isInGroup) {
-            props = _.defaults(this.context, props, {
+            props = _.defaults({}, props, this.context, {
                 isInGroup: null
             });
         }
@@ -59,7 +59,6 @@ class Shape extends Component{
         let shape = new SerializableShape(props, COORD_PROPS[this.type]).toJSON();
 
         return <NativePath
-            {...props}
             {...extractProps(this.type === 3 ? {
                 ...props,
                 x: null,
diff --git a/elements/Svg.js b/elements/Svg.js
index 8ac10727..58abee1b 100644
--- a/elements/Svg.js
+++ b/elements/Svg.js
@@ -6,7 +6,6 @@ import React, {
     View,
     requireNativeComponent
 } from 'react-native';
-import extractViewbox from '../lib/extract/extractViewbox';
 import ViewBox from './ViewBox';
 import _ from 'lodash';
 
diff --git a/elements/Symbol.js b/elements/Symbol.js
index 7088a7ee..72026cf7 100644
--- a/elements/Symbol.js
+++ b/elements/Symbol.js
@@ -5,7 +5,6 @@ import React, {
 
 import ViewBox from './ViewBox';
 import Defs from './Defs';
-import extractViewbox from '../lib/extract/extractViewbox';
 class SymbolElement extends Component{
     static displayName = 'Symbol';
     static propType = {
diff --git a/ios/RNSVGShape.m b/ios/RNSVGShape.m
index ca28f342..0a9c2693 100644
--- a/ios/RNSVGShape.m
+++ b/ios/RNSVGShape.m
@@ -41,7 +41,7 @@
             CGFloat cy = [self getActualProp:@"cy" relative:height];
             CGFloat rx = [self getActualProp:@"rx" relative:height];
             CGFloat ry = [self getActualProp:@"ry" relative:height];
-            CGPathAddEllipseInRect(path, nil, CGRectMake(cx - rx / 2, cy - ry / 2, rx * 2, ry * 2));
+            CGPathAddEllipseInRect(path, nil, CGRectMake(cx - rx, cy - ry, rx * 2, ry * 2));
             break;
         }
         case 2:
diff --git a/lib/extract/extractViewbox.js b/lib/extract/extractViewbox.js
index c4edecb7..ffbe914c 100644
--- a/lib/extract/extractViewbox.js
+++ b/lib/extract/extractViewbox.js
@@ -1,4 +1,4 @@
-export default function({viewbox, width, height, preserveAspectRatio, x: dx, y: dy, dScale, dScaleX, dScaleY, shouldTransform}) {
+export default function({viewbox, width, height, preserveAspectRatio, x: dx, y: dy, dScale, dScaleX, dScaleY}) {
     if (!viewbox || !width || !height) {
         return false;
     }
@@ -47,18 +47,18 @@ export default function({viewbox, width, height, preserveAspectRatio, x: dx, y:
             y = -vy * sy;
         }
 
-        if (shouldTransform) {
-            x += (+dx || 0);
-            y += (+dy || 0);
+        //if (shouldTransform) {
+        x += (+dx || 0);
+        y += (+dy || 0);
 
-            if (dScale) {
-                scaleX *= (+dScale || 1);
-                scaleY *= (+dScale || 1);
-            } else {
-                scaleX *= (+dScaleX || 1);
-                scaleY *= (+dScaleY || 1);
-            }
+        if (dScale) {
+            scaleX *= (+dScale || 1);
+            scaleY *= (+dScale || 1);
+        } else {
+            scaleX *= (+dScaleX || 1);
+            scaleY *= (+dScaleY || 1);
         }
+        //}
 
         return {
             x,