diff --git a/src/core/client/ui/components/BaseButton/index.ts b/src/core/client/ui/components/BaseButton/index.ts
index 3c9664e0a..53e4924d5 100644
--- a/src/core/client/ui/components/BaseButton/index.ts
+++ b/src/core/client/ui/components/BaseButton/index.ts
@@ -1,2 +1 @@
-export * from "./BaseButton";
-export { default } from "./BaseButton";
+export { default, BaseButtonProps } from "./BaseButton";
diff --git a/src/core/client/ui/components/Flex/Flex.tsx b/src/core/client/ui/components/Flex/Flex.tsx
index 38d1eb4d2..2824c4ac7 100644
--- a/src/core/client/ui/components/Flex/Flex.tsx
+++ b/src/core/client/ui/components/Flex/Flex.tsx
@@ -4,6 +4,7 @@ import { StatelessComponent } from "react";
 
 import { pascalCase } from "talk-common/utils";
 import { withForwardRef, withStyles } from "talk-ui/hocs";
+import { PropTypesOf } from "talk-ui/types";
 
 import * as styles from "./Flex.css";
 
@@ -75,4 +76,6 @@ Flex.defaultProps = {
   alignItems: "center",
 };
 
-export default withForwardRef(withStyles(styles)(Flex));
+const enhanced = withForwardRef(withStyles(styles)(Flex));
+export default enhanced;
+export type FlexProps = PropTypesOf<typeof enhanced>;
diff --git a/src/core/client/ui/components/Flex/index.ts b/src/core/client/ui/components/Flex/index.ts
index 27e09f37b..434836f6d 100644
--- a/src/core/client/ui/components/Flex/index.ts
+++ b/src/core/client/ui/components/Flex/index.ts
@@ -1,2 +1 @@
-export * from "./Flex";
-export { default } from "./Flex";
+export { default, FlexProps } from "./Flex";
diff --git a/src/core/client/ui/components/Icon/index.ts b/src/core/client/ui/components/Icon/index.ts
index 3e8146f8b..d3ba5da55 100644
--- a/src/core/client/ui/components/Icon/index.ts
+++ b/src/core/client/ui/components/Icon/index.ts
@@ -1,2 +1 @@
-export * from "./Icon";
-export { default } from "./Icon";
+export { default, IconProps } from "./Icon";
diff --git a/src/core/client/ui/components/MatchMedia/MatchMedia.tsx b/src/core/client/ui/components/MatchMedia/MatchMedia.tsx
index 43d900dfe..8df6cff34 100644
--- a/src/core/client/ui/components/MatchMedia/MatchMedia.tsx
+++ b/src/core/client/ui/components/MatchMedia/MatchMedia.tsx
@@ -2,6 +2,8 @@ import React from "react";
 import { ReactNode, StatelessComponent } from "react";
 import Responsive, { MediaQueryMatchers } from "react-responsive";
 
+import { PropTypesOf } from "talk-ui/types";
+
 import theme from "../../theme/variables";
 import UIContext from "../UIContext";
 
@@ -45,3 +47,4 @@ const MatchMediaWithContext: StatelessComponent<InnerProps> = props => (
 );
 
 export default MatchMediaWithContext;
+export type MatchMediaProps = PropTypesOf<typeof MatchMediaWithContext>;
diff --git a/src/core/client/ui/components/MatchMedia/index.ts b/src/core/client/ui/components/MatchMedia/index.ts
index 71f16f6f8..66da09460 100644
--- a/src/core/client/ui/components/MatchMedia/index.ts
+++ b/src/core/client/ui/components/MatchMedia/index.ts
@@ -1,2 +1 @@
-export * from "./MatchMedia";
-export { default } from "./MatchMedia";
+export { default, MatchMediaProps } from "./MatchMedia";
diff --git a/src/core/client/ui/components/RelativeTime/index.ts b/src/core/client/ui/components/RelativeTime/index.ts
index 8bc2dfb5e..90bd4c0ca 100644
--- a/src/core/client/ui/components/RelativeTime/index.ts
+++ b/src/core/client/ui/components/RelativeTime/index.ts
@@ -1,2 +1 @@
-export * from "./RelativeTime";
-export { default } from "./RelativeTime";
+export { default, RelativeTimeProps } from "./RelativeTime";
diff --git a/src/core/client/ui/components/TrapFocus/index.ts b/src/core/client/ui/components/TrapFocus/index.ts
index 965ecf53a..2bb55f23d 100644
--- a/src/core/client/ui/components/TrapFocus/index.ts
+++ b/src/core/client/ui/components/TrapFocus/index.ts
@@ -1,2 +1 @@
-export * from "./TrapFocus";
-export { default } from "./TrapFocus";
+export { default, TrapFocusProps } from "./TrapFocus";
diff --git a/src/core/client/ui/components/Typography/Typography.tsx b/src/core/client/ui/components/Typography/Typography.tsx
index cc3ddf002..c02bb5cf3 100644
--- a/src/core/client/ui/components/Typography/Typography.tsx
+++ b/src/core/client/ui/components/Typography/Typography.tsx
@@ -144,5 +144,5 @@ Typography.defaultProps = {
 };
 
 const enhanced = withForwardRef(withStyles(styles)(Typography));
-export type CenterProps = PropTypesOf<typeof enhanced>;
+export type TypographyProps = PropTypesOf<typeof enhanced>;
 export default enhanced;
diff --git a/src/core/client/ui/components/Typography/index.ts b/src/core/client/ui/components/Typography/index.ts
index 1557f9552..45ed99c30 100644
--- a/src/core/client/ui/components/Typography/index.ts
+++ b/src/core/client/ui/components/Typography/index.ts
@@ -1,2 +1 @@
-export * from "./Typography";
-export { default } from "./Typography";
+export { default, TypographyProps } from "./Typography";