diff --git a/src/framework/theme/style/styleConsumer.component.tsx b/src/framework/theme/style/styleConsumer.component.tsx
index b140cdaff..d34b19a2d 100644
--- a/src/framework/theme/style/styleConsumer.component.tsx
+++ b/src/framework/theme/style/styleConsumer.component.tsx
@@ -128,7 +128,7 @@ export type StyledComponentClass<P> = React.ComponentClass<StyledComponentProps
  * }
  * ```
  */
-export const styled = <P extends object>(Component: React.ComponentClass<P>): StyledComponentClass<P> => {
+export const styled = <P extends object>(Component: React.ComponentType<P>): StyledComponentClass<P> => {
 
   // @ts-ignore
   if (!Component.styledComponentName) {
diff --git a/src/framework/theme/theme/themeConsumer.component.tsx b/src/framework/theme/theme/themeConsumer.component.tsx
index d43d7b752..9491d4cad 100644
--- a/src/framework/theme/theme/themeConsumer.component.tsx
+++ b/src/framework/theme/theme/themeConsumer.component.tsx
@@ -92,7 +92,7 @@ export type ThemedComponentClass<P> = React.ComponentClass<ThemedComponentProps
  * }
  * ```
  */
-export const withStyles = <P extends object>(Component: React.ComponentClass<P>,
+export const withStyles = <P extends object>(Component: React.ComponentType<P>,
                                              createStyles?: CreateStylesFunction): ThemedComponentClass<P> => {
 
   type WrappingProps = PrivateProps<WrappedElementInstance> & WrappedProps;