diff --git a/src/components/themr.js b/src/components/themr.js
index 622580c..85e42f8 100644
--- a/src/components/themr.js
+++ b/src/components/themr.js
@@ -84,7 +84,7 @@ export default (componentName, localTheme, options = {}) => ThemedComponent => {
 
     constructor(...args) {
       super(...args)
-      this.theme_ = this.calcTheme(this.props)
+      this.theme_ = this.calcTheme()
     }
 
     getWrappedInstance() {
@@ -97,8 +97,8 @@ export default (componentName, localTheme, options = {}) => ThemedComponent => {
       return this.refs.wrappedInstance
     }
 
-    getNamespacedTheme(props) {
-      const { themeNamespace, theme } = props
+    getNamespacedTheme() {
+      const { themeNamespace, theme } = this.props
       if (!themeNamespace) return theme
 
       if (themeNamespace && !theme) {
@@ -119,8 +119,9 @@ export default (componentName, localTheme, options = {}) => ThemedComponent => {
         )
     }
 
-    getThemeNotComposed(props) {
-      if (props.theme) return this.getNamespacedTheme(props)
+    getThemeNotComposed() {
+      const { theme } = this.props
+      if (theme) return this.getNamespacedTheme()
       if (config.localTheme) return config.localTheme
       return this.getContextTheme()
     }
@@ -131,34 +132,38 @@ export default (componentName, localTheme, options = {}) => ThemedComponent => {
         : {}
     }
 
-    getTheme(props) {
-      return props.composeTheme === COMPOSE_SOFTLY
+    getTheme() {
+      const { composeTheme } = this.props
+      return composeTheme === COMPOSE_SOFTLY
         ? {
-            ...this.getContextTheme(),
-            ...config.localTheme,
-            ...this.getNamespacedTheme(props)
-          }
+          ...this.getContextTheme(),
+          ...config.localTheme,
+          ...this.getNamespacedTheme()
+        }
         : themeable(
-            themeable(this.getContextTheme(), config.localTheme),
-            this.getNamespacedTheme(props)
-          )
+          themeable(this.getContextTheme(), config.localTheme),
+          this.getNamespacedTheme()
+        )
     }
 
-    calcTheme(props) {
-      const { composeTheme } = props
+    calcTheme() {
+      const { composeTheme } = this.props
       return composeTheme
-        ? this.getTheme(props)
-        : this.getThemeNotComposed(props)
+        ? this.getTheme()
+        : this.getThemeNotComposed()
     }
 
-    componentWillReceiveProps(nextProps) {
+    shouldComponentUpdate(prevProps) {
+      const { composeTheme, theme, themeNamespace } = this.props
       if (
-        nextProps.composeTheme !== this.props.composeTheme ||
-        nextProps.theme !== this.props.theme ||
-        nextProps.themeNamespace !== this.props.themeNamespace
+        composeTheme !== prevProps.composeTheme ||
+        theme !== prevProps.theme ||
+        themeNamespace !== prevProps.themeNamespace
       ) {
-        this.theme_ = this.calcTheme(nextProps)
+        this.theme_ = this.calcTheme()
+        return true
       }
+      return false
     }
 
     render() {