diff --git a/package.json b/package.json
index 87e81e56d..8cbdc8a70 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "eslint-plugin-react": "^7.11.1",
     "favicons-webpack-plugin": "^0.0.9",
     "jest": "^23.6.0",
-    "jest-styled-components": "^6.2.0",
+    "jest-styled-components": "^6.2.2",
     "lerna": "^3.4.3",
     "react": "^16.5.1",
     "react-dom": "^16.5.1",
@@ -74,11 +74,11 @@
     "standard-version": "^4.4.0",
     "styled-components": "^4.0.2",
     "uglifyjs-webpack-plugin": "^2.0.0",
-    "webpack": "^4.21.0"
+    "webpack": "^4.22.0"
   },
   "dependencies": {
     "classnames": "^2.2.6",
-    "polished": "^2.2.0",
+    "polished": "^2.3.0",
     "prop-types": "^15.6.2",
     "react-transition-group": "^2.5.0"
   }
diff --git a/packages/core-em/package.json b/packages/core-em/package.json
index 3e6d8c85c..8c5f0c38d 100644
--- a/packages/core-em/package.json
+++ b/packages/core-em/package.json
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "focus-trap": "^3.0.0",
-    "polished": "^2.2.0",
+    "polished": "^2.3.0",
     "prop-types": "^15.6.2",
     "react-transition-group": "^2.5.0"
   },
diff --git a/packages/core-sc/package.json b/packages/core-sc/package.json
index 5140a1892..2741a76e7 100644
--- a/packages/core-sc/package.json
+++ b/packages/core-sc/package.json
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "focus-trap": "^3.0.0",
-    "polished": "^2.2.0",
+    "polished": "^2.3.0",
     "prop-types": "^15.6.2",
     "react-transition-group": "^2.5.0"
   },
diff --git a/packages/shared/core/styled-engine/styled-components.js b/packages/shared/core/styled-engine/styled-components.js
index 075909f4b..2682dc482 100644
--- a/packages/shared/core/styled-engine/styled-components.js
+++ b/packages/shared/core/styled-engine/styled-components.js
@@ -3,5 +3,5 @@ import { wrapStyled } from './util'
 
 const styled = wrapStyled(scStyled)
 
-export default styled
 export * from 'styled-components'
+export default styled
diff --git a/packages/shared/core/styled-engine/util.js b/packages/shared/core/styled-engine/util.js
index e714504cd..63e876e34 100644
--- a/packages/shared/core/styled-engine/util.js
+++ b/packages/shared/core/styled-engine/util.js
@@ -5,28 +5,26 @@ function patchStyledComponent(StyledComponent) {
   if (!StyledComponent.target.__smoothUIComponent) {
     return StyledComponent
   }
-  const {
-    render,
-    withComponent,
-    defaultProps,
-    propTypes,
-    componentStyle,
-  } = StyledComponent
+
+  const { render, withComponent: baseWithComponent } = StyledComponent
+
   StyledComponent.withComponent = (component, ...args) => {
+    const { defaultProps, propTypes } = StyledComponent
     const Target = StyledComponent.target
     const NewTarget = props => <Target as={component} {...props} />
     // eslint-disable-next-line no-underscore-dangle
     NewTarget.__smoothUIComponent = true
     return patchStyledComponent(
-      Object.assign(withComponent(NewTarget, ...args), {
+      Object.assign(baseWithComponent(NewTarget, ...args), {
         defaultProps,
         propTypes,
-        componentStyle,
       }),
     )
   }
+
   StyledComponent.render = ({ as, ...props }, ref) =>
     render({ forwardedAs: as, ...props }, ref)
+
   return StyledComponent
 }
 
diff --git a/yarn.lock b/yarn.lock
index 87ff1c3fb..91940502f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7797,10 +7797,10 @@ jest-snapshot@^23.6.0:
     pretty-format "^23.6.0"
     semver "^5.5.0"
 
-jest-styled-components@^6.2.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/jest-styled-components/-/jest-styled-components-6.2.1.tgz#63d28c6bf637977509f0e6a57bff0a10f44a48e3"
-  integrity sha512-7Z9TeI97yvI5BA6nn3169V7YwzSJj2fgl7uwE3foL9XxgMyrpTjTAnS0EZEiV8J8iyMFNYvzD6yytmF43/6L1g==
+jest-styled-components@^6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/jest-styled-components/-/jest-styled-components-6.2.2.tgz#8d69a95ca9d26b9ceab2fcccdee3795d041a1f3b"
+  integrity sha512-CLjlS4FuVpzft3DG+bX8HIFZxmkWTJs0sX2rlIkel4U6O7TteNBPBdATuH/fT+RCfEQ/bGTtOFoI7yQ9HTghRA==
   dependencies:
     css "^2.2.4"
 
@@ -10286,13 +10286,20 @@ pngjs@^3.0.0, pngjs@^3.2.0:
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.3.3.tgz#85173703bde3edac8998757b96e5821d0966a21b"
   integrity sha512-1n3Z4p3IOxArEs1VRXnZ/RXdfEniAUS9jb68g58FIXMNkPJeZd+Qh4Uq7/e0LVxAQGos1eIUrqrt4FpjdnEd+Q==
 
-polished@^2.0.3, polished@^2.2.0:
+polished@^2.0.3:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/polished/-/polished-2.2.0.tgz#5ca7e178cc5352bd7fd1efc45342f7c6d59cc982"
   integrity sha512-GEKeNET1XIri53xKpFwGZX4fh2k3b5GE5fxwLWYYR2sGWkMAHJVcb7bK1g6QHIDcoIEEGC8CzHOQgl2qFByd3w==
   dependencies:
     "@babel/runtime" "^7.0.0"
 
+polished@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/polished/-/polished-2.3.0.tgz#66c8b66bc666e95d9d12d760dac9df758aed8f8e"
+  integrity sha512-G2yD9LhJy5HBuU+Im5qe70ubaJI/ZTTOIJO6GRMwJ2WSoAiPzlm8+LjAXMnm9/K0E0NumRVHvQu2HHPKQSYQjw==
+  dependencies:
+    "@babel/runtime" "^7.0.0"
+
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
@@ -13583,10 +13590,10 @@ webpack@^4.19.1:
     watchpack "^1.5.0"
     webpack-sources "^1.3.0"
 
-webpack@^4.21.0:
-  version "4.21.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.21.0.tgz#bd03605c0f48c0d4aaaef78ead2769485e5afd92"
-  integrity sha512-CGBeop4AYR0dcmk9Afl33qQULwTHQCXQPAIBTHMJoy9DpY8FPUDna/NUlAGTr5o5y9QC901Ww3wCY4wNo1X9Lw==
+webpack@^4.22.0:
+  version "4.22.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.22.0.tgz#b168111e2e7b05f5169ac484e79e62093ec39e0d"
+  integrity sha512-2+3EYFqyhPl12buLQ42QPHEEh8BHn3P9ipRvGRHhdfKJ1u9svhZ3QjhIoEdL5SeIhL5gfOZVbBnartYEabkEsg==
   dependencies:
     "@webassemblyjs/ast" "1.7.8"
     "@webassemblyjs/helper-module-context" "1.7.8"