diff --git a/documentation-site/components/map-marker-sizing-table.js b/documentation-site/components/map-marker-sizing-table.js
index 0c4ba17a4e..a1768929a7 100644
--- a/documentation-site/components/map-marker-sizing-table.js
+++ b/documentation-site/components/map-marker-sizing-table.js
@@ -7,8 +7,7 @@ LICENSE file in the root directory of this source tree.
 // @flow
 import * as React from 'react';
 import { Table } from 'baseui/table-semantic';
-import { PINHEAD_SIZES_SHAPES, FLOATING_MARKER_SIZES } from 'baseui/map-marker';
-import { PINHEAD_DIMENSIONS } from '../../src/map-marker/constants';
+import { PINHEAD_SIZES_SHAPES, FLOATING_MARKER_SIZES, PINHEAD_DIMENSIONS } from 'baseui/map-marker';
 import { InlineCode } from './markdown-elements';
 
 export const FixedMarkerSizingTable = () => {
diff --git a/package.json b/package.json
index e520f85397..d8e4efdec6 100644
--- a/package.json
+++ b/package.json
@@ -109,9 +109,6 @@
     "@types/react-dom": "^16.8.4",
     "@types/react-virtualized": "^9.21.3",
     "@types/react-window": "^1.8.1",
-    "@types/styletron-engine-atomic": "^1.1.1",
-    "@types/styletron-react": "^5.0.3",
-    "@types/styletron-standard": "^2.0.2",
     "@types/webpack": "^4.41.32",
     "@typescript-eslint/eslint-plugin": "^5.26.0",
     "@typescript-eslint/parser": "^5.26.0",
@@ -193,9 +190,9 @@
     "semver": "^6.2.0",
     "shx": "^0.3.2",
     "static-server": "^2.2.1",
-    "styletron-engine-atomic": "^1.4.3",
-    "styletron-react": "^5.2.4",
-    "styletron-standard": "^3.0.3",
+    "styletron-engine-atomic": "^1.5.0-beta.1",
+    "styletron-react": "^6.1.0-beta.1",
+    "styletron-standard": "^3.1.0-beta.1",
     "tar": "^5.0.0",
     "tsconfig-paths": "^3.9.0",
     "typescript": "^4.7.2",
diff --git a/src/accordion/index.d.ts b/src/accordion/index.d.ts
index 2411db47fb..909f9b53b8 100644
--- a/src/accordion/index.d.ts
+++ b/src/accordion/index.d.ts
@@ -123,10 +123,10 @@ export class StatefulPanelContainer extends React.Component<
   ): void;
 }
 
-export declare const StyledRoot: StyletronComponent<any>;
-export declare const StyledPanelContainer: StyletronComponent<any>;
-export declare const StyledHeader: StyletronComponent<any>;
-export declare const StyledContent: StyletronComponent<any>;
-export declare const StyledContentAnimationContainer: StyletronComponent<any>;
-export declare const StyledToggleIcon: StyletronComponent<any>;
-export declare const StyledToggleIconGroup: StyletronComponent<any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
+export declare const StyledPanelContainer: StyletronComponent<any, any>;
+export declare const StyledHeader: StyletronComponent<any, any>;
+export declare const StyledContent: StyletronComponent<any, any>;
+export declare const StyledContentAnimationContainer: StyletronComponent<any, any>;
+export declare const StyledToggleIcon: StyletronComponent<any, any>;
+export declare const StyledToggleIconGroup: StyletronComponent<any, any>;
diff --git a/src/avatar/index.d.ts b/src/avatar/index.d.ts
index 9003bc9c7e..7c2eaaf467 100644
--- a/src/avatar/index.d.ts
+++ b/src/avatar/index.d.ts
@@ -22,6 +22,6 @@ export interface AvatarProps {
 
 export declare const Avatar: React.FC<AvatarProps>;
 
-export declare const StyledAvatar: StyletronComponent<any>;
-export declare const StyledInitials: StyletronComponent<any>;
-export declare const StyledRoot: StyletronComponent<any>;
+export declare const StyledAvatar: StyletronComponent<any, any>;
+export declare const StyledInitials: StyletronComponent<any, any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
diff --git a/src/badge/index.d.ts b/src/badge/index.d.ts
index 92186e1e07..96fbce8fc1 100644
--- a/src/badge/index.d.ts
+++ b/src/badge/index.d.ts
@@ -2,25 +2,25 @@ import * as React from 'react';
 import { StyletronComponent } from 'styletron-react';
 import { Override } from '../overrides';
 
-export interface HIERARCHY {
+export declare const HIERARCHY: {
   primary: 'primary';
   secondary: 'secondary';
-}
+};
 
-export interface SHAPE {
+export declare const SHAPE: {
   pill: 'pill';
   rectangle: 'rectangle';
-}
+};
 
-export interface COLOR {
+export declare const COLOR: {
   accent: 'accent';
   primary: 'primary';
   positive: 'positive';
   negative: 'negative';
   warning: 'warning';
-}
+};
 
-export interface PLACEMENT {
+export declare const PLACEMENT: {
   topLeft: 'topLeft';
   topRight: 'topRight';
   bottomRight: 'bottomRight';
@@ -35,12 +35,12 @@ export interface PLACEMENT {
   rightTopEdge: 'rightTopEdge';
   rightBottomEdge: 'rightBottomEdge';
   leftBottomEdge: 'leftBottomEdge';
-}
+};
 
-export type HierarchyT = HIERARCHY[keyof HIERARCHY];
-export type ShapeT = SHAPE[keyof SHAPE];
-export type ColorT = COLOR[keyof COLOR];
-export type PlacementT = PLACEMENT[keyof PLACEMENT];
+export type HierarchyT = typeof HIERARCHY[keyof typeof HIERARCHY];
+export type ShapeT = typeof SHAPE[keyof typeof SHAPE];
+export type ColorT = typeof COLOR[keyof typeof COLOR];
+export type PlacementT = typeof PLACEMENT[keyof typeof PLACEMENT];
 
 export type BadgeOverridesT = {
   Root?: Override<any>;
@@ -81,17 +81,12 @@ export type HintDotPropsT = {
   children?: React.ReactNode;
 };
 
-export const StyledRoot: StyletronComponent<any>;
-export const StyledPositioner: StyletronComponent<any>;
-export const StyledBadge: StyletronComponent<any>;
-export const StyledNotificationCircle: StyletronComponent<any>;
-export const StyledHintDot: StyletronComponent<any>;
-
-export const Badge: React.FC<BadgePropsT>;
-export const NotificationCircle: React.FC<NotificationCirclePropsT>;
-export const HintDot: React.FC<HintDotPropsT>;
+export declare const StyledRoot: StyletronComponent<any, any>;
+export declare const StyledPositioner: StyletronComponent<any, any>;
+export declare const StyledBadge: StyletronComponent<any, any>;
+export declare const StyledNotificationCircle: StyletronComponent<any, any>;
+export declare const StyledHintDot: StyletronComponent<any, any>;
 
-export const HIERARCHY: HIERARCHY;
-export const SHAPE: SHAPE;
-export const COLOR: COLOR;
-export const PLACEMENT: PLACEMENT;
+export declare const Badge: React.FC<BadgePropsT>;
+export declare const NotificationCircle: React.FC<NotificationCirclePropsT>;
+export declare const HintDot: React.FC<HintDotPropsT>;
diff --git a/src/banner/index.d.ts b/src/banner/index.d.ts
index cf7259caab..22b9121812 100644
--- a/src/banner/index.d.ts
+++ b/src/banner/index.d.ts
@@ -2,46 +2,46 @@ import * as React from 'react';
 import { StyletronComponent } from 'styletron-react';
 import { Override } from '../overrides';
 
-export interface ACTION_POSITION {
+export declare const ACTION_POSITION: {
   below: 'below';
   trailing: 'trailing';
-}
+};
 
-export interface ARTWORK_TYPE {
+export declare const ARTWORK_TYPE: {
   badge: 'badge';
   icon: 'icon';
-}
+};
 
-export interface HIERARCHY {
+export declare const HIERARCHY: {
   high: 'high';
   low: 'low';
-}
+};
 
-export interface KIND {
+export declare const KIND: {
   info: 'info';
   negative: 'negative';
   positive: 'positive';
   warning: 'warning';
-}
+};
 
 export interface ActionContentT {
   label: string;
   icon?: (iconProps: { size: string }) => React.ReactNode;
   onClick: (event: React.MouseEvent<HTMLButtonElement>) => any;
-  position?: ACTION_POSITION[keyof ACTION_POSITION];
+  position?: typeof ACTION_POSITION[keyof typeof ACTION_POSITION];
 }
 
 export interface ArtworkContentT {
   icon: (iconProps: { size: string }) => React.ReactNode;
-  type?: ARTWORK_TYPE[keyof ARTWORK_TYPE];
+  type?: typeof ARTWORK_TYPE[keyof typeof ARTWORK_TYPE];
 }
 
 export interface PropsT {
   action?: ActionContentT;
   artwork?: ArtworkContentT;
   children: React.ReactNode;
-  hierarchy?: HIERARCHY[keyof HIERARCHY];
-  kind?: KIND[keyof KIND];
+  hierarchy?: typeof HIERARCHY[keyof typeof HIERARCHY];
+  kind?: typeof KIND[keyof typeof KIND];
   overrides?: {
     BelowContent?: Override<any>;
     LeadingContent?: Override<any>;
@@ -57,19 +57,14 @@ export interface PropsT {
   title?: React.ReactNode;
 }
 
-export const StyledBelowContent: StyletronComponent<any>;
-export const StyledLeadingContent: StyletronComponent<any>;
-export const StyledMessage: StyletronComponent<any>;
-export const StyledMessageContent: StyletronComponent<any>;
-export const StyledRoot: StyletronComponent<any>;
-export const StyledTitle: StyletronComponent<any>;
-export const StyledTrailingContent: StyletronComponent<any>;
-export const StyledTrailingButtonContainer: StyletronComponent<any>;
-export const StyledTrailingIconButton: StyletronComponent<any>;
-
-export const ACTION_POSITION: ACTION_POSITION;
-export const ARTWORK_TYPE: ARTWORK_TYPE;
-export const HIERARCHY: HIERARCHY;
-export const KIND: KIND;
+export declare const StyledBelowContent: StyletronComponent<any, any>;
+export declare const StyledLeadingContent: StyletronComponent<any, any>;
+export declare const StyledMessage: StyletronComponent<any, any>;
+export declare const StyledMessageContent: StyletronComponent<any, any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
+export declare const StyledTitle: StyletronComponent<any, any>;
+export declare const StyledTrailingContent: StyletronComponent<any, any>;
+export declare const StyledTrailingButtonContainer: StyletronComponent<any, any>;
+export declare const StyledTrailingIconButton: StyletronComponent<any, any>;
 
-export const Banner: React.FC<PropsT>;
+export declare const Banner: React.FC<PropsT>;
diff --git a/src/breadcrumbs/index.d.ts b/src/breadcrumbs/index.d.ts
index e51196db06..a37df61e01 100644
--- a/src/breadcrumbs/index.d.ts
+++ b/src/breadcrumbs/index.d.ts
@@ -20,5 +20,5 @@ export interface BreadcrumbsProps {
 
 export declare const Breadcrumbs: React.FC<BreadcrumbsProps>;
 
-export declare const StyledRoot: StyletronComponent<any>;
-export declare const StyledSeparator: StyletronComponent<any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
+export declare const StyledSeparator: StyletronComponent<any, any>;
diff --git a/src/button-group/index.d.ts b/src/button-group/index.d.ts
index e67b49437e..e4d00c88fd 100644
--- a/src/button-group/index.d.ts
+++ b/src/button-group/index.d.ts
@@ -14,7 +14,7 @@ export declare const STATE_CHANGE_TYPE: {
   change: 'change';
 };
 
-export declare const StyledRoot: StyletronComponent<any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
 
 export interface ButtonGroupOverrides {
   Root?: Override<any>;
diff --git a/src/button/index.d.ts b/src/button/index.d.ts
index 33fb2190c1..071b691750 100644
--- a/src/button/index.d.ts
+++ b/src/button/index.d.ts
@@ -56,10 +56,10 @@ export interface ButtonProps {
   type?: 'submit' | 'reset' | 'button';
 }
 
-export declare const StyledBaseButton: StyletronComponent<any>;
-export declare const StyledStartEnhancer: StyletronComponent<any>;
-export declare const StyledEndEnhancer: StyletronComponent<any>;
-export declare const StyledLoadingSpinner: StyletronComponent<any>;
-export declare const StyledLoadingSpinnerContainer: StyletronComponent<any>;
+export declare const StyledBaseButton: StyletronComponent<any, any>;
+export declare const StyledStartEnhancer: StyletronComponent<any, any>;
+export declare const StyledEndEnhancer: StyletronComponent<any, any>;
+export declare const StyledLoadingSpinner: StyletronComponent<any, any>;
+export declare const StyledLoadingSpinnerContainer: StyletronComponent<any, any>;
 
-export declare const Button: StyletronComponent<ButtonProps>;
+export declare const Button: StyletronComponent<any, ButtonProps>;
diff --git a/src/card/index.d.ts b/src/card/index.d.ts
index 832e48d4d6..13f572a05b 100644
--- a/src/card/index.d.ts
+++ b/src/card/index.d.ts
@@ -25,11 +25,11 @@ export interface CardProps {
 export declare const Card: React.FC<CardProps>;
 export type hasThumbnail = (props: { readonly thumbnail?: string }) => boolean;
 
-export declare const StyledAction: StyletronComponent<any>;
-export declare const StyledBody: StyletronComponent<any>;
-export declare const StyledContents: StyletronComponent<any>;
-export declare const StyledHeaderImage: StyletronComponent<any>;
-export declare const StyledThumbnail: StyletronComponent<any>;
-export declare const StyledTitle: StyletronComponent<any>;
-export declare const StyledRoot: StyletronComponent<any>;
-export declare const StyledWrapper: StyletronComponent<any>;
+export declare const StyledAction: StyletronComponent<any, any>;
+export declare const StyledBody: StyletronComponent<any, any>;
+export declare const StyledContents: StyletronComponent<any, any>;
+export declare const StyledHeaderImage: StyletronComponent<any, any>;
+export declare const StyledThumbnail: StyletronComponent<any, any>;
+export declare const StyledTitle: StyletronComponent<any, any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
+export declare const StyledWrapper: StyletronComponent<any, any>;
diff --git a/src/checkbox/index.d.ts b/src/checkbox/index.d.ts
index 070155f5e9..a684d0cc70 100644
--- a/src/checkbox/index.d.ts
+++ b/src/checkbox/index.d.ts
@@ -23,13 +23,13 @@ type initialState = {
   isIndeterminate?: boolean;
 };
 
-export declare const StyledRoot: StyletronComponent<any>;
-export declare const StyledCheckmark: StyletronComponent<any>;
-export declare const StyledLabel: StyletronComponent<any>;
-export declare const StyledInput: StyletronComponent<any>;
-export declare const StyledToggle: StyletronComponent<any>;
-export declare const StyledToggleInner: StyletronComponent<any>;
-export declare const StyledToggleTrack: StyletronComponent<any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
+export declare const StyledCheckmark: StyletronComponent<any, any>;
+export declare const StyledLabel: StyletronComponent<any, any>;
+export declare const StyledInput: StyletronComponent<any, any>;
+export declare const StyledToggle: StyletronComponent<any, any>;
+export declare const StyledToggleInner: StyletronComponent<any, any>;
+export declare const StyledToggleTrack: StyletronComponent<any, any>;
 
 export type StateReducer = (
   stateType: string,
diff --git a/src/dnd-list/index.d.ts b/src/dnd-list/index.d.ts
index cd84094926..b035a48441 100644
--- a/src/dnd-list/index.d.ts
+++ b/src/dnd-list/index.d.ts
@@ -69,12 +69,12 @@ export interface ListProps {
 
 export class List extends React.Component<ListProps> {}
 
-export declare const StyledRoot: StyletronComponent<any>;
-export declare const StyledList: StyletronComponent<any>;
-export declare const StyledItem: StyletronComponent<any>;
-export declare const StyledDragHandle: StyletronComponent<any>;
-export declare const StyledCloseHandle: StyletronComponent<any>;
-export declare const StyledLabel: StyletronComponent<any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
+export declare const StyledList: StyletronComponent<any, any>;
+export declare const StyledItem: StyletronComponent<any, any>;
+export declare const StyledDragHandle: StyletronComponent<any, any>;
+export declare const StyledCloseHandle: StyletronComponent<any, any>;
+export declare const StyledLabel: StyletronComponent<any, any>;
 
 export declare const arrayMove: typeof arrayMoveT;
 export declare const arrayRemove: typeof arrayRemoveT;
diff --git a/src/drawer/index.d.ts b/src/drawer/index.d.ts
index 15685f6f55..4779c5615f 100644
--- a/src/drawer/index.d.ts
+++ b/src/drawer/index.d.ts
@@ -84,8 +84,8 @@ export class Drawer extends React.Component<DrawerProps, DrawerState> {
   renderDrawer(): React.ReactNode;
 }
 
-export declare const StyledRoot: StyletronComponent<any>;
-export declare const StyledBackdrop: StyletronComponent<any>;
-export declare const StyledDrawerContainer: StyletronComponent<any>;
-export declare const StyledDrawerBody: StyletronComponent<any>;
-export declare const StyledClose: StyletronComponent<any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
+export declare const StyledBackdrop: StyletronComponent<any, any>;
+export declare const StyledDrawerContainer: StyletronComponent<any, any>;
+export declare const StyledDrawerBody: StyletronComponent<any, any>;
+export declare const StyledClose: StyletronComponent<any, any>;
diff --git a/src/file-uploader/index.d.ts b/src/file-uploader/index.d.ts
index bcd4788bf9..00adc415a9 100644
--- a/src/file-uploader/index.d.ts
+++ b/src/file-uploader/index.d.ts
@@ -69,8 +69,8 @@ export interface FileUploaderProps {
 }
 export declare const FileUploader: React.FC<FileUploaderProps>;
 
-export declare const StyledRoot: StyletronComponent<any>;
-export declare const StyledFileDragAndDrop: StyletronComponent<any>;
-export declare const StyledContentMessage: StyletronComponent<any>;
-export declare const StyledErrorMessage: StyletronComponent<any>;
-export declare const StyledHiddenInput: StyletronComponent<any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
+export declare const StyledFileDragAndDrop: StyletronComponent<any, any>;
+export declare const StyledContentMessage: StyletronComponent<any, any>;
+export declare const StyledErrorMessage: StyletronComponent<any, any>;
+export declare const StyledHiddenInput: StyletronComponent<any, any>;
diff --git a/src/form-control/index.d.ts b/src/form-control/index.d.ts
index 6312293701..c3e7723fd5 100644
--- a/src/form-control/index.d.ts
+++ b/src/form-control/index.d.ts
@@ -2,9 +2,9 @@ import * as React from 'react';
 import { StyletronComponent } from 'styletron-react';
 import { Override } from '../overrides';
 
-export declare const StyledLabel: StyletronComponent<any>;
-export declare const StyledCaption: StyletronComponent<any>;
-export declare const StyledControlContainer: StyletronComponent<any>;
+export declare const StyledLabel: StyletronComponent<any, any>;
+export declare const StyledCaption: StyletronComponent<any, any>;
+export declare const StyledControlContainer: StyletronComponent<any, any>;
 
 export interface FormControlOverrides {
   Label?: Override<any>;
diff --git a/src/header-navigation/index.d.ts b/src/header-navigation/index.d.ts
index 1ae0d6c862..6413086e07 100644
--- a/src/header-navigation/index.d.ts
+++ b/src/header-navigation/index.d.ts
@@ -19,6 +19,6 @@ export interface HeaderNavigationProps {
 
 export class HeaderNavigation extends React.Component<HeaderNavigationProps> {}
 
-export declare const StyledRoot: StyletronComponent<any>;
-export declare const StyledNavigationItem: StyletronComponent<any>;
-export declare const StyledNavigationList: StyletronComponent<any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
+export declare const StyledNavigationItem: StyletronComponent<any, any>;
+export declare const StyledNavigationList: StyletronComponent<any, any>;
diff --git a/src/helper/index.d.ts b/src/helper/index.d.ts
index 52474d30db..51f05a139b 100644
--- a/src/helper/index.d.ts
+++ b/src/helper/index.d.ts
@@ -22,8 +22,8 @@ export type HelperStepsPropsT = {
 
 export { ACCESSIBILITY_TYPE, PLACEMENT, TRIGGER_TYPE };
 
-export declare const StyledArrow: StyletronComponent<any>;
-export declare const StyledBody: StyletronComponent<any>;
+export declare const StyledArrow: StyletronComponent<any, any>;
+export declare const StyledBody: StyletronComponent<any, any>;
 
 export declare const Unstable_Helper: React.FC<PropsT>;
 export declare const Unstable_StatefulHelper: React.FC<StatefulPropsT>;
diff --git a/src/icon/index.d.ts b/src/icon/index.d.ts
index e9bf367a63..39932fdd22 100644
--- a/src/icon/index.d.ts
+++ b/src/icon/index.d.ts
@@ -21,7 +21,7 @@ export interface IconProps {
 
 export declare const Icon: React.FC<IconProps>;
 
-export declare const StyledSvg: StyletronComponent<any>;
+export declare const StyledSvg: StyletronComponent<any, any>;
 
 export declare const Alert: React.FC<IconProps>;
 export declare const ArrowDown: React.FC<IconProps>;
diff --git a/src/input/index.d.ts b/src/input/index.d.ts
index 9376d86f06..a6928c6372 100644
--- a/src/input/index.d.ts
+++ b/src/input/index.d.ts
@@ -154,9 +154,9 @@ export type StatefulInputProps = InputProps & StatefulContainerProps & { childre
 export declare const StatefulInput: React.FC<StatefulInputProps>;
 export declare const StatefulContainer: React.FC<StatefulContainerProps>;
 
-export declare const StyledRoot: StyletronComponent<any>;
-export declare const StyledInputEnhancer: StyletronComponent<any>;
-export declare const StyledStartEnhancer: StyletronComponent<any>;
-export declare const StyledEndEnhancer: StyletronComponent<any>;
-export declare const StyledInputContainer: StyletronComponent<any>;
-export declare const StyledInput: StyletronComponent<any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
+export declare const StyledInputEnhancer: StyletronComponent<any, any>;
+export declare const StyledStartEnhancer: StyletronComponent<any, any>;
+export declare const StyledEndEnhancer: StyletronComponent<any, any>;
+export declare const StyledInputContainer: StyletronComponent<any, any>;
+export declare const StyledInput: StyletronComponent<any, any>;
diff --git a/src/layout-grid/index.d.ts b/src/layout-grid/index.d.ts
index 2c7d6d751b..420b84a4a3 100644
--- a/src/layout-grid/index.d.ts
+++ b/src/layout-grid/index.d.ts
@@ -94,5 +94,5 @@ export type StyledCellProps = {
 
 export declare const Grid: React.FunctionComponent<GridProps>;
 export declare const Cell: React.FunctionComponent<CellProps>;
-export declare const StyledGrid: StyletronComponent<StyledGridProps>;
-export declare const StyledCell: StyletronComponent<StyledCellProps>;
+export declare const StyledGrid: StyletronComponent<any, StyledGridProps>;
+export declare const StyledCell: StyletronComponent<any, StyledCellProps>;
diff --git a/src/link/index.d.ts b/src/link/index.d.ts
index 07803e079f..0c2af053db 100644
--- a/src/link/index.d.ts
+++ b/src/link/index.d.ts
@@ -10,4 +10,4 @@ export interface LinkProps
   target?: '_self' | '_blank' | '_parent' | '_top';
 }
 
-export declare const StyledLink: StyletronComponent<LinkProps>;
+export declare const StyledLink: StyletronComponent<any, LinkProps>;
diff --git a/src/list/index.d.ts b/src/list/index.d.ts
index 2d0c0f0673..e26f2f63a5 100644
--- a/src/list/index.d.ts
+++ b/src/list/index.d.ts
@@ -73,10 +73,10 @@ export declare const ListItem: React.ForwardRefExoticComponent<
 export declare const ListItemLabel: React.FC<LabelPropsT>;
 export declare const MenuAdapter: React.FC<MenuAdapterPropsT>;
 
-export declare const StyledRoot: StyletronComponent<{}>;
-export declare const StyledContent: StyletronComponent<StyledContentPropsT>;
-export declare const StyledEndEnhancerContainer: StyletronComponent<{}>;
-export declare const StyledArtworkContainer: StyletronComponent<StyledArtworkContainerPropsT>;
+export declare const StyledRoot: StyletronComponent<any, {}>;
+export declare const StyledContent: StyletronComponent<any, StyledContentPropsT>;
+export declare const StyledEndEnhancerContainer: StyletronComponent<any, {}>;
+export declare const StyledArtworkContainer: StyletronComponent<any, StyledArtworkContainerPropsT>;
 
 export interface HeadingPropsT {
   heading: React.ReactNode;
@@ -99,10 +99,13 @@ export declare const ListHeading: React.ForwardRefExoticComponent<
   HeadingPropsT & React.RefAttributes<HTMLLIElement>
 >;
 
-export declare const StyledHeadingRoot: StyletronComponent<{}>;
-export declare const StyledHeadingContent: StyletronComponent<{}>;
-export declare const StyledHeadingContentRow: StyletronComponent<{}>;
-export declare const StyledHeadingMainHeading: StyletronComponent<StyledHeadingHeadingPropsT>;
-export declare const StyledHeadingSubHeading: StyletronComponent<StyledHeadingHeadingPropsT>;
-export declare const StyledHeadingEndEnhancerContainer: StyletronComponent<StyledHeadingEndEnhancerContainerPropsT>;
-export declare const StyledHeadingEndEnhancerDescriptionContainer: StyletronComponent<{}>;
+export declare const StyledHeadingRoot: StyletronComponent<any, {}>;
+export declare const StyledHeadingContent: StyletronComponent<any, {}>;
+export declare const StyledHeadingContentRow: StyletronComponent<any, {}>;
+export declare const StyledHeadingMainHeading: StyletronComponent<any, StyledHeadingHeadingPropsT>;
+export declare const StyledHeadingSubHeading: StyletronComponent<any, StyledHeadingHeadingPropsT>;
+export declare const StyledHeadingEndEnhancerContainer: StyletronComponent<
+  any,
+  StyledHeadingEndEnhancerContainerPropsT
+>;
+export declare const StyledHeadingEndEnhancerDescriptionContainer: StyletronComponent<any, {}>;
diff --git a/src/map-marker/index.js b/src/map-marker/index.js
index 905b182190..8d8c6c2b4b 100644
--- a/src/map-marker/index.js
+++ b/src/map-marker/index.js
@@ -17,6 +17,7 @@ export {
   BADGE_ENHANCER_SIZES,
   LABEL_ENHANCER_POSITIONS,
   KIND,
+  PINHEAD_DIMENSIONS,
 } from './constants.js';
 
 export type * from './types.js';
diff --git a/src/menu/index.d.ts b/src/menu/index.d.ts
index 727a39a5df..a60b5a1959 100644
--- a/src/menu/index.d.ts
+++ b/src/menu/index.d.ts
@@ -200,13 +200,13 @@ export class NestedMenus extends React.Component<NestedMenuProps, NestedMenuStat
   isNestedMenuVisible(ref: React.Ref<HTMLElement>): boolean;
 }
 
-export declare const StyledEmptyState: StyletronComponent<any>;
-export declare const StyledList: StyletronComponent<any>;
-export declare const StyledListItem: StyletronComponent<any>;
-export declare const StyledListItemProfile: StyletronComponent<any>;
-export declare const StyledProfileImgContainer: StyletronComponent<any>;
-export declare const StyledProfileImg: StyletronComponent<any>;
-export declare const StyledProfileLabelsContainer: StyletronComponent<any>;
-export declare const StyledProfileTitle: StyletronComponent<any>;
-export declare const StyledProfileSubtitle: StyletronComponent<any>;
-export declare const StyledProfileBody: StyletronComponent<any>;
+export declare const StyledEmptyState: StyletronComponent<any, any>;
+export declare const StyledList: StyletronComponent<any, any>;
+export declare const StyledListItem: StyletronComponent<any, any>;
+export declare const StyledListItemProfile: StyletronComponent<any, any>;
+export declare const StyledProfileImgContainer: StyletronComponent<any, any>;
+export declare const StyledProfileImg: StyletronComponent<any, any>;
+export declare const StyledProfileLabelsContainer: StyletronComponent<any, any>;
+export declare const StyledProfileTitle: StyletronComponent<any, any>;
+export declare const StyledProfileSubtitle: StyletronComponent<any, any>;
+export declare const StyledProfileBody: StyletronComponent<any, any>;
diff --git a/src/modal/index.d.ts b/src/modal/index.d.ts
index dee103fc31..530a094d7f 100644
--- a/src/modal/index.d.ts
+++ b/src/modal/index.d.ts
@@ -85,10 +85,10 @@ export class ModalButton extends React.Component<ButtonProps & { autoFocus?: boo
 
 export class FocusOnce extends React.Component<{ children: React.ReactNode }> {}
 
-export declare const StyledRoot: StyletronComponent<any>;
-export declare const StyledDialog: StyletronComponent<any>;
-export declare const StyledDialogContainer: StyletronComponent<any>;
-export declare const StyledClose: StyletronComponent<any>;
-export declare const ModalHeader: StyletronComponent<any>;
-export declare const ModalBody: StyletronComponent<any>;
-export declare const ModalFooter: StyletronComponent<any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
+export declare const StyledDialog: StyletronComponent<any, any>;
+export declare const StyledDialogContainer: StyletronComponent<any, any>;
+export declare const StyledClose: StyletronComponent<any, any>;
+export declare const ModalHeader: StyletronComponent<any, any>;
+export declare const ModalBody: StyletronComponent<any, any>;
+export declare const ModalFooter: StyletronComponent<any, any>;
diff --git a/src/pagination/index.d.ts b/src/pagination/index.d.ts
index 3b8112354c..3c69d5cc66 100644
--- a/src/pagination/index.d.ts
+++ b/src/pagination/index.d.ts
@@ -87,6 +87,6 @@ export class StatefulContainer extends React.Component<StatefulContainerProps, S
   onPageChange(args: { nextPage: number }): void;
 }
 
-export declare const StyledRoot: StyletronComponent<any>;
-export declare const StyledMaxLabel: StyletronComponent<any>;
-export declare const StyledDropdownContainer: StyletronComponent<any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
+export declare const StyledMaxLabel: StyletronComponent<any, any>;
+export declare const StyledDropdownContainer: StyletronComponent<any, any>;
diff --git a/src/payment-card/index.d.ts b/src/payment-card/index.d.ts
index 4aa0ad2a54..b8dd733523 100644
--- a/src/payment-card/index.d.ts
+++ b/src/payment-card/index.d.ts
@@ -25,4 +25,4 @@ export type StatefulPaymentCardProps = InputProps &
 export declare const StatefulPaymentCard: React.FC<StatefulPaymentCardProps>;
 export class PaymentCard extends React.Component<PaymentCardProps> {}
 
-export declare const StyledIconWrapper: StyletronComponent<any>;
+export declare const StyledIconWrapper: StyletronComponent<any, any>;
diff --git a/src/phone-input/index.d.ts b/src/phone-input/index.d.ts
index bf819c167b..f1394af1a4 100644
--- a/src/phone-input/index.d.ts
+++ b/src/phone-input/index.d.ts
@@ -426,15 +426,15 @@ export interface FlagProps {
 }
 export declare const Flag: React.FC<FlagProps>;
 
-export declare const StyledFlag: StyletronComponent<any>;
-export declare const StyledRoot: StyletronComponent<any>;
-export declare const StyledDialCode: StyletronComponent<any>;
-export declare const StyledCountrySelectContainer: StyletronComponent<any>;
-export declare const StyledCountrySelectDropdownContainer: StyletronComponent<any>;
-export declare const StyledCountrySelectDropdownListItem: StyletronComponent<any>;
-export declare const StyledCountrySelectDropdownFlagColumn: StyletronComponent<any>;
-export declare const StyledCountrySelectDropdownNameColumn: StyletronComponent<any>;
-export declare const StyledCountrySelectDropdownDialcodeColumn: StyletronComponent<any>;
+export declare const StyledFlag: StyletronComponent<any, any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
+export declare const StyledDialCode: StyletronComponent<any, any>;
+export declare const StyledCountrySelectContainer: StyletronComponent<any, any>;
+export declare const StyledCountrySelectDropdownContainer: StyletronComponent<any, any>;
+export declare const StyledCountrySelectDropdownListItem: StyletronComponent<any, any>;
+export declare const StyledCountrySelectDropdownFlagColumn: StyletronComponent<any, any>;
+export declare const StyledCountrySelectDropdownNameColumn: StyletronComponent<any, any>;
+export declare const StyledCountrySelectDropdownDialcodeColumn: StyletronComponent<any, any>;
 
 export declare const DEFAULT_MAX_DROPDOWN_WIDTH: '400px';
 export declare const DEFAULT_MAX_DROPDOWN_HEIGHT: '400px';
diff --git a/src/popover/index.d.ts b/src/popover/index.d.ts
index e304ebca28..76bf08a3e4 100644
--- a/src/popover/index.d.ts
+++ b/src/popover/index.d.ts
@@ -177,10 +177,10 @@ export class Popover extends React.Component<PopoverProps, PopoverPrivateState>
   renderPopover(): React.ReactNode;
 }
 
-export declare const StyledArrow: StyletronComponent<any>;
-export declare const StyledBody: StyletronComponent<any>;
-export declare const StyledInner: StyletronComponent<any>;
-export declare const StyledPadding: StyletronComponent<any>;
+export declare const StyledArrow: StyletronComponent<any, any>;
+export declare const StyledBody: StyletronComponent<any, any>;
+export declare const StyledInner: StyletronComponent<any, any>;
+export declare const StyledPadding: StyletronComponent<any, any>;
 
 export declare const POPOVER_MARGIN: 8;
 export declare const ARROW_SIZE: 6;
diff --git a/src/progress-bar/index.d.ts b/src/progress-bar/index.d.ts
index 9bfe6cc8cf..8003b272ec 100644
--- a/src/progress-bar/index.d.ts
+++ b/src/progress-bar/index.d.ts
@@ -49,9 +49,9 @@ export interface ProgressBarRoundedProps {
 }
 export declare const ProgressBarRounded: React.FC<ProgressBarRoundedProps>;
 
-export declare const StyledRoot: StyletronComponent<any>;
-export declare const StyledBarContainer: StyletronComponent<any>;
-export declare const StyledBar: StyletronComponent<any>;
-export declare const StyledBarProgress: StyletronComponent<any>;
-export declare const StyledInfiniteBar: StyletronComponent<any>;
-export declare const StyledLabel: StyletronComponent<any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
+export declare const StyledBarContainer: StyletronComponent<any, any>;
+export declare const StyledBar: StyletronComponent<any, any>;
+export declare const StyledBarProgress: StyletronComponent<any, any>;
+export declare const StyledInfiniteBar: StyletronComponent<any, any>;
+export declare const StyledLabel: StyletronComponent<any, any>;
diff --git a/src/progress-steps/index.d.ts b/src/progress-steps/index.d.ts
index 35ca5a666d..52be444118 100644
--- a/src/progress-steps/index.d.ts
+++ b/src/progress-steps/index.d.ts
@@ -58,14 +58,14 @@ export interface StyleProps {
   $isCompleted?: boolean;
   $disabled?: boolean;
 }
-export declare const StyledProgressSteps: StyletronComponent<StyleProps>;
-export declare const StyledStep: StyletronComponent<StyleProps>;
-export declare const StyledIcon: StyletronComponent<StyleProps>;
-export declare const StyledInnerIcon: StyletronComponent<StyleProps>;
-export declare const StyledContent: StyletronComponent<StyleProps>;
-export declare const StyledContentTitle: StyletronComponent<StyleProps>;
-export declare const StyledContentTail: StyletronComponent<StyleProps>;
-export declare const StyledContentDescription: StyletronComponent<StyleProps>;
-export declare const StyledNumberStep: StyletronComponent<StyleProps>;
-export declare const StyledNumberIcon: StyletronComponent<StyleProps>;
-export declare const StyledNumberContentTail: StyletronComponent<StyleProps>;
+export declare const StyledProgressSteps: StyletronComponent<any, StyleProps>;
+export declare const StyledStep: StyletronComponent<any, StyleProps>;
+export declare const StyledIcon: StyletronComponent<any, StyleProps>;
+export declare const StyledInnerIcon: StyletronComponent<any, StyleProps>;
+export declare const StyledContent: StyletronComponent<any, StyleProps>;
+export declare const StyledContentTitle: StyletronComponent<any, StyleProps>;
+export declare const StyledContentTail: StyletronComponent<any, StyleProps>;
+export declare const StyledContentDescription: StyletronComponent<any, StyleProps>;
+export declare const StyledNumberStep: StyletronComponent<any, StyleProps>;
+export declare const StyledNumberIcon: StyletronComponent<any, StyleProps>;
+export declare const StyledNumberContentTail: StyletronComponent<any, StyleProps>;
diff --git a/src/radio/index.d.ts b/src/radio/index.d.ts
index 5a70ad5579..9c252b0c94 100644
--- a/src/radio/index.d.ts
+++ b/src/radio/index.d.ts
@@ -125,10 +125,10 @@ export class Radio extends React.Component<RadioProps, RadioState> {
   onBlur(event: React.FocusEvent<HTMLInputElement>): void;
 }
 
-export declare const StyledRoot: StyletronComponent<any>;
-export declare const StyledLabel: StyletronComponent<any>;
-export declare const StyledInput: StyletronComponent<any>;
-export declare const StyledDescription: StyletronComponent<any>;
-export declare const StyledRadioMarkInner: StyletronComponent<any>;
-export declare const StyledRadioMarkOuter: StyletronComponent<any>;
-export declare const StyledRadioGroupRoot: StyletronComponent<any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
+export declare const StyledLabel: StyletronComponent<any, any>;
+export declare const StyledInput: StyletronComponent<any, any>;
+export declare const StyledDescription: StyletronComponent<any, any>;
+export declare const StyledRadioMarkInner: StyletronComponent<any, any>;
+export declare const StyledRadioMarkOuter: StyletronComponent<any, any>;
+export declare const StyledRadioGroupRoot: StyletronComponent<any, any>;
diff --git a/src/rating/index.d.ts b/src/rating/index.d.ts
index 9325d1aa84..20119d85e3 100644
--- a/src/rating/index.d.ts
+++ b/src/rating/index.d.ts
@@ -48,6 +48,6 @@ export interface StyledRatingItemProps {
   $isSelected: boolean;
   $index: number;
 }
-export declare const StyledRoot: StyletronComponent<StyledRootProps>;
-export declare const StyledStar: StyletronComponent<StyledRatingItemProps>;
-export declare const StyledEmoticon: StyletronComponent<StyledRatingItemProps>;
+export declare const StyledRoot: StyletronComponent<any, StyledRootProps>;
+export declare const StyledStar: StyletronComponent<any, StyledRatingItemProps>;
+export declare const StyledEmoticon: StyletronComponent<any, StyledRatingItemProps>;
diff --git a/src/select/index.d.ts b/src/select/index.d.ts
index 874480b0b7..844bc6e36d 100644
--- a/src/select/index.d.ts
+++ b/src/select/index.d.ts
@@ -308,19 +308,19 @@ export class StatefulSelectContainer extends React.Component<StatefulContainerPr
   internalSetState(params: OnChangeParams): void;
 }
 
-export declare const StyledRoot: StyletronComponent<any>;
-export declare const StyledControlContainer: StyletronComponent<any>;
-export declare const StyledValueContainer: StyletronComponent<any>;
-export declare const StyledPlaceholder: StyletronComponent<any>;
-export declare const StyledSingleValue: StyletronComponent<any>;
-export declare const StyledInputContainer: StyletronComponent<any>;
-export declare const StyledInput: StyletronComponent<any>;
-export declare const StyledInputSizer: StyletronComponent<any>;
-export declare const StyledIconsContainer: StyletronComponent<any>;
-export declare const StyledSelectArrow: StyletronComponent<any>;
-export declare const StyledClearIcon: StyletronComponent<any>;
-export declare const StyledSearchIconContainer: StyletronComponent<any>;
-export declare const StyledDropdownContainer: StyletronComponent<any>;
-export declare const StyledDropdown: StyletronComponent<any>;
-export declare const StyledDropdownListItem: StyletronComponent<any>;
-export declare const StyledOptionContent: StyletronComponent<any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
+export declare const StyledControlContainer: StyletronComponent<any, any>;
+export declare const StyledValueContainer: StyletronComponent<any, any>;
+export declare const StyledPlaceholder: StyletronComponent<any, any>;
+export declare const StyledSingleValue: StyletronComponent<any, any>;
+export declare const StyledInputContainer: StyletronComponent<any, any>;
+export declare const StyledInput: StyletronComponent<any, any>;
+export declare const StyledInputSizer: StyletronComponent<any, any>;
+export declare const StyledIconsContainer: StyletronComponent<any, any>;
+export declare const StyledSelectArrow: StyletronComponent<any, any>;
+export declare const StyledClearIcon: StyletronComponent<any, any>;
+export declare const StyledSearchIconContainer: StyletronComponent<any, any>;
+export declare const StyledDropdownContainer: StyletronComponent<any, any>;
+export declare const StyledDropdown: StyletronComponent<any, any>;
+export declare const StyledDropdownListItem: StyletronComponent<any, any>;
+export declare const StyledOptionContent: StyletronComponent<any, any>;
diff --git a/src/side-navigation/index.d.ts b/src/side-navigation/index.d.ts
index 04731d0c5e..1177382349 100644
--- a/src/side-navigation/index.d.ts
+++ b/src/side-navigation/index.d.ts
@@ -53,8 +53,8 @@ export class NavItem extends React.Component<NavItemProps> {
   handleKeyDown(event: React.KeyboardEvent): void;
 }
 
-export declare const StyledRoot: StyletronComponent<any>;
-export declare const StyledNavItemContainer: StyletronComponent<any>;
-export declare const StyledNavLink: StyletronComponent<any>;
-export declare const StyledNavItem: StyletronComponent<any>;
-export declare const StyledSubNavContainer: StyletronComponent<any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
+export declare const StyledNavItemContainer: StyletronComponent<any, any>;
+export declare const StyledNavLink: StyletronComponent<any, any>;
+export declare const StyledNavItem: StyletronComponent<any, any>;
+export declare const StyledSubNavContainer: StyletronComponent<any, any>;
diff --git a/src/slider/index.d.ts b/src/slider/index.d.ts
index dff9fd69b4..294529e75c 100644
--- a/src/slider/index.d.ts
+++ b/src/slider/index.d.ts
@@ -82,11 +82,11 @@ export class StatefulContainer extends React.Component<StatefulContainerProps, S
   internalSetState(type: 'change', { value }: State): void;
 }
 
-export declare const StyledRoot: StyletronComponent<any>;
-export declare const StyledTrack: StyletronComponent<any>;
-export declare const StyledInnerTrack: StyletronComponent<any>;
-export declare const StyledThumb: StyletronComponent<any>;
-export declare const StyledInnerThumb: StyletronComponent<any>;
-export declare const StyledTick: StyletronComponent<any>;
-export declare const StyledTickBar: StyletronComponent<any>;
-export declare const StyledMark: StyletronComponent<any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
+export declare const StyledTrack: StyletronComponent<any, any>;
+export declare const StyledInnerTrack: StyletronComponent<any, any>;
+export declare const StyledThumb: StyletronComponent<any, any>;
+export declare const StyledInnerThumb: StyletronComponent<any, any>;
+export declare const StyledTick: StyletronComponent<any, any>;
+export declare const StyledTickBar: StyletronComponent<any, any>;
+export declare const StyledMark: StyletronComponent<any, any>;
diff --git a/src/spinner/index.d.ts b/src/spinner/index.d.ts
index d01563ce9f..474219a32d 100644
--- a/src/spinner/index.d.ts
+++ b/src/spinner/index.d.ts
@@ -14,4 +14,4 @@ export interface SpinnerProps {
   $size?: number | string | SIZE | Sizing;
 }
 
-export declare const Spinner: StyletronComponent<SpinnerProps>;
+export declare const Spinner: StyletronComponent<any, SpinnerProps>;
diff --git a/src/styles/index.d.ts b/src/styles/index.d.ts
index 524489b14a..27965b71de 100644
--- a/src/styles/index.d.ts
+++ b/src/styles/index.d.ts
@@ -37,10 +37,10 @@ export interface Theme {
 type UseStyletronFn<Theme> = () => [(arg: StyleObject) => string, Theme];
 export function createThemedUseStyletron<Theme>(): UseStyletronFn<Theme>;
 export declare const useStyletron: UseStyletronFn<Theme>;
-export function withWrapper<C extends StyletronComponent<any>, P extends object>(
+export function withWrapper<C extends StyletronComponent<any, any>, P extends object>(
   component: C,
   wrapper: (component: C) => React.ComponentType<P>
-): StyletronComponent<React.ComponentProps<C> & P>;
+): StyletronComponent<C, P>;
 
 export function styled<
   P extends object,
@@ -49,30 +49,26 @@ export function styled<
 >(
   component: C,
   styledFn: StyleObject | ((props: { $theme: T } & P) => StyleObject)
-): StyletronComponent<
-  Pick<React.ComponentProps<C>, Exclude<keyof React.ComponentProps<C>, { className: string }>> & P
->;
-export function withStyle<C extends StyletronComponent<any>, P extends object, T = Theme>(
+): StyletronComponent<C, P>;
+export function withStyle<C extends StyletronComponent<any, any>, P extends object, T = Theme>(
   component: C,
   styledFn: StyleObject | ((props: { $theme: T } & P) => StyleObject)
-): StyletronComponent<React.ComponentProps<C> & P>;
+): StyletronComponent<C, P>;
 
 export interface StyledFn<T> extends StyletronStyledFn {
   <C extends keyof JSX.IntrinsicElements | React.ComponentType<any>, P extends object>(
     component: C,
     style: (props: { $theme: T } & P) => StyleObject
-  ): StyletronComponent<
-    Pick<React.ComponentProps<C>, Exclude<keyof React.ComponentProps<C>, { className: string }>> & P
-  >;
+  ): StyletronComponent<C, P>;
 }
 
 export function createThemedStyled<Theme>(): StyledFn<Theme>;
 
 export interface WithStyleFn<T = Theme> extends StyletronWithStyleFn {
-  <C extends StyletronComponent<any>, P extends object, T1 = T>(
+  <C extends StyletronComponent<any, any>, P extends object, T1 = T>(
     component: C,
     style: (props: P & { $theme: T1 }) => StyleObject
-  ): StyletronComponent<React.ComponentProps<C> & P>;
+  ): StyletronComponent<C, P>;
 }
 
 export function createThemedWithStyle<Theme>(): WithStyleFn<Theme>;
diff --git a/src/table-grid/index.d.ts b/src/table-grid/index.d.ts
index d08e552925..66a6d52e2f 100644
--- a/src/table-grid/index.d.ts
+++ b/src/table-grid/index.d.ts
@@ -1,7 +1,7 @@
 import { StyletronComponent } from 'styletron-react';
 import { SORT_DIRECTION, SortableHeadCell } from '../table/';
 
-export declare const StyledTable: StyletronComponent<any>;
-export declare const StyledHeadCell: StyletronComponent<any>;
-export declare const StyledBodyCell: StyletronComponent<any>;
+export declare const StyledTable: StyletronComponent<any, any>;
+export declare const StyledHeadCell: StyletronComponent<any, any>;
+export declare const StyledBodyCell: StyletronComponent<any, any>;
 export { SORT_DIRECTION, SortableHeadCell };
diff --git a/src/table-semantic/index.d.ts b/src/table-semantic/index.d.ts
index aca552bf9d..274b30d3fd 100644
--- a/src/table-semantic/index.d.ts
+++ b/src/table-semantic/index.d.ts
@@ -81,17 +81,17 @@ export interface TableBuilderColumnProps<RowT> {
 }
 export class TableBuilderColumn<RowT> extends React.Component<TableBuilderColumnProps<RowT>> {}
 
-export declare const StyledRoot: StyletronComponent<any>;
-export declare const StyledTable: StyletronComponent<any>;
-export declare const StyledTableHead: StyletronComponent<any>;
-export declare const StyledTableHeadRow: StyletronComponent<any>;
-export declare const StyledTableHeadCell: StyletronComponent<any>;
-export declare const StyledTableHeadCellSortable: StyletronComponent<any>;
-export declare const StyledTableBody: StyletronComponent<any>;
-export declare const StyledTableBodyRow: StyletronComponent<any>;
-export declare const StyledTableBodyCell: StyletronComponent<any>;
-export declare const StyledTableLoadingMessage: StyletronComponent<any>;
-export declare const StyledTableEmptyMessage: StyletronComponent<any>;
-export declare const StyledSortAscIcon: StyletronComponent<any>;
-export declare const StyledSortDescIcon: StyletronComponent<any>;
-export declare const StyledSortNoneIcon: StyletronComponent<any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
+export declare const StyledTable: StyletronComponent<any, any>;
+export declare const StyledTableHead: StyletronComponent<any, any>;
+export declare const StyledTableHeadRow: StyletronComponent<any, any>;
+export declare const StyledTableHeadCell: StyletronComponent<any, any>;
+export declare const StyledTableHeadCellSortable: StyletronComponent<any, any>;
+export declare const StyledTableBody: StyletronComponent<any, any>;
+export declare const StyledTableBodyRow: StyletronComponent<any, any>;
+export declare const StyledTableBodyCell: StyletronComponent<any, any>;
+export declare const StyledTableLoadingMessage: StyletronComponent<any, any>;
+export declare const StyledTableEmptyMessage: StyletronComponent<any, any>;
+export declare const StyledSortAscIcon: StyletronComponent<any, any>;
+export declare const StyledSortDescIcon: StyletronComponent<any, any>;
+export declare const StyledSortNoneIcon: StyletronComponent<any, any>;
diff --git a/src/table/index.d.ts b/src/table/index.d.ts
index fb7640581b..0a5ea65828 100644
--- a/src/table/index.d.ts
+++ b/src/table/index.d.ts
@@ -54,15 +54,15 @@ export interface FilterProps {
 }
 export declare const Filter: React.FC<FilterProps>;
 
-export declare const StyledTable: StyletronComponent<any>;
-export declare const StyledFilterButton: StyletronComponent<any>;
-export declare const StyledFilterContent: StyletronComponent<any>;
-export declare const StyledFilterHeading: StyletronComponent<any>;
-export declare const StyledFilterFooter: StyletronComponent<any>;
-export declare const StyledHead: StyletronComponent<any>;
-export declare const StyledHeadCell: StyletronComponent<any>;
-export declare const StyledBody: StyletronComponent<any>;
-export declare const StyledRow: StyletronComponent<any>;
-export declare const StyledCell: StyletronComponent<any>;
-export declare const StyledAction: StyletronComponent<any>;
-export declare const StyledSortableLabel: StyletronComponent<any>;
+export declare const StyledTable: StyletronComponent<any, any>;
+export declare const StyledFilterButton: StyletronComponent<any, any>;
+export declare const StyledFilterContent: StyletronComponent<any, any>;
+export declare const StyledFilterHeading: StyletronComponent<any, any>;
+export declare const StyledFilterFooter: StyletronComponent<any, any>;
+export declare const StyledHead: StyletronComponent<any, any>;
+export declare const StyledHeadCell: StyletronComponent<any, any>;
+export declare const StyledBody: StyletronComponent<any, any>;
+export declare const StyledRow: StyletronComponent<any, any>;
+export declare const StyledCell: StyletronComponent<any, any>;
+export declare const StyledAction: StyletronComponent<any, any>;
+export declare const StyledSortableLabel: StyletronComponent<any, any>;
diff --git a/src/tabs-motion/index.d.ts b/src/tabs-motion/index.d.ts
index a0cce0d1f6..5bd7c8926e 100644
--- a/src/tabs-motion/index.d.ts
+++ b/src/tabs-motion/index.d.ts
@@ -30,13 +30,13 @@ export declare const isRTL: (direction: string) => boolean;
 
 // styled-components
 
-export declare const StyledRoot: StyletronComponent<any>;
-export declare const StyledTabList: StyletronComponent<any>;
-export declare const StyledTab: StyletronComponent<any>;
-export declare const StyledArtworkContainer: StyletronComponent<any>;
-export declare const StyledTabBorder: StyletronComponent<any>;
-export declare const StyledTabHighlight: StyletronComponent<any>;
-export declare const StyledTabPanel: StyletronComponent<any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
+export declare const StyledTabList: StyletronComponent<any, any>;
+export declare const StyledTab: StyletronComponent<any, any>;
+export declare const StyledArtworkContainer: StyletronComponent<any, any>;
+export declare const StyledTabBorder: StyletronComponent<any, any>;
+export declare const StyledTabHighlight: StyletronComponent<any, any>;
+export declare const StyledTabPanel: StyletronComponent<any, any>;
 
 // tabs
 
diff --git a/src/tabs/index.d.ts b/src/tabs/index.d.ts
index 9410037a89..5c2d761d4d 100644
--- a/src/tabs/index.d.ts
+++ b/src/tabs/index.d.ts
@@ -85,7 +85,7 @@ export class Tab extends React.Component<TabProps> {
   getSharedProps(): SharedProps;
 }
 
-export declare const StyledRoot: StyletronComponent<any>;
-export declare const StyledTab: StyletronComponent<any>;
-export declare const StyledTabBar: StyletronComponent<any>;
-export declare const StyledTabContent: StyletronComponent<any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
+export declare const StyledTab: StyletronComponent<any, any>;
+export declare const StyledTabBar: StyletronComponent<any, any>;
+export declare const StyledTabContent: StyletronComponent<any, any>;
diff --git a/src/tag/index.d.ts b/src/tag/index.d.ts
index d37a20d86f..5855ec7187 100644
--- a/src/tag/index.d.ts
+++ b/src/tag/index.d.ts
@@ -65,6 +65,6 @@ export class Tag extends React.Component<TagProps> {
   handleActionKeyDown(event: KeyboardEvent): void;
 }
 
-export declare const StyledRoot: StyletronComponent<any>;
-export declare const StyledAction: StyletronComponent<any>;
-export declare const StyledText: StyletronComponent<any>;
+export declare const StyledRoot: StyletronComponent<any, any>;
+export declare const StyledAction: StyletronComponent<any, any>;
+export declare const StyledText: StyletronComponent<any, any>;
diff --git a/src/textarea/index.d.ts b/src/textarea/index.d.ts
index 6d53af05bb..72c32f86ab 100644
--- a/src/textarea/index.d.ts
+++ b/src/textarea/index.d.ts
@@ -33,7 +33,7 @@ export declare const StatefulTextarea: React.FC<StatefulTextareaProps>;
 
 export { StatefulContainer };
 
-export declare const StyledTextareaContainer: StyletronComponent<any>;
-export declare const StyledTextarea: StyletronComponent<any>;
+export declare const StyledTextareaContainer: StyletronComponent<any, any>;
+export declare const StyledTextarea: StyletronComponent<any, any>;
 
 export { STATE_CHANGE_TYPE };
diff --git a/src/toast/index.d.ts b/src/toast/index.d.ts
index 4f0bfa3aef..fda23b5deb 100644
--- a/src/toast/index.d.ts
+++ b/src/toast/index.d.ts
@@ -118,6 +118,6 @@ export class Toast extends React.Component<ToastProps, ToastPrivateState> {
   getSharedProps(): Readonly<SharedStylePropsArg>;
 }
 
-export declare const Root: StyletronComponent<any>;
-export declare const Body: StyletronComponent<any>;
-export declare const CloseIconSvg: StyletronComponent<any>;
+export declare const Root: StyletronComponent<any, any>;
+export declare const Body: StyletronComponent<any, any>;
+export declare const CloseIconSvg: StyletronComponent<any, any>;
diff --git a/src/tooltip/index.d.ts b/src/tooltip/index.d.ts
index 520f6a7d8d..65ac5093c6 100644
--- a/src/tooltip/index.d.ts
+++ b/src/tooltip/index.d.ts
@@ -21,6 +21,6 @@ export { ACCESSIBILITY_TYPE, PLACEMENT, TRIGGER_TYPE };
 export type TooltipProps = PopoverProps;
 export class Tooltip extends React.Component<TooltipProps> {}
 
-export declare const StyledArrow: StyletronComponent<any>;
-export declare const StyledBody: StyletronComponent<any>;
-export declare const StyledInner: StyletronComponent<any>;
+export declare const StyledArrow: StyletronComponent<any, any>;
+export declare const StyledBody: StyletronComponent<any, any>;
+export declare const StyledInner: StyletronComponent<any, any>;
diff --git a/src/tree-view/index.d.ts b/src/tree-view/index.d.ts
index 2bddb58191..e7a83a61fe 100644
--- a/src/tree-view/index.d.ts
+++ b/src/tree-view/index.d.ts
@@ -62,10 +62,10 @@ export declare const StatefulTreeView: React.FC<TreeViewProps>;
 
 export declare const TreeLabel: React.FC<TreeLabelProps>;
 
-export declare const StyledTreeItemList: StyletronComponent<any>;
-export declare const StyledTreeItem: StyletronComponent<any>;
-export declare const StyledItemContent: StyletronComponent<any>;
-export declare const StyledIconContainer: StyletronComponent<any>;
+export declare const StyledTreeItemList: StyletronComponent<any, any>;
+export declare const StyledTreeItem: StyletronComponent<any, any>;
+export declare const StyledItemContent: StyletronComponent<any, any>;
+export declare const StyledIconContainer: StyletronComponent<any, any>;
 
 type TGetId = (node: TreeNode) => string | number;
 type toggleIsExpandedT = (data: TreeNode[], toggledNode: TreeNode, getId?: TGetId) => TreeNode[];
diff --git a/yarn.lock b/yarn.lock
index 58645df95d..4e032aebc8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4335,28 +4335,6 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
   integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==
 
-"@types/styletron-engine-atomic@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/@types/styletron-engine-atomic/-/styletron-engine-atomic-1.1.1.tgz#032dabd5ccea1b8601521ad38616a7a9f0af5404"
-  integrity sha512-Jthl51uLiVZHkY0HRBGtDOjjtI4H0nYaERZtzzdDgnJSa+PqQG55ScMQPmSAu6ikzYWp6+jJbbtuIX+TqVfFeg==
-  dependencies:
-    "@types/styletron-standard" "*"
-
-"@types/styletron-react@^5.0.3":
-  version "5.0.3"
-  resolved "https://registry.npmjs.org/@types/styletron-react/-/styletron-react-5.0.3.tgz#54d6e9acefb692355b35132b9f5276cc5cac00f6"
-  integrity sha512-mNM8WrFrCYWXNxudjdMMeHZmGdXLfVF/fQmj1Qnz7E99niL2d7IcQubbx731FX3YEVGoF9Au1J6uBkPoEzqypw==
-  dependencies:
-    "@types/react" "*"
-    "@types/styletron-standard" "*"
-
-"@types/styletron-standard@*", "@types/styletron-standard@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/@types/styletron-standard/-/styletron-standard-2.0.2.tgz#1e4f1977555e0b4612af0f5f420e8c777640b124"
-  integrity sha512-ZpPB8k2Yhskq/oggg2wjWeP/bBxRDfwIzRrHbdksVOQXfHOLf4rRqs2tlWLK/NRJvWU3E3MlXeNcoVSZjuAPiQ==
-  dependencies:
-    csstype "^3.0.2"
-
 "@types/tapable@^1":
   version "1.0.8"
   resolved "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.8.tgz#b94a4391c85666c7b73299fd3ad79d4faa435310"
@@ -8202,10 +8180,10 @@ csstype@^2.5.7:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.6.tgz#c34f8226a94bbb10c32cc0d714afdf942291fc41"
   integrity sha512-RpFbQGUE74iyPgvr46U9t1xoQBM8T4BL8SxrN66Le2xYAPSaDJJKeztV3awugusb3g3G9iL8StmkBBXhcbbXhg==
 
-csstype@^3.0.2:
-  version "3.0.10"
-  resolved "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5"
-  integrity sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==
+csstype@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz#4ddcac3718d787cf9df0d1b7d15033925c8f29f2"
+  integrity sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==
 
 currently-unhandled@^0.4.1:
   version "0.4.1"
@@ -18573,28 +18551,29 @@ styled-jsx@3.3.2:
     stylis "3.5.4"
     stylis-rule-sheet "0.0.10"
 
-styletron-engine-atomic@^1.4.3:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/styletron-engine-atomic/-/styletron-engine-atomic-1.4.4.tgz#4522b17a11654672d93489b7bce2220dd2842924"
-  integrity sha512-GMNB7xmmFuP67JLfRYC52MZepP7cp+hveHX6eTvQfS/4zDXLudvPT8Skr6wFOdAqMLSlCHwzjEp8En2Ebg32uA==
+styletron-engine-atomic@^1.5.0-beta.1:
+  version "1.5.0-beta.1"
+  resolved "https://registry.npmjs.org/styletron-engine-atomic/-/styletron-engine-atomic-1.5.0-beta.1.tgz#dcf8845193b5cf49158ad5fc5c040d65da3ff12f"
+  integrity sha512-wpGK9uTjfnnCYm9pJOBEvPP14qqrylBUgDo3MOFgMAL4jSmDlxEcVu0G2qR0hdKu7ri0PiLu4x6ZSHPoWApMHA==
   dependencies:
     inline-style-prefixer "^5.1.0"
-    styletron-standard "^3.0.4"
+    styletron-standard "^3.1.0-beta.1"
 
-styletron-react@^5.2.4:
-  version "5.2.7"
-  resolved "https://registry.yarnpkg.com/styletron-react/-/styletron-react-5.2.7.tgz#7aa283a0b06787024f96289480c60bafed5048cf"
-  integrity sha512-PUUf7MAv9aaO8oT0B4ryPreeLi3BT1kQ7WIDNhkkpLkvCzk+pOvmtaZJJZRIxWPimj8756rLZqpF7/2ssF9KhQ==
+styletron-react@^6.1.0-beta.1:
+  version "6.1.0-beta.1"
+  resolved "https://registry.npmjs.org/styletron-react/-/styletron-react-6.1.0-beta.1.tgz#8e8bb4f83b507e364982922f9842c554f026567b"
+  integrity sha512-x9Zx2GyDEWF9eJyqjt4dUUbvRH+q65xoaBss04jYfCxzGXpV1HnxFlX7a77VWpnnzj+yCm5ArFqI1Ntl3RzjQA==
   dependencies:
     prop-types "^15.6.0"
-    styletron-standard "^3.0.4"
+    styletron-standard "^3.1.0-beta.1"
 
-styletron-standard@^3.0.3, styletron-standard@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/styletron-standard/-/styletron-standard-3.0.4.tgz#2b286752f464e4c9824faaee466013aa8f13cf6b"
-  integrity sha512-AozOYUEtB5m0s+6ieLCObqYsBitLJmag3IoD/yg0Y9X32AYKwtGO4emx9cljD25k2S/R1XmLPgThOU+orjXTKg==
+styletron-standard@^3.1.0-beta.1:
+  version "3.1.0-beta.1"
+  resolved "https://registry.npmjs.org/styletron-standard/-/styletron-standard-3.1.0-beta.1.tgz#0dc57728ad0d718f033bd3198bb29ef52fdec9d6"
+  integrity sha512-xaYLAhxH+LjhpkMTNjUzPKRoes+Luqq74adwT1fy01O8P7c1gHqTNOJBSjLrA8KUEgiF7dkZVzHOTnpNkeKDqg==
   dependencies:
     "@rtsao/csstype" "2.6.5-forked.0"
+    csstype "^3.0.0"
     inline-style-prefixer "^5.1.0"
 
 stylis-rule-sheet@0.0.10: