From f21ab41244cf42d4ce3b7762c863970f15857ea8 Mon Sep 17 00:00:00 2001
From: Nathan Bierema <nbierema@gmail.com>
Date: Sat, 27 Jun 2020 09:18:26 -0400
Subject: [PATCH] Convert

---
 packages/devui/.babelrc                       |  11 +-
 packages/devui/.eslintignore                  |   2 +
 packages/devui/.eslintrc.js                   |  21 ++
 packages/devui/.prettierignore                |   2 +
 packages/devui/.storybook/config.js           |   6 +-
 packages/devui/.storybook/themeAddon/Panel.js |   2 +-
 packages/devui/.storybook/webpack.config.js   |  14 +-
 packages/devui/package.json                   |  43 ++--
 packages/devui/src/Button/Button.js           |  92 ---------
 packages/devui/src/Button/Button.tsx          | 128 ++++++++++++
 .../devui/src/Button/{index.js => index.ts}   |   0
 .../Button/stories/{index.js => index.tsx}    |  55 +++---
 .../Button/styles/{common.js => common.ts}    |  52 +++--
 .../Button/styles/{default.js => default.ts}  |  23 ++-
 .../src/Button/styles/{index.js => index.ts}  |   0
 .../styles/{material.js => material.ts}       |  10 +-
 .../src/Container/{index.js => index.tsx}     |  21 +-
 .../Container/styles/{index.js => index.ts}   |   0
 .../{ContextMenu.js => ContextMenu.tsx}       |  62 +++---
 packages/devui/src/ContextMenu/index.js       |   1 -
 packages/devui/src/ContextMenu/index.ts       |   1 +
 .../ContextMenu/stories/{data.js => data.ts}  |   0
 .../stories/{index.js => index.tsx}           |   0
 .../ContextMenu/styles/{index.js => index.ts} |  16 +-
 .../src/Dialog/{Dialog.js => Dialog.tsx}      |  84 +++++---
 .../devui/src/Dialog/{index.js => index.ts}   |   0
 .../Dialog/stories/{index.js => index.tsx}    |   0
 .../Dialog/styles/{default.js => default.ts}  |  14 +-
 .../src/Dialog/styles/{index.js => index.ts}  |   0
 .../styles/{material.js => material.ts}       |  10 +-
 packages/devui/src/Editor/Editor.js           |  88 ---------
 packages/devui/src/Editor/Editor.tsx          | 108 ++++++++++
 .../devui/src/Editor/{index.js => index.ts}   |   0
 .../stories/{WithTabs.js => WithTabs.tsx}     |  21 +-
 .../Editor/stories/{index.js => index.tsx}    |   0
 .../src/Editor/styles/{index.js => index.ts}  |   3 +-
 packages/devui/src/Form/{Form.js => Form.tsx} |  44 +++--
 .../devui/src/Form/{index.js => index.ts}     |   0
 .../src/Form/stories/{index.js => index.tsx}  |   0
 packages/devui/src/Form/stories/schema.js     |  89 ---------
 packages/devui/src/Form/stories/schema.ts     |  91 +++++++++
 .../src/Form/styles/{index.js => index.ts}    |   5 +-
 packages/devui/src/Form/widgets.js            |  31 ---
 packages/devui/src/Form/widgets.tsx           |  31 +++
 .../{Notification.js => Notification.tsx}     |  36 ++--
 .../src/Notification/{index.js => index.ts}   |   0
 .../stories/{index.js => index.tsx}           |   3 +-
 .../styles/{index.js => index.ts}             |  12 +-
 ...gmentedControl.js => SegmentedControl.tsx} |  37 ++--
 .../SegmentedControl/{index.js => index.ts}   |   0
 .../stories/{index.js => index.tsx}           |   0
 .../styles/{index.js => index.ts}             |  12 +-
 packages/devui/src/Select/Select.js           |  34 ----
 packages/devui/src/Select/Select.tsx          |  42 ++++
 packages/devui/src/Select/index.js            |   1 -
 packages/devui/src/Select/index.ts            |   1 +
 .../Select/stories/{index.js => index.tsx}    |   0
 .../Select/stories/{options.js => options.ts} |   0
 .../src/Select/styles/{index.js => index.ts}  |  14 +-
 .../src/Slider/{Slider.js => Slider.tsx}      |  47 +++--
 packages/devui/src/Slider/index.js            |   1 -
 packages/devui/src/Slider/index.ts            |   1 +
 .../Slider/stories/{index.js => index.tsx}    |   0
 .../Slider/styles/{common.js => common.ts}    |   5 +-
 .../Slider/styles/{default.js => default.ts}  |  20 +-
 .../src/Slider/styles/{index.js => index.ts}  |   0
 .../styles/{material.js => material.ts}       |  11 +-
 packages/devui/src/Tabs/{Tabs.js => Tabs.tsx} |  71 ++++---
 .../Tabs/{TabsHeader.js => TabsHeader.tsx}    |  95 +++++----
 packages/devui/src/Tabs/index.js              |   1 -
 packages/devui/src/Tabs/index.ts              |   1 +
 .../src/Tabs/stories/{data.js => data.tsx}    |   8 +-
 .../src/Tabs/stories/{index.js => index.tsx}  |  13 +-
 .../src/Tabs/styles/{common.js => common.ts}  |  21 +-
 .../Tabs/styles/{default.js => default.ts}    |  21 +-
 .../src/Tabs/styles/{index.js => index.ts}    |   0
 .../Tabs/styles/{material.js => material.ts}  |  18 +-
 packages/devui/src/Toolbar/index.js           |   3 -
 packages/devui/src/Toolbar/index.ts           |   3 +
 .../Toolbar/stories/{index.js => index.tsx}   | 185 +++++++++++-------
 .../Toolbar/styles/{Divider.js => Divider.ts} |   0
 .../Toolbar/styles/{Spacer.js => Spacer.ts}   |   0
 .../Toolbar/styles/{Toolbar.js => Toolbar.ts} |  19 +-
 packages/devui/src/base16.ts                  |  61 ++++++
 .../{atom-one-dark.js => atom-one-dark.ts}    |   0
 .../colorSchemes/{default.js => default.ts}   |   0
 .../colorSchemes/{dracula.js => dracula.ts}   |   0
 .../src/colorSchemes/{github.js => github.ts} |   0
 .../src/colorSchemes/{index.js => index.ts}   |   0
 .../colorSchemes/{ir-black.js => ir-black.ts} |   0
 .../{macintosh.js => macintosh.ts}            |   0
 .../colorSchemes/{materia.js => materia.ts}   |   0
 .../{oceanic-next.js => oceanic-next.ts}      |   0
 .../devui/src/colorSchemes/{phd.js => phd.ts} |   0
 .../src/colorSchemes/{pico.js => pico.ts}     |   0
 .../{solar-flare.js => solar-flare.ts}        |   0
 .../{spacemacs.js => spacemacs.ts}            |   0
 .../colorSchemes/{unikitty.js => unikitty.ts} |   0
 .../colorSchemes/{woodland.js => woodland.ts} |   0
 packages/devui/src/{index.js => index.ts}     |   2 +-
 packages/devui/src/redux-devtools-themes.ts   |   5 +
 .../src/simple-element-resize-detector.ts     |   6 +
 packages/devui/src/themes/default.js          |  14 --
 packages/devui/src/themes/default.ts          |  34 ++++
 .../devui/src/themes/{index.js => index.ts}   |   0
 .../src/themes/{material.js => material.ts}   |   4 +-
 .../utils/{animations.js => animations.ts}    |   9 +-
 packages/devui/src/utils/autoPrefix.js        |   2 -
 packages/devui/src/utils/autoPrefix.ts        |   5 +
 .../devui/src/utils/{color.js => color.ts}    |  10 +-
 .../devui/src/utils/createStyledComponent.js  |  19 --
 .../devui/src/utils/createStyledComponent.ts  |  92 +++++++++
 .../{invertColors.js => invertColors.ts}      |   4 +-
 .../devui/src/utils/{theme.js => theme.ts}    |  23 ++-
 packages/devui/tests/tsconfig.json            |   4 +
 packages/devui/tsconfig.json                  |   7 +
 116 files changed, 1461 insertions(+), 757 deletions(-)
 create mode 100644 packages/devui/.eslintignore
 create mode 100644 packages/devui/.eslintrc.js
 create mode 100644 packages/devui/.prettierignore
 mode change 100755 => 100644 packages/devui/.storybook/webpack.config.js
 delete mode 100644 packages/devui/src/Button/Button.js
 create mode 100644 packages/devui/src/Button/Button.tsx
 rename packages/devui/src/Button/{index.js => index.ts} (100%)
 rename packages/devui/src/Button/stories/{index.js => index.tsx} (61%)
 mode change 100755 => 100644
 rename packages/devui/src/Button/styles/{common.js => common.ts} (81%)
 rename packages/devui/src/Button/styles/{default.js => default.ts} (70%)
 rename packages/devui/src/Button/styles/{index.js => index.ts} (100%)
 rename packages/devui/src/Button/styles/{material.js => material.ts} (78%)
 rename packages/devui/src/Container/{index.js => index.tsx} (63%)
 rename packages/devui/src/Container/styles/{index.js => index.ts} (100%)
 rename packages/devui/src/ContextMenu/{ContextMenu.js => ContextMenu.tsx} (58%)
 delete mode 100644 packages/devui/src/ContextMenu/index.js
 create mode 100644 packages/devui/src/ContextMenu/index.ts
 rename packages/devui/src/ContextMenu/stories/{data.js => data.ts} (100%)
 rename packages/devui/src/ContextMenu/stories/{index.js => index.tsx} (100%)
 rename packages/devui/src/ContextMenu/styles/{index.js => index.ts} (74%)
 rename packages/devui/src/Dialog/{Dialog.js => Dialog.tsx} (59%)
 rename packages/devui/src/Dialog/{index.js => index.ts} (100%)
 rename packages/devui/src/Dialog/stories/{index.js => index.tsx} (100%)
 mode change 100755 => 100644
 rename packages/devui/src/Dialog/styles/{default.js => default.ts} (88%)
 rename packages/devui/src/Dialog/styles/{index.js => index.ts} (100%)
 rename packages/devui/src/Dialog/styles/{material.js => material.ts} (89%)
 delete mode 100644 packages/devui/src/Editor/Editor.js
 create mode 100644 packages/devui/src/Editor/Editor.tsx
 rename packages/devui/src/Editor/{index.js => index.ts} (100%)
 rename packages/devui/src/Editor/stories/{WithTabs.js => WithTabs.tsx} (64%)
 rename packages/devui/src/Editor/stories/{index.js => index.tsx} (100%)
 mode change 100755 => 100644
 rename packages/devui/src/Editor/styles/{index.js => index.ts} (97%)
 rename packages/devui/src/Form/{Form.js => Form.tsx} (50%)
 rename packages/devui/src/Form/{index.js => index.ts} (100%)
 rename packages/devui/src/Form/stories/{index.js => index.tsx} (100%)
 mode change 100755 => 100644
 delete mode 100644 packages/devui/src/Form/stories/schema.js
 create mode 100644 packages/devui/src/Form/stories/schema.ts
 rename packages/devui/src/Form/styles/{index.js => index.ts} (97%)
 delete mode 100644 packages/devui/src/Form/widgets.js
 create mode 100644 packages/devui/src/Form/widgets.tsx
 rename packages/devui/src/Notification/{Notification.js => Notification.tsx} (66%)
 rename packages/devui/src/Notification/{index.js => index.ts} (100%)
 rename packages/devui/src/Notification/stories/{index.js => index.tsx} (91%)
 rename packages/devui/src/Notification/styles/{index.js => index.ts} (76%)
 rename packages/devui/src/SegmentedControl/{SegmentedControl.js => SegmentedControl.tsx} (56%)
 rename packages/devui/src/SegmentedControl/{index.js => index.ts} (100%)
 rename packages/devui/src/SegmentedControl/stories/{index.js => index.tsx} (100%)
 rename packages/devui/src/SegmentedControl/styles/{index.js => index.ts} (79%)
 delete mode 100644 packages/devui/src/Select/Select.js
 create mode 100644 packages/devui/src/Select/Select.tsx
 delete mode 100644 packages/devui/src/Select/index.js
 create mode 100644 packages/devui/src/Select/index.ts
 rename packages/devui/src/Select/stories/{index.js => index.tsx} (100%)
 mode change 100755 => 100644
 rename packages/devui/src/Select/stories/{options.js => options.ts} (100%)
 rename packages/devui/src/Select/styles/{index.js => index.ts} (96%)
 rename packages/devui/src/Slider/{Slider.js => Slider.tsx} (66%)
 delete mode 100644 packages/devui/src/Slider/index.js
 create mode 100644 packages/devui/src/Slider/index.ts
 rename packages/devui/src/Slider/stories/{index.js => index.tsx} (100%)
 mode change 100755 => 100644
 rename packages/devui/src/Slider/styles/{common.js => common.ts} (60%)
 rename packages/devui/src/Slider/styles/{default.js => default.ts} (85%)
 rename packages/devui/src/Slider/styles/{index.js => index.ts} (100%)
 rename packages/devui/src/Slider/styles/{material.js => material.ts} (87%)
 rename packages/devui/src/Tabs/{Tabs.js => Tabs.tsx} (52%)
 rename packages/devui/src/Tabs/{TabsHeader.js => TabsHeader.tsx} (66%)
 delete mode 100644 packages/devui/src/Tabs/index.js
 create mode 100644 packages/devui/src/Tabs/index.ts
 rename packages/devui/src/Tabs/stories/{data.js => data.tsx} (74%)
 rename packages/devui/src/Tabs/stories/{index.js => index.tsx} (78%)
 mode change 100755 => 100644
 rename packages/devui/src/Tabs/styles/{common.js => common.ts} (61%)
 rename packages/devui/src/Tabs/styles/{default.js => default.ts} (82%)
 rename packages/devui/src/Tabs/styles/{index.js => index.ts} (100%)
 rename packages/devui/src/Tabs/styles/{material.js => material.ts} (77%)
 delete mode 100644 packages/devui/src/Toolbar/index.js
 create mode 100644 packages/devui/src/Toolbar/index.ts
 rename packages/devui/src/Toolbar/stories/{index.js => index.tsx} (64%)
 mode change 100755 => 100644
 rename packages/devui/src/Toolbar/styles/{Divider.js => Divider.ts} (100%)
 rename packages/devui/src/Toolbar/styles/{Spacer.js => Spacer.ts} (100%)
 rename packages/devui/src/Toolbar/styles/{Toolbar.js => Toolbar.ts} (70%)
 create mode 100644 packages/devui/src/base16.ts
 rename packages/devui/src/colorSchemes/{atom-one-dark.js => atom-one-dark.ts} (100%)
 rename packages/devui/src/colorSchemes/{default.js => default.ts} (100%)
 rename packages/devui/src/colorSchemes/{dracula.js => dracula.ts} (100%)
 rename packages/devui/src/colorSchemes/{github.js => github.ts} (100%)
 rename packages/devui/src/colorSchemes/{index.js => index.ts} (100%)
 rename packages/devui/src/colorSchemes/{ir-black.js => ir-black.ts} (100%)
 rename packages/devui/src/colorSchemes/{macintosh.js => macintosh.ts} (100%)
 rename packages/devui/src/colorSchemes/{materia.js => materia.ts} (100%)
 rename packages/devui/src/colorSchemes/{oceanic-next.js => oceanic-next.ts} (100%)
 rename packages/devui/src/colorSchemes/{phd.js => phd.ts} (100%)
 rename packages/devui/src/colorSchemes/{pico.js => pico.ts} (100%)
 rename packages/devui/src/colorSchemes/{solar-flare.js => solar-flare.ts} (100%)
 rename packages/devui/src/colorSchemes/{spacemacs.js => spacemacs.ts} (100%)
 rename packages/devui/src/colorSchemes/{unikitty.js => unikitty.ts} (100%)
 rename packages/devui/src/colorSchemes/{woodland.js => woodland.ts} (100%)
 rename packages/devui/src/{index.js => index.ts} (88%)
 mode change 100755 => 100644
 create mode 100644 packages/devui/src/redux-devtools-themes.ts
 create mode 100644 packages/devui/src/simple-element-resize-detector.ts
 delete mode 100644 packages/devui/src/themes/default.js
 create mode 100644 packages/devui/src/themes/default.ts
 rename packages/devui/src/themes/{index.js => index.ts} (100%)
 rename packages/devui/src/themes/{material.js => material.ts} (76%)
 rename packages/devui/src/utils/{animations.js => animations.ts} (83%)
 delete mode 100644 packages/devui/src/utils/autoPrefix.js
 create mode 100644 packages/devui/src/utils/autoPrefix.ts
 rename packages/devui/src/utils/{color.js => color.ts} (57%)
 delete mode 100644 packages/devui/src/utils/createStyledComponent.js
 create mode 100644 packages/devui/src/utils/createStyledComponent.ts
 rename packages/devui/src/utils/{invertColors.js => invertColors.ts} (76%)
 rename packages/devui/src/utils/{theme.js => theme.ts} (60%)
 create mode 100644 packages/devui/tests/tsconfig.json
 create mode 100644 packages/devui/tsconfig.json

diff --git a/packages/devui/.babelrc b/packages/devui/.babelrc
index 645cc56e..912790c1 100755
--- a/packages/devui/.babelrc
+++ b/packages/devui/.babelrc
@@ -1,4 +1,11 @@
 {
-  "presets": ["@babel/preset-env", "@babel/preset-react"],
-  "plugins": ["@babel/plugin-proposal-class-properties", "@babel/plugin-proposal-export-default-from"]
+  "presets": [
+    "@babel/env",
+    "@babel/react",
+    "@babel/typescript"
+  ],
+  "plugins": [
+    "@babel/proposal-class-properties"
+  ],
+  "sourceType": "unambiguous"
 }
diff --git a/packages/devui/.eslintignore b/packages/devui/.eslintignore
new file mode 100644
index 00000000..b1e0862f
--- /dev/null
+++ b/packages/devui/.eslintignore
@@ -0,0 +1,2 @@
+lib
+demo
diff --git a/packages/devui/.eslintrc.js b/packages/devui/.eslintrc.js
new file mode 100644
index 00000000..72e1f8dd
--- /dev/null
+++ b/packages/devui/.eslintrc.js
@@ -0,0 +1,21 @@
+module.exports = {
+  extends: '../../.eslintrc',
+  overrides: [
+    {
+      files: ['*.ts', '*.tsx'],
+      extends: '../../eslintrc.ts.react.base.json',
+      parserOptions: {
+        tsconfigRootDir: __dirname,
+        project: ['./tsconfig.json']
+      }
+    },
+    {
+      files: ['test/*.ts', 'test/*.tsx'],
+      extends: '../../eslintrc.ts.react.jest.base.json',
+      parserOptions: {
+        tsconfigRootDir: __dirname,
+        project: ['./test/tsconfig.json']
+      }
+    }
+  ]
+};
diff --git a/packages/devui/.prettierignore b/packages/devui/.prettierignore
new file mode 100644
index 00000000..b1e0862f
--- /dev/null
+++ b/packages/devui/.prettierignore
@@ -0,0 +1,2 @@
+lib
+demo
diff --git a/packages/devui/.storybook/config.js b/packages/devui/.storybook/config.js
index eefdbad6..4c8be1fa 100755
--- a/packages/devui/.storybook/config.js
+++ b/packages/devui/.storybook/config.js
@@ -1,9 +1,9 @@
-import { configure, setAddon, addDecorator } from '@storybook/react';
+import { configure, addDecorator } from '@storybook/react';
 import { withOptions } from '@storybook/addon-options';
 import { withInfo } from '@storybook/addon-info';
 import { withKnobs } from '@storybook/addon-knobs';
 import { withTheme } from './themeAddon/theme';
-import '../src/presets.js';
+import '../src/presets';
 
 addDecorator(
   withOptions({
@@ -21,7 +21,7 @@ addDecorator(withTheme);
 addDecorator(withKnobs);
 addDecorator(withInfo);
 
-const req = require.context('../src/', true, /stories\/index\.js$/);
+const req = require.context('../src/', true, /stories\/index\.tsx$/);
 
 function loadStories() {
   req.keys().forEach(filename => req(filename));
diff --git a/packages/devui/.storybook/themeAddon/Panel.js b/packages/devui/.storybook/themeAddon/Panel.js
index 7e0ee5f4..44b1e5ba 100644
--- a/packages/devui/.storybook/themeAddon/Panel.js
+++ b/packages/devui/.storybook/themeAddon/Panel.js
@@ -2,7 +2,7 @@ import React from 'react';
 import Form from '@storybook/addon-knobs/dist/components/PropForm';
 import styled from 'styled-components';
 import { EVENT_ID_DATA, DEFAULT_THEME_STATE } from './constant';
-import { listSchemes, listThemes } from '../../src/utils/theme';
+import { listSchemes, listThemes } from '../../lib/utils/theme';
 
 const FormWrapper = styled.div`
   width: 100%;
diff --git a/packages/devui/.storybook/webpack.config.js b/packages/devui/.storybook/webpack.config.js
old mode 100755
new mode 100644
index 9fc16d31..3b3be188
--- a/packages/devui/.storybook/webpack.config.js
+++ b/packages/devui/.storybook/webpack.config.js
@@ -1,8 +1,12 @@
 const path = require('path');
+const TSDocgenPlugin = require('react-docgen-typescript-webpack-plugin');
 
-module.exports = (baseConfig, env, defaultConfig) => {
-  // Add custom webpack config here like:
-  // defaultConfig.module.rules.push
-
-  return defaultConfig;
+module.exports = (baseConfig, env, config) => {
+  config.module.rules.push({
+    test: /\.(ts|tsx)$/,
+    loader: require.resolve('babel-loader')
+  });
+  config.plugins.push(new TSDocgenPlugin()); // optional
+  config.resolve.extensions.push('.ts', '.tsx');
+  return config;
 };
diff --git a/packages/devui/package.json b/packages/devui/package.json
index 7de9ccb9..a591b3fe 100755
--- a/packages/devui/package.json
+++ b/packages/devui/package.json
@@ -12,13 +12,22 @@
   },
   "author": "Mihail Diordiev <zalmoxisus@gmail.com> (https://github.com/zalmoxisus)",
   "license": "MIT",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
   "scripts": {
+    "type-check": "tsc --noEmit",
+    "type-check:watch": "npm run type-check -- --watch",
     "start": "npm run storybook",
-    "build": "rimraf ./lib && babel ./src --out-dir ./lib --ignore tests,stories",
+    "clean": "rimraf lib",
+    "build": "npm run build:types && npm run build:js",
+    "build:types": "tsc --emitDeclarationOnly",
+    "build:js": "babel src --out-dir lib --ignore tests,stories --extensions \".ts,.tsx\" --source-maps inline",
+    "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
+    "lint:fix": "eslint . --ext .js,.jsx,.ts,.tsx --fix",
     "lint:css": "stylelint './src/**/styles/*.js'",
     "test:update": "npm run jest -- -u",
     "test": "jest --no-cache",
-    "storybook": "start-storybook -p 9001 -c .storybook -s ./fonts",
+    "storybook": "npm run build && start-storybook -p 9001 -c .storybook -s ./fonts",
     "publish-storybook": "bash .scripts/publish_storybook.sh",
     "prepare": "npm run build",
     "prepublishOnly": "npm run test && npm run build"
@@ -36,11 +45,22 @@
     "@babel/plugin-transform-runtime": "^7.2.0",
     "@babel/preset-env": "^7.3.1",
     "@babel/preset-react": "^7.0.0",
-    "@storybook/addon-actions": "^4.1.4",
-    "@storybook/addon-info": "^4.1.4",
-    "@storybook/addon-knobs": "^4.1.4",
-    "@storybook/addon-options": "^4.1.4",
-    "@storybook/react": "4.0.9",
+    "@storybook/addon-actions": "^4.1.18",
+    "@storybook/addon-info": "^4.1.18",
+    "@storybook/addon-knobs": "^4.1.18",
+    "@storybook/addon-options": "^4.1.18",
+    "@storybook/react": "^4.1.18",
+    "@types/codemirror": "^0.0.95",
+    "@types/color": "^2.0.1",
+    "@types/json-schema": "^7.0.4",
+    "@types/react-icons": "^2.2.7",
+    "@types/react-jsonschema-form": "^1.7.3",
+    "@types/react-select": "^1.3.4",
+    "@types/storybook__addon-actions": "^3.4.3",
+    "@types/storybook__addon-knobs": "^4.0.5",
+    "@types/storybook__react": "^4.0.2",
+    "babel-loader": "^8.1.0",
+    "csstype": "^2.6.10",
     "enzyme": "^3.1.0",
     "enzyme-adapter-react-16": "^1.0.2",
     "enzyme-to-json": "^3.1.4",
@@ -48,18 +68,20 @@
     "jest": "^24.1.0",
     "jsdom": "^11.3.0",
     "react": "^16.0.0",
-    "react-addons-test-utils": "^15.6.2",
+    "react-docgen-typescript-webpack-plugin": "^1.1.0",
     "react-dom": "^16.0.0",
     "react-test-renderer": "^16.0.0",
     "rimraf": "^2.6.2",
     "stylelint": "^7.6.0",
     "stylelint-config-standard": "^15.0.0",
-    "stylelint-processor-styled-components": "^0.0.4"
+    "stylelint-processor-styled-components": "^0.0.4",
+    "typescript": "^3.8.3"
   },
   "peerDependencies": {
     "react": "^0.14.9 || ^15.3.0"
   },
   "dependencies": {
+    "@types/prop-types": "^15.6.0",
     "base16": "^1.0.0",
     "codemirror": "^5.21.0",
     "color": "^2.0.0",
@@ -73,6 +95,5 @@
   },
   "jest": {
     "setupTestFrameworkScriptFile": "<rootDir>/tests/setup.js"
-  },
-  "main": "lib/index.js"
+  }
 }
diff --git a/packages/devui/src/Button/Button.js b/packages/devui/src/Button/Button.js
deleted file mode 100644
index a5211eaa..00000000
--- a/packages/devui/src/Button/Button.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import createStyledComponent from '../utils/createStyledComponent';
-import * as styles from './styles';
-import { commonStyle, tooltipStyle } from './styles/common';
-
-const ButtonWrapper = createStyledComponent(styles, 'button');
-const TooltipWrapper = createStyledComponent(tooltipStyle);
-const CommonWrapper = createStyledComponent(commonStyle);
-
-export default class Button extends Component {
-  shouldComponentUpdate(nextProps) {
-    return (
-      nextProps.children !== this.props.children ||
-      nextProps.disabled !== this.props.disabled ||
-      nextProps.mark !== this.props.mark ||
-      nextProps.size !== this.props.size ||
-      nextProps.primary !== this.props.primary ||
-      nextProps.tooltipPosition !== this.props.tooltipPosition ||
-      nextProps.title !== this.props.title
-    );
-  }
-
-  onMouseUp = e => {
-    e.target.blur();
-  };
-
-  render() {
-    const button = (
-      <ButtonWrapper
-        theme={this.props.theme}
-        aria-label={this.props.title}
-        primary={this.props.primary}
-        disabled={this.props.disabled}
-        onMouseUp={this.onMouseUp}
-        onClick={this.props.onClick}
-        type={this.props.type}
-      >
-        {this.props.children}
-      </ButtonWrapper>
-    );
-
-    const Wrapper = this.props.title ? TooltipWrapper : CommonWrapper;
-    return (
-      <Wrapper
-        theme={this.props.theme}
-        tooltipTitle={this.props.title}
-        tooltipPosition={this.props.tooltipPosition}
-        size={this.props.size}
-        mark={this.props.mark}
-      >
-        {button}
-      </Wrapper>
-    );
-  }
-}
-
-Button.propTypes = {
-  children: PropTypes.any.isRequired,
-  title: PropTypes.string,
-  tooltipPosition: PropTypes.oneOf([
-    'top',
-    'bottom',
-    'left',
-    'right',
-    'bottom-left',
-    'bottom-right',
-    'top-left',
-    'top-right'
-  ]),
-  onClick: PropTypes.func,
-  type: PropTypes.string,
-  disabled: PropTypes.bool,
-  primary: PropTypes.bool,
-  size: PropTypes.oneOf(['big', 'normal', 'small']),
-  mark: PropTypes.oneOf([
-    false,
-    'base08',
-    'base09',
-    'base0A',
-    'base0B',
-    'base0C',
-    'base0D',
-    'base0E',
-    'base0F'
-  ]),
-  theme: PropTypes.object
-};
-
-Button.defaultProps = {
-  tooltipPosition: 'top'
-};
diff --git a/packages/devui/src/Button/Button.tsx b/packages/devui/src/Button/Button.tsx
new file mode 100644
index 00000000..15b188bd
--- /dev/null
+++ b/packages/devui/src/Button/Button.tsx
@@ -0,0 +1,128 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import createStyledComponent from '../utils/createStyledComponent';
+import * as styles from './styles';
+import { commonStyle, tooltipStyle } from './styles/common';
+import { Theme } from '../themes/default';
+
+const ButtonWrapper = createStyledComponent(styles, 'button');
+const TooltipWrapper = createStyledComponent(tooltipStyle);
+const CommonWrapper = createStyledComponent(commonStyle);
+
+export type TooltipPosition =
+  | 'top'
+  | 'bottom'
+  | 'left'
+  | 'right'
+  | 'bottom-left'
+  | 'bottom-right'
+  | 'top-left'
+  | 'top-right';
+
+export type Size = 'big' | 'normal' | 'small';
+
+export type Mark =
+  | 'base08'
+  | 'base09'
+  | 'base0A'
+  | 'base0B'
+  | 'base0C'
+  | 'base0D'
+  | 'base0E'
+  | 'base0F';
+
+interface Props {
+  children: unknown;
+  title?: string;
+  tooltipPosition: TooltipPosition;
+  onClick?: React.MouseEventHandler<HTMLButtonElement>;
+  type?: 'button' | 'reset' | 'submit';
+  disabled?: boolean;
+  primary?: boolean;
+  size?: Size;
+  mark?: Mark | false;
+  theme?: Theme;
+}
+
+export default class Button extends Component<Props> {
+  shouldComponentUpdate(nextProps: Props) {
+    return (
+      nextProps.children !== this.props.children ||
+      nextProps.disabled !== this.props.disabled ||
+      nextProps.mark !== this.props.mark ||
+      nextProps.size !== this.props.size ||
+      nextProps.primary !== this.props.primary ||
+      nextProps.tooltipPosition !== this.props.tooltipPosition ||
+      nextProps.title !== this.props.title
+    );
+  }
+
+  onMouseUp: React.MouseEventHandler<HTMLButtonElement> = e => {
+    e.currentTarget.blur();
+  };
+
+  render() {
+    const button = (
+      <ButtonWrapper
+        theme={this.props.theme}
+        aria-label={this.props.title}
+        primary={this.props.primary}
+        disabled={this.props.disabled}
+        onMouseUp={this.onMouseUp}
+        onClick={this.props.onClick}
+        type={this.props.type}
+      >
+        {this.props.children}
+      </ButtonWrapper>
+    );
+
+    const Wrapper = this.props.title ? TooltipWrapper : CommonWrapper;
+    return (
+      <Wrapper
+        theme={this.props.theme}
+        tooltipTitle={this.props.title}
+        tooltipPosition={this.props.tooltipPosition}
+        size={this.props.size}
+        mark={this.props.mark}
+      >
+        {button}
+      </Wrapper>
+    );
+  }
+
+  static propTypes = {
+    children: PropTypes.any.isRequired,
+    title: PropTypes.string,
+    tooltipPosition: PropTypes.oneOf([
+      'top',
+      'bottom',
+      'left',
+      'right',
+      'bottom-left',
+      'bottom-right',
+      'top-left',
+      'top-right'
+    ]),
+    onClick: PropTypes.func,
+    type: PropTypes.string,
+    disabled: PropTypes.bool,
+    primary: PropTypes.bool,
+    size: PropTypes.oneOf(['big', 'normal', 'small']),
+    mark: PropTypes.oneOf([
+      false,
+      'base08',
+      'base09',
+      'base0A',
+      'base0B',
+      'base0C',
+      'base0D',
+      'base0E',
+      'base0F'
+    ]),
+    theme: PropTypes.object
+  };
+
+  static defaultProps = {
+    tooltipPosition: 'top'
+  };
+}
diff --git a/packages/devui/src/Button/index.js b/packages/devui/src/Button/index.ts
similarity index 100%
rename from packages/devui/src/Button/index.js
rename to packages/devui/src/Button/index.ts
diff --git a/packages/devui/src/Button/stories/index.js b/packages/devui/src/Button/stories/index.tsx
old mode 100755
new mode 100644
similarity index 61%
rename from packages/devui/src/Button/stories/index.js
rename to packages/devui/src/Button/stories/index.tsx
index 29a89650..b6831a4d
--- a/packages/devui/src/Button/stories/index.js
+++ b/packages/devui/src/Button/stories/index.tsx
@@ -5,6 +5,7 @@ import { action } from '@storybook/addon-actions';
 import { withKnobs, text, boolean, select } from '@storybook/addon-knobs';
 import MdFiberManualRecord from 'react-icons/lib/md/fiber-manual-record';
 import Button from '../';
+import { Mark, Size, TooltipPosition } from '../Button';
 
 export const Container = styled.div`
   display: flex;
@@ -20,18 +21,22 @@ storiesOf('Button', module)
     <Container>
       <Button
         title={text('Title', 'Hello Tooltip! \\a And from new line hello!')}
-        tooltipPosition={select('tooltipPosition', [
-          'top',
-          'bottom',
-          'left',
-          'right',
-          'bottom-left',
-          'bottom-right',
-          'top-left',
-          'top-right'
-        ])}
+        tooltipPosition={select<TooltipPosition>(
+          'tooltipPosition',
+          [
+            'top',
+            'bottom',
+            'left',
+            'right',
+            'bottom-left',
+            'bottom-right',
+            'top-left',
+            'top-right'
+          ],
+          'top'
+        )}
         primary={boolean('primary', true)}
-        size={select('size', ['big', 'normal', 'small'], 'normal')}
+        size={select<Size>('size', ['big', 'normal', 'small'], 'normal')}
         disabled={boolean('Disabled', false)}
         onClick={action('button clicked')}
       >
@@ -42,7 +47,7 @@ storiesOf('Button', module)
   .add('mark', () => (
     <Container>
       <Button
-        mark={select(
+        mark={select<Mark>(
           'mark',
           [
             'base08',
@@ -57,17 +62,21 @@ storiesOf('Button', module)
           'base08'
         )}
         title={text('Title', 'Hello Tooltip')}
-        tooltipPosition={select('tooltipPosition', [
-          'top',
-          'bottom',
-          'left',
-          'right',
-          'bottom-left',
-          'bottom-right',
-          'top-left',
-          'top-right'
-        ])}
-        size={select('size', ['big', 'normal', 'small'], 'normal')}
+        tooltipPosition={select<TooltipPosition>(
+          'tooltipPosition',
+          [
+            'top',
+            'bottom',
+            'left',
+            'right',
+            'bottom-left',
+            'bottom-right',
+            'top-left',
+            'top-right'
+          ],
+          'top'
+        )}
+        size={select<Size>('size', ['big', 'normal', 'small'], 'normal')}
         disabled={boolean('Disabled', false)}
         onClick={action('button clicked')}
       >
diff --git a/packages/devui/src/Button/styles/common.js b/packages/devui/src/Button/styles/common.ts
similarity index 81%
rename from packages/devui/src/Button/styles/common.js
rename to packages/devui/src/Button/styles/common.ts
index b3547507..3616919c 100644
--- a/packages/devui/src/Button/styles/common.js
+++ b/packages/devui/src/Button/styles/common.ts
@@ -1,8 +1,10 @@
-import { css } from 'styled-components';
+import { css, ThemedStyledProps } from 'styled-components';
 import { fadeIn } from '../../utils/animations';
 import colorEffect from '../../utils/color';
+import { Mark, Size, TooltipPosition } from '../Button';
+import { Theme } from '../../themes/default';
 
-const both = tooltipPosition => {
+const both = (tooltipPosition: TooltipPosition) => {
   switch (tooltipPosition) {
     case 'bottom':
       return `
@@ -46,7 +48,7 @@ const both = tooltipPosition => {
   }
 };
 
-const before = tooltipPosition => {
+const before = (tooltipPosition: TooltipPosition) => {
   switch (tooltipPosition) {
     case 'bottom-left':
       return `
@@ -69,7 +71,7 @@ const before = tooltipPosition => {
   }
 };
 
-const after = (tooltipPosition, color) => {
+const after = (tooltipPosition: TooltipPosition, color: string) => {
   switch (tooltipPosition) {
     case 'bottom':
       return `
@@ -110,13 +112,13 @@ const after = (tooltipPosition, color) => {
   }
 };
 
-const getDirection = tooltipPosition => {
+const getDirection = (tooltipPosition: TooltipPosition) => {
   return tooltipPosition.indexOf('-') > 0
     ? tooltipPosition.substring(0, tooltipPosition.indexOf('-'))
     : tooltipPosition;
 };
 
-const getSize = size => {
+const getSize = (size: Size | undefined) => {
   switch (size) {
     case 'big':
       return 'min-height: 34px; padding: 2px 12px;';
@@ -127,7 +129,16 @@ const getSize = size => {
   }
 };
 
-export const commonStyle = ({ theme, mark, size }) => css`
+interface CommonStyleProps {
+  size: Size | undefined;
+  mark: Mark | false | undefined;
+}
+
+export const commonStyle = ({
+  theme,
+  mark,
+  size
+}: ThemedStyledProps<CommonStyleProps, Theme>) => css`
   display: inline-block;
   position: relative;
   flex-shrink: 0;
@@ -145,8 +156,8 @@ export const commonStyle = ({ theme, mark, size }) => css`
       pointer-events: none;
     }
 
-    ${mark &&
-      `
+    ${mark
+      ? `
     background-color: ${colorEffect(
       theme[mark],
       'fade',
@@ -160,21 +171,29 @@ export const commonStyle = ({ theme, mark, size }) => css`
       stroke-opacity: 0.2;
       user-select: none;
     }
-  `}
+  `
+      : ''}
   }
 `;
 
+interface TooltipStyleProps {
+  tooltipTitle: string | undefined;
+  tooltipPosition: TooltipPosition;
+  size: Size | undefined;
+  mark: Mark | false | undefined;
+}
+
 export const tooltipStyle = ({
   theme,
   tooltipTitle,
   tooltipPosition,
   mark,
   size
-}) => css`
+}: ThemedStyledProps<TooltipStyleProps, Theme>) => css`
   ${commonStyle({ theme, mark, size })}
 
   &:before {
-    content: "${tooltipTitle}";
+    content: "${tooltipTitle ?? ''}";
     white-space: pre;
     color: ${theme.base06};
     line-height: 16px;
@@ -208,8 +227,9 @@ export const tooltipStyle = ({
     ${theme.type === 'material' ? `animation: ${fadeIn} 500ms;` : ''}
   }
 
-  ${theme.type !== 'material' &&
-    `
+  ${
+    theme.type !== 'material'
+      ? `
   &:after {
     content: "";
     border-style: solid;
@@ -218,7 +238,9 @@ export const tooltipStyle = ({
     ${after(tooltipPosition, theme.base02)}
     ${getDirection(tooltipPosition)}: 7px;
   }
-  `}
+  `
+      : ''
+  }
 
   &:hover:after,
   &:hover:before {
diff --git a/packages/devui/src/Button/styles/default.js b/packages/devui/src/Button/styles/default.ts
similarity index 70%
rename from packages/devui/src/Button/styles/default.js
rename to packages/devui/src/Button/styles/default.ts
index b2957d89..8a3c0052 100644
--- a/packages/devui/src/Button/styles/default.js
+++ b/packages/devui/src/Button/styles/default.ts
@@ -1,6 +1,16 @@
-import { css } from 'styled-components';
+import { css, ThemedStyledProps } from 'styled-components';
+import { Theme } from '../../themes/default';
 
-export const style = ({ theme, primary, disabled }) => css`
+export interface StyleProps {
+  primary: boolean | undefined;
+  disabled: boolean | undefined;
+}
+
+export const style = ({
+  theme,
+  primary,
+  disabled
+}: ThemedStyledProps<StyleProps, Theme>) => css`
   box-sizing: border-box;
   -webkit-font-smoothing: antialiased;
   outline: none;
@@ -33,14 +43,17 @@ export const style = ({ theme, primary, disabled }) => css`
   `
   }
 
-  ${!disabled &&
-    `
+  ${
+    !disabled
+      ? `
   &:hover,
   &:focus {
     background-color: ${primary ? theme.base07 : theme.base02};
     box-shadow: 1px 1px 2px ${theme.base03};
   }
- `}
+ `
+      : ''
+  }
   &:focus {
     border: 1px solid ${theme.base0D};
   }
diff --git a/packages/devui/src/Button/styles/index.js b/packages/devui/src/Button/styles/index.ts
similarity index 100%
rename from packages/devui/src/Button/styles/index.js
rename to packages/devui/src/Button/styles/index.ts
diff --git a/packages/devui/src/Button/styles/material.js b/packages/devui/src/Button/styles/material.ts
similarity index 78%
rename from packages/devui/src/Button/styles/material.js
rename to packages/devui/src/Button/styles/material.ts
index fb07cf81..31114a85 100644
--- a/packages/devui/src/Button/styles/material.js
+++ b/packages/devui/src/Button/styles/material.ts
@@ -1,7 +1,13 @@
-import { css } from 'styled-components';
+import { css, ThemedStyledProps } from 'styled-components';
 import { ripple } from '../../utils/animations';
+import { StyleProps } from './default';
+import { Theme } from '../../themes/default';
 
-export const style = ({ theme, primary, disabled }) => css`
+export const style = ({
+  theme,
+  primary,
+  disabled
+}: ThemedStyledProps<StyleProps, Theme>) => css`
   box-sizing: border-box;
   -webkit-font-smoothing: antialiased;
   outline: none;
diff --git a/packages/devui/src/Container/index.js b/packages/devui/src/Container/index.tsx
similarity index 63%
rename from packages/devui/src/Container/index.js
rename to packages/devui/src/Container/index.tsx
index b0a66007..5259ed33 100644
--- a/packages/devui/src/Container/index.js
+++ b/packages/devui/src/Container/index.tsx
@@ -1,10 +1,23 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { ThemeProvider } from 'styled-components';
-import { getTheme } from '../utils/theme';
+import { Theme } from '../themes/default';
+import { getTheme, ThemeData } from '../utils/theme';
 import { MainContainerWrapper, ContainerWrapper } from './styles';
 
-const Container = ({ themeData, className, theme, children }) => {
+interface Props {
+  children?: React.ReactNode;
+  themeData?: ThemeData;
+  theme?: Theme;
+  className?: string;
+}
+
+const Container: React.FunctionComponent<Props> = ({
+  themeData,
+  className,
+  theme,
+  children
+}) => {
   if (!themeData) {
     return (
       <ContainerWrapper className={className} theme={theme}>
@@ -24,8 +37,8 @@ const Container = ({ themeData, className, theme, children }) => {
 
 Container.propTypes = {
   children: PropTypes.node,
-  themeData: PropTypes.object,
-  theme: PropTypes.object,
+  themeData: PropTypes.any,
+  theme: PropTypes.any,
   className: PropTypes.string
 };
 
diff --git a/packages/devui/src/Container/styles/index.js b/packages/devui/src/Container/styles/index.ts
similarity index 100%
rename from packages/devui/src/Container/styles/index.js
rename to packages/devui/src/Container/styles/index.ts
diff --git a/packages/devui/src/ContextMenu/ContextMenu.js b/packages/devui/src/ContextMenu/ContextMenu.tsx
similarity index 58%
rename from packages/devui/src/ContextMenu/ContextMenu.js
rename to packages/devui/src/ContextMenu/ContextMenu.tsx
index 259ce93a..e3cb11b7 100644
--- a/packages/devui/src/ContextMenu/ContextMenu.js
+++ b/packages/devui/src/ContextMenu/ContextMenu.tsx
@@ -2,16 +2,34 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import createStyledComponent from '../utils/createStyledComponent';
 import styles from './styles/index';
+import { ReactButtonElement } from '../Tabs/Tabs';
 
 const ContextMenuWrapper = createStyledComponent(styles);
 
-export default class ContextMenu extends Component {
-  constructor(props) {
+type Item = { name: string; value?: string } | ReactButtonElement;
+
+function isReactButtonElement(item: Item): item is ReactButtonElement {
+  return (item as ReactButtonElement).type === 'button';
+}
+
+interface Props {
+  items: Item[];
+  onClick: (value: string) => void;
+  x: number;
+  y: number;
+  visible?: boolean;
+}
+
+export default class ContextMenu extends Component<Props> {
+  constructor(props: Props) {
     super(props);
     this.updateItems(props.items);
   }
 
-  componentWillReceiveProps(nextProps) {
+  menu?: HTMLDivElement | null;
+  items?: React.ReactNode[];
+
+  componentWillReceiveProps(nextProps: Props) {
     if (
       nextProps.items !== this.props.items ||
       nextProps.visible !== this.props.visible
@@ -24,25 +42,25 @@ export default class ContextMenu extends Component {
     this.amendPosition();
   }
 
-  componentDidUpdate(prevProps) {
+  componentDidUpdate(prevProps: Props) {
     if (prevProps.x !== this.props.x || prevProps.y !== this.props.y) {
       this.amendPosition();
     }
   }
 
-  onMouseUp = e => {
-    e.target.blur();
+  onMouseUp: React.MouseEventHandler<HTMLButtonElement> = e => {
+    e.currentTarget.blur();
   };
 
-  onClick = e => {
-    this.props.onClick(e.target.value);
+  onClick: React.MouseEventHandler<HTMLButtonElement> = e => {
+    this.props.onClick(e.currentTarget.value);
   };
 
   amendPosition() {
     const { x, y } = this.props;
     const { scrollTop, scrollLeft } = document.documentElement;
     const { innerWidth, innerHeight } = window;
-    const rect = this.menu.getBoundingClientRect();
+    const rect = this.menu!.getBoundingClientRect();
     let left = x + scrollLeft;
     let top = y + scrollTop;
 
@@ -59,14 +77,14 @@ export default class ContextMenu extends Component {
       left = rect.width < innerWidth ? (innerWidth - rect.width) / 2 : 0;
     }
 
-    this.menu.style.top = `${top}px`;
-    this.menu.style.left = `${left}px`;
+    this.menu!.style.top = `${top}px`;
+    this.menu!.style.left = `${left}px`;
   }
 
-  updateItems(items) {
+  updateItems(items: Item[]) {
     this.items = items.map(item => {
+      if (isReactButtonElement(item)) return item;
       const value = item.value || item.name;
-      if (item.type === 'button') return item;
       return (
         <button
           key={value}
@@ -80,7 +98,7 @@ export default class ContextMenu extends Component {
     });
   }
 
-  menuRef = c => {
+  menuRef: React.RefCallback<HTMLDivElement> = c => {
     this.menu = c;
   };
 
@@ -96,12 +114,12 @@ export default class ContextMenu extends Component {
       </ContextMenuWrapper>
     );
   }
-}
 
-ContextMenu.propTypes = {
-  items: PropTypes.array.isRequired,
-  onClick: PropTypes.func.isRequired,
-  x: PropTypes.number.isRequired,
-  y: PropTypes.number.isRequired,
-  visible: PropTypes.bool
-};
+  static propTypes = {
+    items: PropTypes.array.isRequired,
+    onClick: PropTypes.func.isRequired,
+    x: PropTypes.number.isRequired,
+    y: PropTypes.number.isRequired,
+    visible: PropTypes.bool
+  };
+}
diff --git a/packages/devui/src/ContextMenu/index.js b/packages/devui/src/ContextMenu/index.js
deleted file mode 100644
index 3546cd01..00000000
--- a/packages/devui/src/ContextMenu/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export default from './ContextMenu';
diff --git a/packages/devui/src/ContextMenu/index.ts b/packages/devui/src/ContextMenu/index.ts
new file mode 100644
index 00000000..1bf5f07d
--- /dev/null
+++ b/packages/devui/src/ContextMenu/index.ts
@@ -0,0 +1 @@
+export { default } from './ContextMenu';
diff --git a/packages/devui/src/ContextMenu/stories/data.js b/packages/devui/src/ContextMenu/stories/data.ts
similarity index 100%
rename from packages/devui/src/ContextMenu/stories/data.js
rename to packages/devui/src/ContextMenu/stories/data.ts
diff --git a/packages/devui/src/ContextMenu/stories/index.js b/packages/devui/src/ContextMenu/stories/index.tsx
similarity index 100%
rename from packages/devui/src/ContextMenu/stories/index.js
rename to packages/devui/src/ContextMenu/stories/index.tsx
diff --git a/packages/devui/src/ContextMenu/styles/index.js b/packages/devui/src/ContextMenu/styles/index.ts
similarity index 74%
rename from packages/devui/src/ContextMenu/styles/index.js
rename to packages/devui/src/ContextMenu/styles/index.ts
index 901da052..8aebc9ea 100644
--- a/packages/devui/src/ContextMenu/styles/index.js
+++ b/packages/devui/src/ContextMenu/styles/index.ts
@@ -1,6 +1,18 @@
-import { css } from 'styled-components';
+import { css, ThemedStyledProps } from 'styled-components';
+import { Theme } from '../../themes/default';
 
-export default ({ theme, left, top, visible }) => css`
+interface StyleProps {
+  left: number;
+  top: number;
+  visible: boolean | undefined;
+}
+
+export default ({
+  theme,
+  left,
+  top,
+  visible
+}: ThemedStyledProps<StyleProps, Theme>) => css`
   ${visible
     ? `
     visibility: visible;
diff --git a/packages/devui/src/Dialog/Dialog.js b/packages/devui/src/Dialog/Dialog.tsx
similarity index 59%
rename from packages/devui/src/Dialog/Dialog.js
rename to packages/devui/src/Dialog/Dialog.tsx
index aff3e709..890dcd3c 100644
--- a/packages/devui/src/Dialog/Dialog.js
+++ b/packages/devui/src/Dialog/Dialog.tsx
@@ -4,20 +4,60 @@ import createStyledComponent from '../utils/createStyledComponent';
 import * as styles from './styles';
 import Button from '../Button';
 import Form from '../Form';
+import { Props as FormProps } from '../Form/Form';
+import { Theme } from '../themes/default';
 
 const DialogWrapper = createStyledComponent(styles);
 
-export default class Dialog extends (PureComponent || Component) {
+interface Props {
+  open?: boolean;
+  title?: string;
+  children?: React.ReactNode;
+  actions?: React.ReactNode[];
+  submitText?: string;
+  fullWidth?: boolean;
+  noHeader?: boolean;
+  noFooter?: boolean;
+  modal?: boolean;
+  onDismiss: (
+    e: React.MouseEvent<HTMLButtonElement | HTMLDivElement> | false
+  ) => void;
+  onSubmit: () => void;
+  theme?: Theme;
+}
+
+type Rest<P> = Omit<
+  Props & FormProps<P>,
+  | 'modal'
+  | 'open'
+  | 'fullWidth'
+  | 'title'
+  | 'children'
+  | 'actions'
+  | 'noHeader'
+  | 'noFooter'
+  | 'submitText'
+  | 'onDismiss'
+>;
+function isForm<P>(rest?: FormProps<P>): rest is FormProps<P> {
+  return (rest as FormProps<P>).schema !== undefined;
+}
+
+export default class Dialog<P> extends (PureComponent || Component)<
+  Props | (Props & FormProps<P>)
+> {
+  submitButton?: HTMLInputElement | null;
+
   onSubmit = () => {
     if (this.submitButton) this.submitButton.click();
     else this.props.onSubmit();
   };
 
-  getFormButtonRef = node => {
+  getFormButtonRef: React.RefCallback<HTMLInputElement> = node => {
     this.submitButton = node;
   };
 
-  onKeyDown = e => {
+  onKeyDown: React.KeyboardEventHandler<HTMLDivElement> = e => {
     if (e.keyCode === 27 /* esc */) {
       e.preventDefault();
       this.props.onDismiss(false);
@@ -38,7 +78,7 @@ export default class Dialog extends (PureComponent || Component) {
       onDismiss,
       ...rest
     } = this.props;
-    const schema = rest.schema;
+    const schema = (rest as Props & FormProps<P>).schema;
 
     return (
       <DialogWrapper
@@ -47,7 +87,7 @@ export default class Dialog extends (PureComponent || Component) {
         onKeyDown={this.onKeyDown}
         theme={rest.theme}
       >
-        <div onClick={!modal && onDismiss} />
+        <div onClick={!modal ? onDismiss : undefined} />
         <div>
           {!noHeader && (
             <div className="mc-dialog--header">
@@ -57,8 +97,8 @@ export default class Dialog extends (PureComponent || Component) {
           )}
           <div className="mc-dialog--body">
             {children}
-            {schema && (
-              <Form {...rest}>
+            {isForm(rest as FormProps<P>) && (
+              <Form {...(rest as FormProps<P>)}>
                 {!noFooter && (
                   <input
                     type="submit"
@@ -97,19 +137,19 @@ export default class Dialog extends (PureComponent || Component) {
       </DialogWrapper>
     );
   }
-}
 
-Dialog.propTypes = {
-  open: PropTypes.bool,
-  title: PropTypes.string,
-  children: PropTypes.any,
-  actions: PropTypes.node,
-  submitText: PropTypes.string,
-  fullWidth: PropTypes.bool,
-  noHeader: PropTypes.bool,
-  noFooter: PropTypes.bool,
-  modal: PropTypes.bool,
-  onDismiss: PropTypes.func,
-  onSubmit: PropTypes.func,
-  theme: PropTypes.object
-};
+  static propTypes = {
+    open: PropTypes.bool,
+    title: PropTypes.string,
+    children: PropTypes.any,
+    actions: PropTypes.node,
+    submitText: PropTypes.string,
+    fullWidth: PropTypes.bool,
+    noHeader: PropTypes.bool,
+    noFooter: PropTypes.bool,
+    modal: PropTypes.bool,
+    onDismiss: PropTypes.func,
+    onSubmit: PropTypes.func,
+    theme: PropTypes.object
+  };
+}
diff --git a/packages/devui/src/Dialog/index.js b/packages/devui/src/Dialog/index.ts
similarity index 100%
rename from packages/devui/src/Dialog/index.js
rename to packages/devui/src/Dialog/index.ts
diff --git a/packages/devui/src/Dialog/stories/index.js b/packages/devui/src/Dialog/stories/index.tsx
old mode 100755
new mode 100644
similarity index 100%
rename from packages/devui/src/Dialog/stories/index.js
rename to packages/devui/src/Dialog/stories/index.tsx
diff --git a/packages/devui/src/Dialog/styles/default.js b/packages/devui/src/Dialog/styles/default.ts
similarity index 88%
rename from packages/devui/src/Dialog/styles/default.js
rename to packages/devui/src/Dialog/styles/default.ts
index 5da5ecea..1cc5ad49 100644
--- a/packages/devui/src/Dialog/styles/default.js
+++ b/packages/devui/src/Dialog/styles/default.ts
@@ -1,6 +1,16 @@
-import { css } from 'styled-components';
+import { css, ThemedStyledProps } from 'styled-components';
+import { Theme } from '../../themes/default';
 
-export const style = ({ theme, open, fullWidth }) => css`
+export interface StyleProps {
+  open: boolean | undefined;
+  fullWidth: boolean | undefined;
+}
+
+export const style = ({
+  theme,
+  open,
+  fullWidth
+}: ThemedStyledProps<StyleProps, Theme>) => css`
   position: fixed;
   top: 0px;
   right: 0px;
diff --git a/packages/devui/src/Dialog/styles/index.js b/packages/devui/src/Dialog/styles/index.ts
similarity index 100%
rename from packages/devui/src/Dialog/styles/index.js
rename to packages/devui/src/Dialog/styles/index.ts
diff --git a/packages/devui/src/Dialog/styles/material.js b/packages/devui/src/Dialog/styles/material.ts
similarity index 89%
rename from packages/devui/src/Dialog/styles/material.js
rename to packages/devui/src/Dialog/styles/material.ts
index d5abfac5..7b72f928 100644
--- a/packages/devui/src/Dialog/styles/material.js
+++ b/packages/devui/src/Dialog/styles/material.ts
@@ -1,6 +1,12 @@
-import { css } from 'styled-components';
+import { css, ThemedStyledProps } from 'styled-components';
+import { StyleProps } from './default';
+import { Theme } from '../../themes/default';
 
-export const style = ({ theme, open, fullWidth }) => css`
+export const style = ({
+  theme,
+  open,
+  fullWidth
+}: ThemedStyledProps<StyleProps, Theme>) => css`
   position: fixed;
   top: 0px;
   right: 0px;
diff --git a/packages/devui/src/Editor/Editor.js b/packages/devui/src/Editor/Editor.js
deleted file mode 100644
index fc99a4f8..00000000
--- a/packages/devui/src/Editor/Editor.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import styled from 'styled-components';
-import CodeMirror from 'codemirror';
-import { defaultStyle, themedStyle } from './styles';
-
-const EditorContainer = styled.div('', ({ theme }) =>
-  theme.scheme === 'default' && theme.light ? defaultStyle : themedStyle(theme)
-);
-
-export default class Editor extends Component {
-  componentDidMount() {
-    this.cm = CodeMirror(this.node, {
-      value: this.props.value,
-      mode: this.props.mode,
-      lineNumbers: this.props.lineNumbers,
-      lineWrapping: this.props.lineWrapping,
-      readOnly: this.props.readOnly,
-      autofocus: this.props.autofocus,
-      foldGutter: this.props.foldGutter,
-      gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter']
-    });
-
-    if (this.props.onChange) {
-      this.cm.on('change', (doc, change) => {
-        this.props.onChange(doc.getValue(), change);
-      });
-    }
-  }
-
-  componentWillReceiveProps(nextProps) {
-    if (nextProps.value !== this.cm.getValue()) {
-      this.cm.setValue(nextProps.value);
-    }
-    if (nextProps.readOnly !== this.props.readOnly) {
-      this.cm.setOption('readOnly', nextProps.readOnly);
-    }
-    if (nextProps.lineNumbers !== this.props.lineNumbers) {
-      this.cm.setOption('lineNumbers', nextProps.lineNumbers);
-    }
-    if (nextProps.lineWrapping !== this.props.lineWrapping) {
-      this.cm.setOption('lineWrapping', nextProps.lineWrapping);
-    }
-    if (nextProps.foldGutter !== this.props.foldGutter) {
-      this.cm.setOption('foldGutter', nextProps.foldGutter);
-    }
-  }
-
-  shouldComponentUpdate() {
-    return false;
-  }
-
-  componentWillUnmount() {
-    const node = this.node;
-    node.removeChild(node.children[0]);
-    this.cm = null;
-  }
-
-  getRef = node => {
-    this.node = node;
-  };
-
-  render() {
-    return <EditorContainer innerRef={this.getRef} theme={this.props.theme} />;
-  }
-}
-
-Editor.propTypes = {
-  value: PropTypes.string,
-  mode: PropTypes.string,
-  lineNumbers: PropTypes.bool,
-  lineWrapping: PropTypes.bool,
-  readOnly: PropTypes.bool,
-  theme: PropTypes.object,
-  foldGutter: PropTypes.bool,
-  autofocus: PropTypes.bool,
-  onChange: PropTypes.func
-};
-
-Editor.defaultProps = {
-  value: '',
-  mode: 'javascript',
-  lineNumbers: true,
-  lineWrapping: false,
-  readOnly: false,
-  foldGutter: true,
-  autofocus: false
-};
diff --git a/packages/devui/src/Editor/Editor.tsx b/packages/devui/src/Editor/Editor.tsx
new file mode 100644
index 00000000..219b64e7
--- /dev/null
+++ b/packages/devui/src/Editor/Editor.tsx
@@ -0,0 +1,108 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import styled from 'styled-components';
+import CodeMirror from 'codemirror';
+import { defaultStyle, themedStyle } from './styles';
+import { Theme } from '../themes/default';
+
+const EditorContainer = styled.div(
+  ('' as unknown) as TemplateStringsArray,
+  ({ theme }: { theme: Theme }) =>
+    theme.scheme === 'default' && theme.light
+      ? defaultStyle
+      : themedStyle(theme)
+);
+
+interface Props {
+  value: string;
+  mode: string;
+  lineNumbers: boolean;
+  lineWrapping: boolean;
+  readOnly: boolean;
+  theme?: Theme;
+  foldGutter: boolean;
+  autofocus: boolean;
+  onChange: (value: string, change: CodeMirror.EditorChangeLinkedList) => void;
+}
+
+export default class Editor extends Component<Props> {
+  cm?: CodeMirror.Editor | null;
+  node?: HTMLDivElement | null;
+
+  componentDidMount() {
+    this.cm = CodeMirror(this.node!, {
+      value: this.props.value,
+      mode: this.props.mode,
+      lineNumbers: this.props.lineNumbers,
+      lineWrapping: this.props.lineWrapping,
+      readOnly: this.props.readOnly,
+      autofocus: this.props.autofocus,
+      foldGutter: this.props.foldGutter,
+      gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter']
+    });
+
+    if (this.props.onChange) {
+      this.cm.on('change', (doc, change) => {
+        this.props.onChange(doc.getValue(), change);
+      });
+    }
+  }
+
+  componentWillReceiveProps(nextProps: Props) {
+    if (nextProps.value !== this.cm!.getValue()) {
+      this.cm!.setValue(nextProps.value);
+    }
+    if (nextProps.readOnly !== this.props.readOnly) {
+      this.cm!.setOption('readOnly', nextProps.readOnly);
+    }
+    if (nextProps.lineNumbers !== this.props.lineNumbers) {
+      this.cm!.setOption('lineNumbers', nextProps.lineNumbers);
+    }
+    if (nextProps.lineWrapping !== this.props.lineWrapping) {
+      this.cm!.setOption('lineWrapping', nextProps.lineWrapping);
+    }
+    if (nextProps.foldGutter !== this.props.foldGutter) {
+      this.cm!.setOption('foldGutter', nextProps.foldGutter);
+    }
+  }
+
+  shouldComponentUpdate() {
+    return false;
+  }
+
+  componentWillUnmount() {
+    const node = this.node!;
+    node.removeChild(node.children[0]);
+    this.cm = null;
+  }
+
+  getRef: React.RefCallback<HTMLDivElement> = node => {
+    this.node = node;
+  };
+
+  render() {
+    return <EditorContainer innerRef={this.getRef} theme={this.props.theme} />;
+  }
+
+  static propTypes = {
+    value: PropTypes.string,
+    mode: PropTypes.string,
+    lineNumbers: PropTypes.bool,
+    lineWrapping: PropTypes.bool,
+    readOnly: PropTypes.bool,
+    theme: PropTypes.object,
+    foldGutter: PropTypes.bool,
+    autofocus: PropTypes.bool,
+    onChange: PropTypes.func
+  };
+
+  static defaultProps = {
+    value: '',
+    mode: 'javascript',
+    lineNumbers: true,
+    lineWrapping: false,
+    readOnly: false,
+    foldGutter: true,
+    autofocus: false
+  };
+}
diff --git a/packages/devui/src/Editor/index.js b/packages/devui/src/Editor/index.ts
similarity index 100%
rename from packages/devui/src/Editor/index.js
rename to packages/devui/src/Editor/index.ts
diff --git a/packages/devui/src/Editor/stories/WithTabs.js b/packages/devui/src/Editor/stories/WithTabs.tsx
similarity index 64%
rename from packages/devui/src/Editor/stories/WithTabs.js
rename to packages/devui/src/Editor/stories/WithTabs.tsx
index 265992c3..2c6e5a53 100644
--- a/packages/devui/src/Editor/stories/WithTabs.js
+++ b/packages/devui/src/Editor/stories/WithTabs.tsx
@@ -1,5 +1,4 @@
-import React, { Component } from 'react';
-import { select } from '@storybook/addon-knobs';
+import React, { Component, ComponentType } from 'react';
 import Editor from '../';
 import Tabs from '../../Tabs';
 
@@ -11,8 +10,17 @@ const value2 = `
   const func2 = () => {}
 `;
 
+interface Props {
+  lineNumbers: boolean;
+}
+
+interface TabProps {
+  value: string;
+  lineNumbers: boolean;
+}
+
 /* eslint-disable react/prop-types */
-export default class WithTabs extends Component {
+export default class WithTabs extends Component<Props> {
   state = {
     selected: 'Function 1'
   };
@@ -20,16 +28,16 @@ export default class WithTabs extends Component {
   render() {
     const { lineNumbers } = this.props;
     return (
-      <Tabs
+      <Tabs<TabProps>
         tabs={[
           {
             name: 'Function 1',
-            component: Editor,
+            component: (Editor as unknown) as ComponentType<TabProps>,
             selector: () => ({ value: value1, lineNumbers })
           },
           {
             name: 'Function 2',
-            component: Editor,
+            component: (Editor as unknown) as ComponentType<TabProps>,
             selector: () => ({ value: value2, lineNumbers })
           }
         ]}
@@ -37,7 +45,6 @@ export default class WithTabs extends Component {
         onClick={selected => {
           this.setState({ selected });
         }}
-        align={select('align', ['left', 'right', 'center'], 'left')}
       />
     );
   }
diff --git a/packages/devui/src/Editor/stories/index.js b/packages/devui/src/Editor/stories/index.tsx
old mode 100755
new mode 100644
similarity index 100%
rename from packages/devui/src/Editor/stories/index.js
rename to packages/devui/src/Editor/stories/index.tsx
diff --git a/packages/devui/src/Editor/styles/index.js b/packages/devui/src/Editor/styles/index.ts
similarity index 97%
rename from packages/devui/src/Editor/styles/index.js
rename to packages/devui/src/Editor/styles/index.ts
index f92082fc..bfeffcc8 100644
--- a/packages/devui/src/Editor/styles/index.js
+++ b/packages/devui/src/Editor/styles/index.ts
@@ -1,4 +1,5 @@
 import { css } from 'styled-components';
+import { Theme } from '../../themes/default';
 
 export const defaultStyle = `
   height: 100%;
@@ -10,7 +11,7 @@ export const defaultStyle = `
   }
 `;
 
-export const themedStyle = theme => css`
+export const themedStyle = (theme: Theme) => css`
   height: 100%;
 
   > div {
diff --git a/packages/devui/src/Form/Form.js b/packages/devui/src/Form/Form.tsx
similarity index 50%
rename from packages/devui/src/Form/Form.js
rename to packages/devui/src/Form/Form.tsx
index 2a289b71..ea3677af 100644
--- a/packages/devui/src/Form/Form.js
+++ b/packages/devui/src/Form/Form.tsx
@@ -1,14 +1,23 @@
 import React, { PureComponent, Component } from 'react';
 import PropTypes from 'prop-types';
-import JSONSchemaForm from 'react-jsonschema-form';
+import JSONSchemaForm, { FormProps } from 'react-jsonschema-form';
 import createStyledComponent from '../utils/createStyledComponent';
 import styles from './styles';
 import Button from '../Button';
 import customWidgets from './widgets';
+import { Theme } from '../themes/default';
 
 const FormContainer = createStyledComponent(styles, JSONSchemaForm);
 
-export default class Form extends (PureComponent || Component) {
+export interface Props<T> extends FormProps<T> {
+  children?: React.ReactNode;
+  submitText?: string;
+  primaryButton?: boolean;
+  noSubmit?: boolean;
+  theme?: Theme;
+}
+
+export default class Form<T> extends (PureComponent || Component)<Props<T>> {
   render() {
     const {
       widgets,
@@ -19,7 +28,10 @@ export default class Form extends (PureComponent || Component) {
       ...rest
     } = this.props;
     return (
-      <FormContainer {...rest} widgets={{ ...customWidgets, ...widgets }}>
+      <FormContainer
+        {...(rest as Props<unknown>)}
+        widgets={{ ...customWidgets, ...widgets }}
+      >
         {noSubmit ? (
           <noscript />
         ) : (
@@ -37,17 +49,17 @@ export default class Form extends (PureComponent || Component) {
       </FormContainer>
     );
   }
-}
 
-Form.propTypes = {
-  children: PropTypes.any,
-  submitText: PropTypes.string,
-  primaryButton: PropTypes.bool,
-  noSubmit: PropTypes.bool,
-  schema: PropTypes.object.isRequired,
-  uiSchema: PropTypes.object,
-  formData: PropTypes.any,
-  widgets: PropTypes.objectOf(
-    PropTypes.oneOfType([PropTypes.func, PropTypes.object])
-  )
-};
+  static propTypes = {
+    children: PropTypes.any,
+    submitText: PropTypes.string,
+    primaryButton: PropTypes.bool,
+    noSubmit: PropTypes.bool,
+    schema: PropTypes.object.isRequired,
+    uiSchema: PropTypes.object,
+    formData: PropTypes.any,
+    widgets: PropTypes.objectOf(
+      PropTypes.oneOfType([PropTypes.func, PropTypes.object])
+    )
+  };
+}
diff --git a/packages/devui/src/Form/index.js b/packages/devui/src/Form/index.ts
similarity index 100%
rename from packages/devui/src/Form/index.js
rename to packages/devui/src/Form/index.ts
diff --git a/packages/devui/src/Form/stories/index.js b/packages/devui/src/Form/stories/index.tsx
old mode 100755
new mode 100644
similarity index 100%
rename from packages/devui/src/Form/stories/index.js
rename to packages/devui/src/Form/stories/index.tsx
diff --git a/packages/devui/src/Form/stories/schema.js b/packages/devui/src/Form/stories/schema.js
deleted file mode 100644
index 627a9bc6..00000000
--- a/packages/devui/src/Form/stories/schema.js
+++ /dev/null
@@ -1,89 +0,0 @@
-module.exports = {
-  schema: {
-    title: 'Example form',
-    description: 'A simple form example.',
-    type: 'object',
-    required: ['name'],
-    properties: {
-      name: {
-        type: 'string',
-        title: 'Full name'
-      },
-      age: {
-        type: 'integer',
-        title: 'Age'
-      },
-      bio: {
-        type: 'string',
-        title: 'Bio'
-      },
-      password: {
-        type: 'string',
-        title: 'Password',
-        minLength: 3
-      },
-      multipleChoicesList: {
-        type: 'array',
-        title: 'A multiple choices list',
-        items: {
-          type: 'string',
-          enum: ['foo', 'bar', 'fuzz']
-        },
-        uniqueItems: true
-      },
-      numberEnum: {
-        type: 'number',
-        title: 'Number enum',
-        enum: [1, 2, 3]
-      },
-      numberEnumRadio: {
-        type: 'number',
-        title: 'Number enum',
-        enum: [1, 2, 3]
-      },
-      integerRange: {
-        title: 'Integer range',
-        type: 'integer',
-        minimum: 42,
-        maximum: 100
-      }
-    }
-  },
-  uiSchema: {
-    name: {
-      'ui:autofocus': true
-    },
-    age: {
-      'ui:widget': 'updown'
-    },
-    bio: {
-      'ui:widget': 'textarea'
-    },
-    password: {
-      'ui:widget': 'password',
-      'ui:help': 'Hint: Make it strong!'
-    },
-    date: {
-      'ui:widget': 'alt-datetime'
-    },
-    multipleChoicesList: {
-      'ui:widget': 'checkboxes'
-    },
-    numberEnumRadio: {
-      'ui:widget': 'radio',
-      'ui:options': {
-        inline: true
-      }
-    },
-    integerRange: {
-      'ui:widget': 'range'
-    }
-  },
-  formData: {
-    name: 'Chuck Norris',
-    age: 75,
-    bio: 'Roundhouse kicking asses since 1940',
-    password: 'noneed',
-    integerRange: 52
-  }
-};
diff --git a/packages/devui/src/Form/stories/schema.ts b/packages/devui/src/Form/stories/schema.ts
new file mode 100644
index 00000000..9fab5f4c
--- /dev/null
+++ b/packages/devui/src/Form/stories/schema.ts
@@ -0,0 +1,91 @@
+import { JSONSchema6 } from 'json-schema';
+
+export const schema: JSONSchema6 = {
+  title: 'Example form',
+  description: 'A simple form example.',
+  type: 'object',
+  required: ['name'],
+  properties: {
+    name: {
+      type: 'string',
+      title: 'Full name'
+    },
+    age: {
+      type: 'integer',
+      title: 'Age'
+    },
+    bio: {
+      type: 'string',
+      title: 'Bio'
+    },
+    password: {
+      type: 'string',
+      title: 'Password',
+      minLength: 3
+    },
+    multipleChoicesList: {
+      type: 'array',
+      title: 'A multiple choices list',
+      items: {
+        type: 'string',
+        enum: ['foo', 'bar', 'fuzz']
+      },
+      uniqueItems: true
+    },
+    numberEnum: {
+      type: 'number',
+      title: 'Number enum',
+      enum: [1, 2, 3]
+    },
+    numberEnumRadio: {
+      type: 'number',
+      title: 'Number enum',
+      enum: [1, 2, 3]
+    },
+    integerRange: {
+      title: 'Integer range',
+      type: 'integer',
+      minimum: 42,
+      maximum: 100
+    }
+  }
+};
+
+export const uiSchema = {
+  name: {
+    'ui:autofocus': true
+  },
+  age: {
+    'ui:widget': 'updown'
+  },
+  bio: {
+    'ui:widget': 'textarea'
+  },
+  password: {
+    'ui:widget': 'password',
+    'ui:help': 'Hint: Make it strong!'
+  },
+  date: {
+    'ui:widget': 'alt-datetime'
+  },
+  multipleChoicesList: {
+    'ui:widget': 'checkboxes'
+  },
+  numberEnumRadio: {
+    'ui:widget': 'radio',
+    'ui:options': {
+      inline: true
+    }
+  },
+  integerRange: {
+    'ui:widget': 'range'
+  }
+};
+
+export const formData = {
+  name: 'Chuck Norris',
+  age: 75,
+  bio: 'Roundhouse kicking asses since 1940',
+  password: 'noneed',
+  integerRange: 52
+};
diff --git a/packages/devui/src/Form/styles/index.js b/packages/devui/src/Form/styles/index.ts
similarity index 97%
rename from packages/devui/src/Form/styles/index.js
rename to packages/devui/src/Form/styles/index.ts
index 6f13709b..46563141 100644
--- a/packages/devui/src/Form/styles/index.js
+++ b/packages/devui/src/Form/styles/index.ts
@@ -1,6 +1,7 @@
-import { css } from 'styled-components';
+import { css, ThemedStyledProps } from 'styled-components';
+import { Theme } from '../../themes/default';
 
-export default ({ theme }) => css`
+export default ({ theme }: ThemedStyledProps<{}, Theme>) => css`
   padding: 10px;
   line-height: 1.846;
   font-size: 14px;
diff --git a/packages/devui/src/Form/widgets.js b/packages/devui/src/Form/widgets.js
deleted file mode 100644
index dac87153..00000000
--- a/packages/devui/src/Form/widgets.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import React from 'react';
-import Select from '../Select';
-import Slider from '../Slider';
-
-/* eslint-disable react/prop-types */
-const SelectWidget = ({ options, multi, ...rest }) => (
-  <Select options={options.enumOptions} multiple={multi} {...rest} />
-);
-
-const RangeWidget = ({
-  schema,
-  readonly,
-  autofocus,
-  label, // eslint-disable-line
-  options, // eslint-disable-line
-  formContext, // eslint-disable-line
-  registry, // eslint-disable-line
-  ...rest
-}) => (
-  <Slider
-    {...rest}
-    autoFocus={autofocus}
-    readOnly={readonly}
-    min={schema.minimum}
-    max={schema.maximum}
-    step={schema.multipleOf}
-    withValue
-  />
-);
-
-export default { SelectWidget, RangeWidget };
diff --git a/packages/devui/src/Form/widgets.tsx b/packages/devui/src/Form/widgets.tsx
new file mode 100644
index 00000000..0dd27449
--- /dev/null
+++ b/packages/devui/src/Form/widgets.tsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import Select from '../Select';
+import Slider from '../Slider';
+import { FieldProps, Widget, WidgetProps } from 'react-jsonschema-form';
+import { Options } from 'react-select';
+
+/* eslint-disable react/prop-types */
+const SelectWidget: Widget = ({
+  options,
+  onFocus,
+  onBlur,
+  ...rest
+}: WidgetProps) => (
+  <Select options={options.enumOptions as Options} {...rest} />
+);
+
+const RangeWidget: Widget = (({
+  schema,
+  readonly,
+  autofocus,
+  label, // eslint-disable-line
+  options, // eslint-disable-line
+  formContext, // eslint-disable-line
+  registry, // eslint-disable-line
+  ...rest
+}: WidgetProps & { registry: FieldProps['registry'] }) =>
+  (
+    <Slider {...rest} min={schema.minimum} max={schema.maximum} withValue />
+  ) as unknown) as Widget;
+
+export default { SelectWidget, RangeWidget };
diff --git a/packages/devui/src/Notification/Notification.js b/packages/devui/src/Notification/Notification.tsx
similarity index 66%
rename from packages/devui/src/Notification/Notification.js
rename to packages/devui/src/Notification/Notification.tsx
index 8686afda..a08df8c2 100644
--- a/packages/devui/src/Notification/Notification.js
+++ b/packages/devui/src/Notification/Notification.tsx
@@ -6,11 +6,21 @@ import ErrorIcon from 'react-icons/lib/md/error';
 import SuccessIcon from 'react-icons/lib/md/check-circle';
 import createStyledComponent from '../utils/createStyledComponent';
 import styles from './styles';
+import { Theme } from '../themes/default';
 
 const NotificationWrapper = createStyledComponent(styles);
 
-export default class Notification extends Component {
-  shouldComponentUpdate(nextProps) {
+export type Type = 'info' | 'success' | 'warning' | 'error';
+
+interface Props {
+  children?: React.ReactNode;
+  type: Type;
+  onClose?: React.MouseEventHandler<HTMLButtonElement>;
+  theme?: Theme;
+}
+
+export default class Notification extends Component<Props> {
+  shouldComponentUpdate(nextProps: Props) {
     return (
       nextProps.children !== this.props.children ||
       nextProps.type !== this.props.type
@@ -43,15 +53,15 @@ export default class Notification extends Component {
       </NotificationWrapper>
     );
   }
+
+  static propTypes = {
+    children: PropTypes.any.isRequired,
+    type: PropTypes.oneOf(['info', 'success', 'warning', 'error']),
+    onClose: PropTypes.func,
+    theme: PropTypes.object
+  };
+
+  static defaultProps = {
+    type: 'info'
+  };
 }
-
-Notification.propTypes = {
-  children: PropTypes.any.isRequired,
-  type: PropTypes.oneOf(['info', 'success', 'warning', 'error']),
-  onClose: PropTypes.func,
-  theme: PropTypes.object
-};
-
-Notification.defaultProps = {
-  type: 'info'
-};
diff --git a/packages/devui/src/Notification/index.js b/packages/devui/src/Notification/index.ts
similarity index 100%
rename from packages/devui/src/Notification/index.js
rename to packages/devui/src/Notification/index.ts
diff --git a/packages/devui/src/Notification/stories/index.js b/packages/devui/src/Notification/stories/index.tsx
similarity index 91%
rename from packages/devui/src/Notification/stories/index.js
rename to packages/devui/src/Notification/stories/index.tsx
index 52ad1a60..77206c03 100644
--- a/packages/devui/src/Notification/stories/index.js
+++ b/packages/devui/src/Notification/stories/index.tsx
@@ -4,6 +4,7 @@ import { action } from '@storybook/addon-actions';
 import styled from 'styled-components';
 import { withKnobs, text, select } from '@storybook/addon-knobs';
 import Notification from '../';
+import { Type } from '../Notification';
 
 export const Container = styled.div`
   display: flex;
@@ -18,7 +19,7 @@ storiesOf('Notification', module)
   .add('default', () => (
     <Container>
       <Notification
-        type={select(
+        type={select<Type>(
           'type',
           ['info', 'success', 'warning', 'error'],
           'warning'
diff --git a/packages/devui/src/Notification/styles/index.js b/packages/devui/src/Notification/styles/index.ts
similarity index 76%
rename from packages/devui/src/Notification/styles/index.js
rename to packages/devui/src/Notification/styles/index.ts
index 5b57865f..509cda52 100644
--- a/packages/devui/src/Notification/styles/index.js
+++ b/packages/devui/src/Notification/styles/index.ts
@@ -1,6 +1,8 @@
-import { css } from 'styled-components';
+import { css, ThemedStyledProps } from 'styled-components';
+import { Theme } from '../../themes/default';
+import { Type } from '../Notification';
 
-const getBackground = (theme, type) => {
+const getBackground = (theme: Theme, type: Type) => {
   switch (type) {
     case 'success':
       return `background-color: ${theme.base0B};`;
@@ -13,7 +15,11 @@ const getBackground = (theme, type) => {
   }
 };
 
-export default ({ theme, type }) => css`
+interface StyleProps {
+  type: Type;
+}
+
+export default ({ theme, type }: ThemedStyledProps<StyleProps, Theme>) => css`
   display: flex;
   align-items: flex-start;
   flex-shrink: 0;
diff --git a/packages/devui/src/SegmentedControl/SegmentedControl.js b/packages/devui/src/SegmentedControl/SegmentedControl.tsx
similarity index 56%
rename from packages/devui/src/SegmentedControl/SegmentedControl.js
rename to packages/devui/src/SegmentedControl/SegmentedControl.tsx
index a626f2ac..f17c2fd6 100644
--- a/packages/devui/src/SegmentedControl/SegmentedControl.js
+++ b/packages/devui/src/SegmentedControl/SegmentedControl.tsx
@@ -2,23 +2,32 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import createStyledComponent from '../utils/createStyledComponent';
 import styles from './styles';
+import { Theme } from '../themes/default';
 
 const SegmentedWrapper = createStyledComponent(styles);
 
-export default class SegmentedControl extends Component {
-  shouldComponentUpdate(nextProps) {
+interface Props {
+  values: string[];
+  selected?: string;
+  onClick: (value: string) => void;
+  disabled?: boolean;
+  theme?: Theme;
+}
+
+export default class SegmentedControl extends Component<Props> {
+  shouldComponentUpdate(nextProps: Props) {
     return (
       nextProps.disabled !== this.props.disabled ||
       nextProps.selected !== this.props.selected
     );
   }
 
-  onClick = e => {
-    this.props.onClick(e.target.value);
+  onClick: React.MouseEventHandler<HTMLButtonElement> = e => {
+    this.props.onClick(e.currentTarget.value);
   };
 
-  onMouseUp = e => {
-    e.target.blur();
+  onMouseUp: React.MouseEventHandler<HTMLButtonElement> = e => {
+    e.currentTarget.blur();
   };
 
   render() {
@@ -39,12 +48,12 @@ export default class SegmentedControl extends Component {
       </SegmentedWrapper>
     );
   }
-}
 
-SegmentedControl.propTypes = {
-  values: PropTypes.array.isRequired,
-  selected: PropTypes.string,
-  onClick: PropTypes.func,
-  disabled: PropTypes.bool,
-  theme: PropTypes.object
-};
+  static propTypes = {
+    values: PropTypes.array.isRequired,
+    selected: PropTypes.string,
+    onClick: PropTypes.func,
+    disabled: PropTypes.bool,
+    theme: PropTypes.object
+  };
+}
diff --git a/packages/devui/src/SegmentedControl/index.js b/packages/devui/src/SegmentedControl/index.ts
similarity index 100%
rename from packages/devui/src/SegmentedControl/index.js
rename to packages/devui/src/SegmentedControl/index.ts
diff --git a/packages/devui/src/SegmentedControl/stories/index.js b/packages/devui/src/SegmentedControl/stories/index.tsx
similarity index 100%
rename from packages/devui/src/SegmentedControl/stories/index.js
rename to packages/devui/src/SegmentedControl/stories/index.tsx
diff --git a/packages/devui/src/SegmentedControl/styles/index.js b/packages/devui/src/SegmentedControl/styles/index.ts
similarity index 79%
rename from packages/devui/src/SegmentedControl/styles/index.js
rename to packages/devui/src/SegmentedControl/styles/index.ts
index ebb41c0c..fc6fff2d 100644
--- a/packages/devui/src/SegmentedControl/styles/index.js
+++ b/packages/devui/src/SegmentedControl/styles/index.ts
@@ -1,7 +1,15 @@
-import { css } from 'styled-components';
+import { css, ThemedStyledProps } from 'styled-components';
 import color from '../../utils/color';
+import { Theme } from '../../themes/default';
 
-export default ({ theme, disabled }) => css`
+interface StyleProps {
+  disabled: boolean | undefined;
+}
+
+export default ({
+  theme,
+  disabled
+}: ThemedStyledProps<StyleProps, Theme>) => css`
   display: flex;
   flex-shrink: 0;
 
diff --git a/packages/devui/src/Select/Select.js b/packages/devui/src/Select/Select.js
deleted file mode 100644
index 0ef3431b..00000000
--- a/packages/devui/src/Select/Select.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import React, { PureComponent, Component } from 'react';
-import PropTypes from 'prop-types';
-import ReactSelect from 'react-select';
-import createStyledComponent from '../utils/createStyledComponent';
-import styles from './styles';
-
-const SelectContainer = createStyledComponent(styles, ReactSelect);
-
-export default class Select extends (PureComponent || Component) {
-  render() {
-    return <SelectContainer {...this.props} />;
-  }
-}
-
-Select.propTypes = {
-  autosize: PropTypes.bool, // whether to enable autosizing or not
-  clearable: PropTypes.bool, // should it be possible to reset value
-  disabled: PropTypes.bool, // whether the Select is disabled or not
-  isLoading: PropTypes.bool, // whether the Select is loading externally or not
-  menuMaxHeight: PropTypes.number, // maximum css height for the opened menu of options
-  multi: PropTypes.bool, // multi-value input
-  searchable: PropTypes.bool, // whether to enable searching feature or not
-  simpleValue: PropTypes.bool, // pass the value with label to onChange
-  value: PropTypes.any, // initial field value
-  valueKey: PropTypes.string, // path of the label value in option objects
-  openOuterUp: PropTypes.bool // value to control the opening direction
-};
-
-Select.defaultProps = {
-  autosize: true,
-  clearable: false,
-  simpleValue: true,
-  menuMaxHeight: 200
-};
diff --git a/packages/devui/src/Select/Select.tsx b/packages/devui/src/Select/Select.tsx
new file mode 100644
index 00000000..b69e7cd7
--- /dev/null
+++ b/packages/devui/src/Select/Select.tsx
@@ -0,0 +1,42 @@
+import React, { PureComponent, Component } from 'react';
+import PropTypes from 'prop-types';
+import ReactSelect, { ReactSelectProps } from 'react-select';
+import createStyledComponent from '../utils/createStyledComponent';
+import styles from './styles';
+
+const SelectContainer = createStyledComponent<Props>(
+  styles,
+  (ReactSelect as unknown) as React.ComponentClass<Props>
+);
+
+interface Props extends Omit<ReactSelectProps, 'ref'> {
+  menuMaxHeight: number;
+  openOuterUp?: boolean;
+}
+
+export default class Select extends (PureComponent || Component)<Props> {
+  render() {
+    return <SelectContainer {...this.props} />;
+  }
+
+  static propTypes = {
+    autosize: PropTypes.bool, // whether to enable autosizing or not
+    clearable: PropTypes.bool, // should it be possible to reset value
+    disabled: PropTypes.bool, // whether the Select is disabled or not
+    isLoading: PropTypes.bool, // whether the Select is loading externally or not
+    menuMaxHeight: PropTypes.number, // maximum css height for the opened menu of options
+    multi: PropTypes.bool, // multi-value input
+    searchable: PropTypes.bool, // whether to enable searching feature or not
+    simpleValue: PropTypes.bool, // pass the value with label to onChange
+    value: PropTypes.any, // initial field value
+    valueKey: PropTypes.string, // path of the label value in option objects
+    openOuterUp: PropTypes.bool // value to control the opening direction
+  };
+
+  static defaultProps = {
+    autosize: true,
+    clearable: false,
+    simpleValue: true,
+    menuMaxHeight: 200
+  };
+}
diff --git a/packages/devui/src/Select/index.js b/packages/devui/src/Select/index.js
deleted file mode 100644
index 3aed11c7..00000000
--- a/packages/devui/src/Select/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export default from './Select';
diff --git a/packages/devui/src/Select/index.ts b/packages/devui/src/Select/index.ts
new file mode 100644
index 00000000..22ae8193
--- /dev/null
+++ b/packages/devui/src/Select/index.ts
@@ -0,0 +1 @@
+export { default } from './Select';
diff --git a/packages/devui/src/Select/stories/index.js b/packages/devui/src/Select/stories/index.tsx
old mode 100755
new mode 100644
similarity index 100%
rename from packages/devui/src/Select/stories/index.js
rename to packages/devui/src/Select/stories/index.tsx
diff --git a/packages/devui/src/Select/stories/options.js b/packages/devui/src/Select/stories/options.ts
similarity index 100%
rename from packages/devui/src/Select/stories/options.js
rename to packages/devui/src/Select/stories/options.ts
diff --git a/packages/devui/src/Select/styles/index.js b/packages/devui/src/Select/styles/index.ts
similarity index 96%
rename from packages/devui/src/Select/styles/index.js
rename to packages/devui/src/Select/styles/index.ts
index 4c5a5ec5..dceb547f 100644
--- a/packages/devui/src/Select/styles/index.js
+++ b/packages/devui/src/Select/styles/index.ts
@@ -1,7 +1,17 @@
-import { css } from 'styled-components';
+import { css, ThemedStyledProps } from 'styled-components';
 import { fadeIn, spinner } from '../../utils/animations';
+import { Theme } from '../../themes/default';
 
-export default ({ theme, openOuterUp, menuMaxHeight }) => css`
+interface StyleProps {
+  openOuterUp?: boolean;
+  menuMaxHeight: number;
+}
+
+export default ({
+  theme,
+  openOuterUp,
+  menuMaxHeight
+}: ThemedStyledProps<StyleProps, Theme>) => css`
   &.Select {
     position: relative;
 
diff --git a/packages/devui/src/Slider/Slider.js b/packages/devui/src/Slider/Slider.tsx
similarity index 66%
rename from packages/devui/src/Slider/Slider.js
rename to packages/devui/src/Slider/Slider.tsx
index 85d893f8..31286144 100644
--- a/packages/devui/src/Slider/Slider.js
+++ b/packages/devui/src/Slider/Slider.tsx
@@ -3,12 +3,25 @@ import PropTypes from 'prop-types';
 import createStyledComponent from '../utils/createStyledComponent';
 import * as styles from './styles';
 import { containerStyle } from './styles/common';
+import { Theme } from '../themes/default';
 
 const SliderWrapper = createStyledComponent(styles);
 const ContainerWithValue = createStyledComponent(containerStyle);
 
-export default class Slider extends Component {
-  shouldComponentUpdate(nextProps) {
+interface Props {
+  value: number;
+  min: number;
+  max: number;
+  label?: string;
+  sublabel?: string;
+  withValue?: boolean;
+  disabled?: boolean;
+  onChange: (value: number) => void;
+  theme?: Theme;
+}
+
+export default class Slider extends Component<Props> {
+  shouldComponentUpdate(nextProps: Props) {
     return (
       nextProps.label !== this.props.label ||
       nextProps.value !== this.props.value ||
@@ -19,7 +32,7 @@ export default class Slider extends Component {
     );
   }
 
-  onChange = e => {
+  onChange: React.ChangeEventHandler<HTMLInputElement> = e => {
     this.props.onChange(parseFloat(e.target.value));
   };
 
@@ -53,18 +66,18 @@ export default class Slider extends Component {
       </SliderWrapper>
     );
   }
+
+  static propTypes = {
+    value: PropTypes.number,
+    min: PropTypes.number,
+    max: PropTypes.number,
+    label: PropTypes.string,
+    sublabel: PropTypes.string,
+    withValue: PropTypes.bool,
+    disabled: PropTypes.bool,
+    onChange: PropTypes.func,
+    theme: PropTypes.object
+  };
+
+  static defaultProps = { value: 0, min: 0, max: 100 };
 }
-
-Slider.propTypes = {
-  value: PropTypes.number,
-  min: PropTypes.number,
-  max: PropTypes.number,
-  label: PropTypes.string,
-  sublabel: PropTypes.string,
-  withValue: PropTypes.bool,
-  disabled: PropTypes.bool,
-  onChange: PropTypes.func,
-  theme: PropTypes.object
-};
-
-Slider.defaultProps = { value: 0, min: 0, max: 100 };
diff --git a/packages/devui/src/Slider/index.js b/packages/devui/src/Slider/index.js
deleted file mode 100644
index 12b099f9..00000000
--- a/packages/devui/src/Slider/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export default from './Slider';
diff --git a/packages/devui/src/Slider/index.ts b/packages/devui/src/Slider/index.ts
new file mode 100644
index 00000000..9898d6a8
--- /dev/null
+++ b/packages/devui/src/Slider/index.ts
@@ -0,0 +1 @@
+export { default } from './Slider';
diff --git a/packages/devui/src/Slider/stories/index.js b/packages/devui/src/Slider/stories/index.tsx
old mode 100755
new mode 100644
similarity index 100%
rename from packages/devui/src/Slider/stories/index.js
rename to packages/devui/src/Slider/stories/index.tsx
diff --git a/packages/devui/src/Slider/styles/common.js b/packages/devui/src/Slider/styles/common.ts
similarity index 60%
rename from packages/devui/src/Slider/styles/common.js
rename to packages/devui/src/Slider/styles/common.ts
index ed8e04b1..7a7351c1 100644
--- a/packages/devui/src/Slider/styles/common.js
+++ b/packages/devui/src/Slider/styles/common.ts
@@ -1,6 +1,7 @@
-import { css } from 'styled-components';
+import { css, ThemedStyledProps } from 'styled-components';
+import { Theme } from '../../themes/default';
 
-export const containerStyle = ({ theme }) => css`
+export const containerStyle = ({ theme }: ThemedStyledProps<{}, Theme>) => css`
   display: flex;
   align-items: center;
 
diff --git a/packages/devui/src/Slider/styles/default.js b/packages/devui/src/Slider/styles/default.ts
similarity index 85%
rename from packages/devui/src/Slider/styles/default.js
rename to packages/devui/src/Slider/styles/default.ts
index 82234cd6..9146d007 100644
--- a/packages/devui/src/Slider/styles/default.js
+++ b/packages/devui/src/Slider/styles/default.ts
@@ -6,10 +6,22 @@ Based on:
  http://codepen.io/thebabydino/pen/YPOPxr
 */
 
-import { css } from 'styled-components';
+import { css, ThemedStyledProps } from 'styled-components';
 import { prefixSelectors } from '../../utils/autoPrefix';
+import { Theme } from '../../themes/default';
 
-export const style = ({ theme, percent, disabled, withLabel }) => css`
+export interface StyleProps {
+  percent: number;
+  disabled: boolean;
+  withLabel: boolean;
+}
+
+export const style = ({
+  theme,
+  percent,
+  disabled,
+  withLabel
+}: ThemedStyledProps<StyleProps, Theme>) => css`
   display: block;
   width: 100%;
   position: relative;
@@ -56,9 +68,7 @@ export const style = ({ theme, percent, disabled, withLabel }) => css`
     height: 0.8em;
     border-radius: 0.5em;
     box-shadow: 0 0 .125em ${theme.base04};
-    background: linear-gradient(${theme.base01}, ${theme.base02} 40%, ${
-      theme.base01
-    })
+    background: linear-gradient(${theme.base01}, ${theme.base02} 40%, ${theme.base01})
       no-repeat ${theme.base00};
     background-size: ${percent}% 100%;
   }`
diff --git a/packages/devui/src/Slider/styles/index.js b/packages/devui/src/Slider/styles/index.ts
similarity index 100%
rename from packages/devui/src/Slider/styles/index.js
rename to packages/devui/src/Slider/styles/index.ts
diff --git a/packages/devui/src/Slider/styles/material.js b/packages/devui/src/Slider/styles/material.ts
similarity index 87%
rename from packages/devui/src/Slider/styles/material.js
rename to packages/devui/src/Slider/styles/material.ts
index 17af550e..9d7a9fa0 100644
--- a/packages/devui/src/Slider/styles/material.js
+++ b/packages/devui/src/Slider/styles/material.ts
@@ -1,9 +1,16 @@
-import { css } from 'styled-components';
+import { css, ThemedStyledProps } from 'styled-components';
 import { prefixSelectors } from '../../utils/autoPrefix';
 import color from '../../utils/color';
 import { animationCurve } from '../../utils/animations';
+import { StyleProps } from './default';
+import { Theme } from '../../themes/default';
 
-export const style = ({ theme, percent, disabled, withLabel }) => css`
+export const style = ({
+  theme,
+  percent,
+  disabled,
+  withLabel
+}: ThemedStyledProps<StyleProps, Theme>) => css`
   display: block;
   width: 100%;
   position: relative;
diff --git a/packages/devui/src/Tabs/Tabs.js b/packages/devui/src/Tabs/Tabs.tsx
similarity index 52%
rename from packages/devui/src/Tabs/Tabs.js
rename to packages/devui/src/Tabs/Tabs.tsx
index 09376cba..ca6614c2 100644
--- a/packages/devui/src/Tabs/Tabs.js
+++ b/packages/devui/src/Tabs/Tabs.tsx
@@ -3,27 +3,54 @@ import PropTypes from 'prop-types';
 import TabsHeader from './TabsHeader';
 import { TabsContainer } from './styles/common';
 
-export default class Tabs extends Component {
-  constructor(props) {
+export type ReactButtonElement = React.ReactElement<
+  JSX.IntrinsicElements['button'],
+  'button'
+>;
+
+export interface Tab<P> {
+  name: string;
+  value?: string;
+  component?: React.ComponentType<P>;
+  selector?: (tab: this) => P;
+}
+
+export type Position = 'left' | 'right' | 'center';
+
+interface Props<P> {
+  tabs: Tab<P>[];
+  selected?: string;
+  main?: boolean;
+  onClick: (value: string) => void;
+  collapsible?: boolean;
+  position: Position;
+}
+
+export default class Tabs<P> extends Component<Props<P>> {
+  constructor(props: Props<P>) {
     super(props);
     this.updateTabs(props);
   }
 
-  componentWillReceiveProps(nextProps) {
+  tabsHeader?: ReactButtonElement[];
+  SelectedComponent?: React.ComponentType<P>;
+  selector?: () => P;
+
+  componentWillReceiveProps(nextProps: Props<P>) {
     if (nextProps.selected !== this.props.selected) {
       this.updateTabs(nextProps);
     }
   }
 
-  onMouseUp = e => {
-    e.target.blur();
+  onMouseUp: React.MouseEventHandler<HTMLButtonElement> = e => {
+    e.currentTarget.blur();
   };
 
-  onClick = e => {
-    this.props.onClick(e.target.value);
+  onClick: React.MouseEventHandler<HTMLButtonElement> = e => {
+    this.props.onClick(e.currentTarget.value);
   };
 
-  updateTabs(props) {
+  updateTabs(props: Props<P>) {
     const tabs = props.tabs;
     const selected = props.selected;
 
@@ -34,7 +61,7 @@ export default class Tabs extends Component {
         isSelected = true;
         if (tab.component) {
           this.SelectedComponent = tab.component;
-          if (tab.selector) this.selector = () => tab.selector(tab);
+          if (tab.selector) this.selector = () => tab.selector!(tab);
         }
       }
       return (
@@ -54,7 +81,7 @@ export default class Tabs extends Component {
   render() {
     const tabsHeader = (
       <TabsHeader
-        tabs={this.tabsHeader}
+        tabs={this.tabsHeader!}
         items={this.props.tabs}
         main={this.props.main}
         collapsible={this.props.collapsible}
@@ -76,20 +103,20 @@ export default class Tabs extends Component {
       <TabsContainer position={this.props.position}>
         {tabsHeader}
         <div>
-          <this.SelectedComponent {...this.selector && this.selector()} />
+          <this.SelectedComponent {...(this.selector! && this.selector!())} />
         </div>
       </TabsContainer>
     );
   }
+
+  static propTypes = {
+    tabs: PropTypes.array.isRequired,
+    selected: PropTypes.string,
+    main: PropTypes.bool,
+    onClick: PropTypes.func.isRequired,
+    collapsible: PropTypes.bool,
+    position: PropTypes.oneOf(['left', 'right', 'center'])
+  };
+
+  static defaultProps = { position: 'left' };
 }
-
-Tabs.propTypes = {
-  tabs: PropTypes.array.isRequired,
-  selected: PropTypes.string,
-  main: PropTypes.bool,
-  onClick: PropTypes.func.isRequired,
-  collapsible: PropTypes.bool,
-  position: PropTypes.oneOf(['left', 'right', 'center'])
-};
-
-Tabs.defaultProps = { position: 'left' };
diff --git a/packages/devui/src/Tabs/TabsHeader.js b/packages/devui/src/Tabs/TabsHeader.tsx
similarity index 66%
rename from packages/devui/src/Tabs/TabsHeader.js
rename to packages/devui/src/Tabs/TabsHeader.tsx
index 083b8a2a..61f2bd50 100644
--- a/packages/devui/src/Tabs/TabsHeader.js
+++ b/packages/devui/src/Tabs/TabsHeader.tsx
@@ -5,11 +5,29 @@ import CollapseIcon from 'react-icons/lib/fa/angle-double-right';
 import ContextMenu from '../ContextMenu';
 import createStyledComponent from '../utils/createStyledComponent';
 import * as styles from './styles';
+import { ReactButtonElement, Tab } from './Tabs';
 
 const TabsWrapper = createStyledComponent(styles);
 
-export default class TabsHeader extends Component {
-  constructor(props) {
+interface Props<P> {
+  tabs: ReactButtonElement[];
+  items: Tab<P>[];
+  main: boolean | undefined;
+  onClick: (value: string) => void;
+  position: 'left' | 'right' | 'center';
+  collapsible: boolean | undefined;
+  selected: string | undefined;
+}
+
+interface State {
+  visibleTabs: ReactButtonElement[];
+  hiddenTabs: ReactButtonElement[];
+  subMenuOpened: boolean;
+  contextMenu: { top: number; left: number } | undefined;
+}
+
+export default class TabsHeader<P> extends Component<Props<P>, State> {
+  constructor(props: Props<P>) {
     super(props);
     this.state = {
       visibleTabs: props.tabs.slice(),
@@ -21,7 +39,13 @@ export default class TabsHeader extends Component {
     this.hiddenTabsWidth = [];
   }
 
-  componentWillReceiveProps(nextProps) {
+  iconWidth: number;
+  hiddenTabsWidth: number[];
+  tabsWrapperRef?: HTMLDivElement | null;
+  tabsRef?: HTMLDivElement | null;
+  resizeDetector?: HTMLIFrameElement;
+
+  componentWillReceiveProps(nextProps: Props<P>) {
     if (
       nextProps.tabs !== this.props.tabs ||
       nextProps.selected !== this.props.selected ||
@@ -38,7 +62,7 @@ export default class TabsHeader extends Component {
     }
   }
 
-  componentDidUpdate(prevProps) {
+  componentDidUpdate(prevProps: Props<P>) {
     const { collapsible } = this.props;
     if (!collapsible) {
       if (prevProps.collapsible !== collapsible) this.disableResizeEvents();
@@ -47,8 +71,11 @@ export default class TabsHeader extends Component {
 
     let shouldCollapse = false;
     if (this.iconWidth === 0) {
-      const tabButtons = this.tabsRef.children;
-      if (this.tabsRef.children[tabButtons.length - 1].value === 'expandIcon') {
+      const tabButtons = this.tabsRef!.children;
+      if (
+        (this.tabsRef!.children[tabButtons.length - 1] as HTMLButtonElement)
+          .value === 'expandIcon'
+      ) {
         this.iconWidth = tabButtons[
           tabButtons.length - 1
         ].getBoundingClientRect().width;
@@ -73,12 +100,12 @@ export default class TabsHeader extends Component {
   }
 
   enableResizeEvents() {
-    this.resizeDetector = observeResize(this.tabsWrapperRef, this.collapse);
+    this.resizeDetector = observeResize(this.tabsWrapperRef!, this.collapse);
     window.addEventListener('mousedown', this.hideSubmenu);
   }
 
   disableResizeEvents() {
-    this.resizeDetector.remove();
+    this.resizeDetector!.remove();
     window.removeEventListener('mousedown', this.hideSubmenu);
   }
 
@@ -88,13 +115,13 @@ export default class TabsHeader extends Component {
     const { selected, tabs } = this.props;
     const tabsWrapperRef = this.tabsWrapperRef;
     const tabsRef = this.tabsRef;
-    const tabButtons = this.tabsRef.children;
+    const tabButtons = this.tabsRef!.children;
     const visibleTabs = this.state.visibleTabs;
     const hiddenTabs = this.state.hiddenTabs;
-    let tabsWrapperRight = tabsWrapperRef.getBoundingClientRect().right;
+    let tabsWrapperRight = tabsWrapperRef!.getBoundingClientRect().right;
     if (!tabsWrapperRight) return; // tabs are hidden
 
-    const tabsRefRight = tabsRef.getBoundingClientRect().right;
+    const tabsRefRight = tabsRef!.getBoundingClientRect().right;
     let i = visibleTabs.length - 1;
     let hiddenTab;
 
@@ -102,16 +129,16 @@ export default class TabsHeader extends Component {
       if (
         this.props.position === 'right' &&
         hiddenTabs.length > 0 &&
-        tabsRef.getBoundingClientRect().width + this.hiddenTabsWidth[0] <
-          tabsWrapperRef.getBoundingClientRect().width
+        tabsRef!.getBoundingClientRect().width + this.hiddenTabsWidth[0] <
+          tabsWrapperRef!.getBoundingClientRect().width
       ) {
         while (
           i < tabs.length - 1 &&
-          tabsRef.getBoundingClientRect().width + this.hiddenTabsWidth[0] <
-            tabsWrapperRef.getBoundingClientRect().width
+          tabsRef!.getBoundingClientRect().width + this.hiddenTabsWidth[0] <
+            tabsWrapperRef!.getBoundingClientRect().width
         ) {
           hiddenTab = hiddenTabs.shift();
-          visibleTabs.splice(Number(hiddenTab.key), 0, hiddenTab);
+          visibleTabs.splice(Number(hiddenTab!.key), 0, hiddenTab!);
           i++;
         }
       } else {
@@ -121,7 +148,7 @@ export default class TabsHeader extends Component {
           tabButtons[i].getBoundingClientRect().right >=
             tabsWrapperRight - this.iconWidth
         ) {
-          if (tabButtons[i].value !== selected) {
+          if ((tabButtons[i] as HTMLButtonElement).value !== selected) {
             hiddenTabs.unshift(...visibleTabs.splice(i, 1));
             this.hiddenTabsWidth.unshift(
               tabButtons[i].getBoundingClientRect().width
@@ -140,7 +167,7 @@ export default class TabsHeader extends Component {
           tabsWrapperRight - this.iconWidth
       ) {
         hiddenTab = hiddenTabs.shift();
-        visibleTabs.splice(Number(hiddenTab.key), 0, hiddenTab);
+        visibleTabs.splice(Number(hiddenTab!.key), 0, hiddenTab!);
         this.hiddenTabsWidth.shift();
         i++;
       }
@@ -152,15 +179,15 @@ export default class TabsHeader extends Component {
     this.setState({ subMenuOpened: false, contextMenu: undefined });
   };
 
-  getTabsWrapperRef = node => {
+  getTabsWrapperRef: React.RefCallback<HTMLDivElement> = node => {
     this.tabsWrapperRef = node;
   };
 
-  getTabsRef = node => {
+  getTabsRef: React.RefCallback<HTMLDivElement> = node => {
     this.tabsRef = node;
   };
 
-  expandMenu = e => {
+  expandMenu: React.MouseEventHandler<HTMLButtonElement> = e => {
     const rect = e.currentTarget.children[0].getBoundingClientRect();
     this.setState({
       contextMenu: {
@@ -174,11 +201,7 @@ export default class TabsHeader extends Component {
   render() {
     const { visibleTabs, hiddenTabs, contextMenu } = this.state;
     return (
-      <TabsWrapper
-        innerRef={this.getTabsWrapperRef}
-        main={this.props.main}
-        position={this.props.position}
-      >
+      <TabsWrapper innerRef={this.getTabsWrapperRef} main={this.props.main}>
         <div ref={this.getTabsRef}>
           {visibleTabs}
           {this.props.collapsible &&
@@ -200,14 +223,14 @@ export default class TabsHeader extends Component {
       </TabsWrapper>
     );
   }
-}
 
-TabsHeader.propTypes = {
-  tabs: PropTypes.array.isRequired,
-  items: PropTypes.array.isRequired,
-  main: PropTypes.bool,
-  onClick: PropTypes.func,
-  position: PropTypes.string,
-  collapsible: PropTypes.bool,
-  selected: PropTypes.string
-};
+  static propTypes = {
+    tabs: PropTypes.array.isRequired,
+    items: PropTypes.array.isRequired,
+    main: PropTypes.bool,
+    onClick: PropTypes.func,
+    position: PropTypes.string,
+    collapsible: PropTypes.bool,
+    selected: PropTypes.string
+  };
+}
diff --git a/packages/devui/src/Tabs/index.js b/packages/devui/src/Tabs/index.js
deleted file mode 100644
index fb6079e0..00000000
--- a/packages/devui/src/Tabs/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export default from './Tabs';
diff --git a/packages/devui/src/Tabs/index.ts b/packages/devui/src/Tabs/index.ts
new file mode 100644
index 00000000..bc6749b1
--- /dev/null
+++ b/packages/devui/src/Tabs/index.ts
@@ -0,0 +1 @@
+export { default } from './Tabs';
diff --git a/packages/devui/src/Tabs/stories/data.js b/packages/devui/src/Tabs/stories/data.tsx
similarity index 74%
rename from packages/devui/src/Tabs/stories/data.js
rename to packages/devui/src/Tabs/stories/data.tsx
index a2b93fd8..39a238e3 100644
--- a/packages/devui/src/Tabs/stories/data.js
+++ b/packages/devui/src/Tabs/stories/data.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 /* eslint-disable react/prop-types */
-const Component = ({ selected }) => (
+const Component = ({ selected }: { selected: string }) => (
   <div
     style={{
       display: 'flex',
@@ -17,7 +17,9 @@ const Component = ({ selected }) => (
 );
 /* eslint-enable react/prop-types */
 
-const selector = tab => ({ selected: tab.name });
+const selector = (tab: { name: string; value?: string }) => ({
+  selected: tab.name
+});
 
 export const tabs = [
   {
@@ -37,6 +39,6 @@ export const tabs = [
   }
 ];
 
-export const simple10Tabs = [];
+export const simple10Tabs: { name: string; value: string }[] = [];
 for (let i = 1; i <= 10; i++)
   simple10Tabs.push({ name: `Tab${i}`, value: `${i}` });
diff --git a/packages/devui/src/Tabs/stories/index.js b/packages/devui/src/Tabs/stories/index.tsx
old mode 100755
new mode 100644
similarity index 78%
rename from packages/devui/src/Tabs/stories/index.js
rename to packages/devui/src/Tabs/stories/index.tsx
index 4f5eb370..b418f634
--- a/packages/devui/src/Tabs/stories/index.js
+++ b/packages/devui/src/Tabs/stories/index.tsx
@@ -5,6 +5,7 @@ import { withKnobs, text, boolean, select } from '@storybook/addon-knobs';
 import styled from 'styled-components';
 import Tabs from '../';
 import { tabs, simple10Tabs } from './data';
+import { Position } from '../Tabs';
 
 const Container = styled.div`
   display: flex;
@@ -24,7 +25,11 @@ storiesOf('Tabs', module)
         main={boolean('main', true)}
         onClick={action('tab selected')}
         collapsible={boolean('collapsible', true)}
-        position={select('position', ['left', 'right', 'center'], 'left')}
+        position={select<Position>(
+          'position',
+          ['left', 'right', 'center'],
+          'left'
+        )}
       />
     </Container>
   ))
@@ -35,6 +40,10 @@ storiesOf('Tabs', module)
       main={boolean('main', false)}
       onClick={action('tab selected')}
       collapsible={boolean('collapsible', false)}
-      position={select('position', ['left', 'right', 'center'], 'left')}
+      position={select<Position>(
+        'position',
+        ['left', 'right', 'center'],
+        'left'
+      )}
     />
   ));
diff --git a/packages/devui/src/Tabs/styles/common.js b/packages/devui/src/Tabs/styles/common.ts
similarity index 61%
rename from packages/devui/src/Tabs/styles/common.js
rename to packages/devui/src/Tabs/styles/common.ts
index dca9f591..b5333ce5 100644
--- a/packages/devui/src/Tabs/styles/common.js
+++ b/packages/devui/src/Tabs/styles/common.ts
@@ -1,6 +1,11 @@
 import styled from 'styled-components';
+import { Position } from '../Tabs';
 
-export const TabsContainer = styled.div`
+interface StyleProps {
+  position: Position;
+}
+
+export const TabsContainer = styled.div<StyleProps>`
   position: relative;
   display: flex;
   flex-direction: column;
@@ -12,15 +17,17 @@ export const TabsContainer = styled.div`
 
   > div > div:first-child {
     ${props =>
-      props.position !== 'left' &&
-      `
+      props.position !== 'left'
+        ? `
       margin-left: auto !important;
-    `}
+    `
+        : ''}
     ${props =>
-      props.position === 'center' &&
-      `
+      props.position === 'center'
+        ? `
       margin-right: auto !important;
-    `}
+    `
+        : ''}
   }
 
   > div:nth-child(2) {
diff --git a/packages/devui/src/Tabs/styles/default.js b/packages/devui/src/Tabs/styles/default.ts
similarity index 82%
rename from packages/devui/src/Tabs/styles/default.js
rename to packages/devui/src/Tabs/styles/default.ts
index 22a9678c..40a61b36 100644
--- a/packages/devui/src/Tabs/styles/default.js
+++ b/packages/devui/src/Tabs/styles/default.ts
@@ -1,17 +1,28 @@
-import { css } from 'styled-components';
+import { css, ThemedStyledProps } from 'styled-components';
+import { Theme } from '../../themes/default';
 
-export const style = ({ theme, main }) => css`
+export interface StyleProps {
+  main: boolean | undefined;
+}
+
+export const style = ({
+  theme,
+  main
+}: ThemedStyledProps<StyleProps, Theme>) => css`
   display: flex;
   flex: 0 0 1;
   padding-left: 1px;
   background-color: ${theme.base01};
   width: 100%;
   overflow: hidden;
-  ${!main &&
-    `
+  ${
+    !main
+      ? `
   border-top: 1px solid ${theme.base01};
   border-bottom: 1px solid ${theme.base02};
-  `}
+  `
+      : ''
+  }
 
   > div {
     display: flex;
diff --git a/packages/devui/src/Tabs/styles/index.js b/packages/devui/src/Tabs/styles/index.ts
similarity index 100%
rename from packages/devui/src/Tabs/styles/index.js
rename to packages/devui/src/Tabs/styles/index.ts
diff --git a/packages/devui/src/Tabs/styles/material.js b/packages/devui/src/Tabs/styles/material.ts
similarity index 77%
rename from packages/devui/src/Tabs/styles/material.js
rename to packages/devui/src/Tabs/styles/material.ts
index 791116d3..8f15b4fc 100644
--- a/packages/devui/src/Tabs/styles/material.js
+++ b/packages/devui/src/Tabs/styles/material.ts
@@ -1,18 +1,24 @@
-import { css } from 'styled-components';
+import { css, ThemedStyledProps } from 'styled-components';
 import { ripple } from '../../utils/animations';
+import { StyleProps } from './default';
+import { Theme } from '../../themes/default';
 
-export const style = ({ theme, main }) => css`
+export const style = ({
+  theme,
+  main
+}: ThemedStyledProps<StyleProps, Theme>) => css`
   display: flex;
   flex: 0 0 1;
   padding-left: 1px;
   background-color: ${theme.base01};
   width: 100%;
   overflow: hidden;
-  ${!main &&
-    `
+  ${!main
+    ? `
   border-top: 1px solid ${theme.base01};
   border-bottom: 1px solid ${theme.base02};
-  `}
+  `
+    : ''}
 
   > div {
     display: flex;
@@ -24,7 +30,7 @@ export const style = ({ theme, main }) => css`
       color: ${theme.base07};
       min-height: 30px;
       padding: 0 2em;
-      ${main && 'text-transform: uppercase;'}
+      ${main ? 'text-transform: uppercase;' : ''}
       cursor: pointer;
       border: none;
       border-bottom: 2px solid transparent;
diff --git a/packages/devui/src/Toolbar/index.js b/packages/devui/src/Toolbar/index.js
deleted file mode 100644
index f2e69188..00000000
--- a/packages/devui/src/Toolbar/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export Toolbar from './styles/Toolbar';
-export Divider from './styles/Divider';
-export Spacer from './styles/Spacer';
diff --git a/packages/devui/src/Toolbar/index.ts b/packages/devui/src/Toolbar/index.ts
new file mode 100644
index 00000000..125c22cd
--- /dev/null
+++ b/packages/devui/src/Toolbar/index.ts
@@ -0,0 +1,3 @@
+export { default as Toolbar } from './styles/Toolbar';
+export { default as Divider } from './styles/Divider';
+export { default as Spacer } from './styles/Spacer';
diff --git a/packages/devui/src/Toolbar/stories/index.js b/packages/devui/src/Toolbar/stories/index.tsx
old mode 100755
new mode 100644
similarity index 64%
rename from packages/devui/src/Toolbar/stories/index.js
rename to packages/devui/src/Toolbar/stories/index.tsx
index 618355f9..d3b6d0e4
--- a/packages/devui/src/Toolbar/stories/index.js
+++ b/packages/devui/src/Toolbar/stories/index.tsx
@@ -25,6 +25,9 @@ import {
 } from '../../';
 import { options } from '../../Select/stories/options';
 import { simple10Tabs } from '../../Tabs/stories/data';
+import { TooltipPosition } from '../../Button/Button';
+import { BorderPosition } from '../styles/Toolbar';
+import { Position } from '../../Tabs/Tabs';
 
 export const Container = styled.div`
   display: flex;
@@ -43,19 +46,29 @@ storiesOf('Toolbar', module)
   .addDecorator(withKnobs)
   .add('default', () => (
     <Container>
-      <Toolbar borderPosition={select('borderPosition', ['top', 'bottom'])}>
+      <Toolbar
+        borderPosition={select<BorderPosition>(
+          'borderPosition',
+          ['top', 'bottom'],
+          'top'
+        )}
+      >
         <Button
           title={text('Title', 'Hello Tooltip')}
-          tooltipPosition={select('tooltipPosition', [
-            'top',
-            'bottom',
-            'left',
-            'right',
-            'bottom-left',
-            'bottom-right',
-            'top-left',
-            'top-right'
-          ])}
+          tooltipPosition={select<TooltipPosition>(
+            'tooltipPosition',
+            [
+              'top',
+              'bottom',
+              'left',
+              'right',
+              'bottom-left',
+              'bottom-right',
+              'top-left',
+              'top-right'
+            ],
+            'top'
+          )}
           disabled={boolean('Disabled', false)}
           onClick={action('button clicked')}
         >
@@ -64,16 +77,20 @@ storiesOf('Toolbar', module)
         <Divider />
         <Button
           title={text('Title', 'Hello Tooltip')}
-          tooltipPosition={select('tooltipPosition', [
-            'top',
-            'bottom',
-            'left',
-            'right',
-            'bottom-left',
-            'bottom-right',
-            'top-left',
-            'top-right'
-          ])}
+          tooltipPosition={select<TooltipPosition>(
+            'tooltipPosition',
+            [
+              'top',
+              'bottom',
+              'left',
+              'right',
+              'bottom-left',
+              'bottom-right',
+              'top-left',
+              'top-right'
+            ],
+            'top'
+          )}
           disabled={boolean('Disabled', false)}
           onClick={action('button clicked')}
         >
@@ -90,16 +107,20 @@ storiesOf('Toolbar', module)
       <Toolbar>
         <Button
           title={text('Title', 'Hello Tooltip')}
-          tooltipPosition={select('tooltipPosition', [
-            'top',
-            'bottom',
-            'left',
-            'right',
-            'bottom-left',
-            'bottom-right',
-            'top-left',
-            'top-right'
-          ])}
+          tooltipPosition={select<TooltipPosition>(
+            'tooltipPosition',
+            [
+              'top',
+              'bottom',
+              'left',
+              'right',
+              'bottom-left',
+              'bottom-right',
+              'top-left',
+              'top-right'
+            ],
+            'top'
+          )}
           disabled={boolean('Disabled', false)}
           onClick={action('button clicked')}
         >
@@ -111,20 +132,28 @@ storiesOf('Toolbar', module)
           main={boolean('main', true)}
           onClick={action('tab selected')}
           collapsible={boolean('collapsible', true)}
-          position={select('position', ['left', 'right', 'center'], 'center')}
+          position={select<Position>(
+            'position',
+            ['left', 'right', 'center'],
+            'center'
+          )}
         />
         <Button
           title={text('Title', 'Hello Tooltip')}
-          tooltipPosition={select('tooltipPosition', [
-            'top',
-            'bottom',
-            'left',
-            'right',
-            'bottom-left',
-            'bottom-right',
-            'top-left',
-            'top-right'
-          ])}
+          tooltipPosition={select<TooltipPosition>(
+            'tooltipPosition',
+            [
+              'top',
+              'bottom',
+              'left',
+              'right',
+              'bottom-left',
+              'bottom-right',
+              'top-left',
+              'top-right'
+            ],
+            'top'
+          )}
           disabled={boolean('Disabled', false)}
           onClick={action('button clicked')}
         >
@@ -139,16 +168,20 @@ storiesOf('Toolbar', module)
         <Toolbar noBorder fullHeight compact>
           <Button
             title={text('play title', 'Play')}
-            tooltipPosition={select('tooltipPosition', [
-              'top',
-              'bottom',
-              'left',
-              'right',
-              'bottom-left',
-              'bottom-right',
-              'top-left',
-              'top-right'
-            ])}
+            tooltipPosition={select<TooltipPosition>(
+              'tooltipPosition',
+              [
+                'top',
+                'bottom',
+                'left',
+                'right',
+                'bottom-left',
+                'bottom-right',
+                'top-left',
+                'top-right'
+              ],
+              'top'
+            )}
             onClick={action('button clicked')}
           >
             <PlayIcon />
@@ -163,16 +196,20 @@ storiesOf('Toolbar', module)
           />
           <Button
             title="Previous state"
-            tooltipPosition={select('tooltipPosition', [
-              'top',
-              'bottom',
-              'left',
-              'right',
-              'bottom-left',
-              'bottom-right',
-              'top-left',
-              'top-right'
-            ])}
+            tooltipPosition={select<TooltipPosition>(
+              'tooltipPosition',
+              [
+                'top',
+                'bottom',
+                'left',
+                'right',
+                'bottom-left',
+                'bottom-right',
+                'top-left',
+                'top-right'
+              ],
+              'top'
+            )}
             disabled
             onClick={action('previous state clicked')}
           >
@@ -180,16 +217,20 @@ storiesOf('Toolbar', module)
           </Button>
           <Button
             title="Next state"
-            tooltipPosition={select('tooltipPosition', [
-              'top',
-              'bottom',
-              'left',
-              'right',
-              'bottom-left',
-              'bottom-right',
-              'top-left',
-              'top-right'
-            ])}
+            tooltipPosition={select<TooltipPosition>(
+              'tooltipPosition',
+              [
+                'top',
+                'bottom',
+                'left',
+                'right',
+                'bottom-left',
+                'bottom-right',
+                'top-left',
+                'top-right'
+              ],
+              'top'
+            )}
             onClick={action('next state clicked')}
           >
             <RightIcon />
diff --git a/packages/devui/src/Toolbar/styles/Divider.js b/packages/devui/src/Toolbar/styles/Divider.ts
similarity index 100%
rename from packages/devui/src/Toolbar/styles/Divider.js
rename to packages/devui/src/Toolbar/styles/Divider.ts
diff --git a/packages/devui/src/Toolbar/styles/Spacer.js b/packages/devui/src/Toolbar/styles/Spacer.ts
similarity index 100%
rename from packages/devui/src/Toolbar/styles/Spacer.js
rename to packages/devui/src/Toolbar/styles/Spacer.ts
diff --git a/packages/devui/src/Toolbar/styles/Toolbar.js b/packages/devui/src/Toolbar/styles/Toolbar.ts
similarity index 70%
rename from packages/devui/src/Toolbar/styles/Toolbar.js
rename to packages/devui/src/Toolbar/styles/Toolbar.ts
index fa3c56de..97c701eb 100644
--- a/packages/devui/src/Toolbar/styles/Toolbar.js
+++ b/packages/devui/src/Toolbar/styles/Toolbar.ts
@@ -1,6 +1,15 @@
 import styled from 'styled-components';
 
-const Toolbar = styled.div`
+export type BorderPosition = 'top' | 'bottom';
+
+interface Props {
+  fullHeight?: boolean;
+  compact?: boolean;
+  borderPosition?: BorderPosition;
+  noBorder?: boolean;
+}
+
+const Toolbar = styled.div<Props>`
   display: flex;
   flex-shrink: 0;
   box-sizing: border-box;
@@ -8,13 +17,15 @@ const Toolbar = styled.div`
   font-family: ${props => props.theme.fontFamily || 'monospace'};
   font-size: 12px;
   line-height: 16px;
-  ${props => props.fullHeight && 'height: 100%;'}
+  ${props => (props.fullHeight ? 'height: 100%;' : '')}
   padding: ${props => (props.compact ? '0' : '5px')} 5px;
   background-color: ${props => props.theme.base01};
   text-align: center;
   position: relative;
   ${({ borderPosition, theme }) =>
-    borderPosition && `border-${borderPosition}: 1px solid ${theme.base02};`}
+    borderPosition
+      ? `border-${borderPosition}: 1px solid ${theme.base02};`
+      : ''}
   
   & > div {
     margin: auto ${props => (props.noBorder ? '0' : '1px;')};
@@ -22,7 +33,7 @@ const Toolbar = styled.div`
   
   & button {
     border-radius: 0;
-    ${props => props.noBorder && 'border-color: transparent;'}
+    ${props => (props.noBorder ? 'border-color: transparent;' : '')}
     white-space: nowrap;
     box-shadow: none !important;
   }
diff --git a/packages/devui/src/base16.ts b/packages/devui/src/base16.ts
new file mode 100644
index 00000000..2434e11c
--- /dev/null
+++ b/packages/devui/src/base16.ts
@@ -0,0 +1,61 @@
+declare module 'base16' {
+  export interface Base16Theme {
+    scheme?: string;
+    author?: string;
+    base00: string;
+    base01: string;
+    base02: string;
+    base03: string;
+    base04: string;
+    base05: string;
+    base06: string;
+    base07: string;
+    base08: string;
+    base09: string;
+    base0A: string;
+    base0B: string;
+    base0C: string;
+    base0D: string;
+    base0E: string;
+    base0F: string;
+  }
+
+  export const threezerotwofour: Base16Theme;
+  export const apathy: Base16Theme;
+  export const ashes: Base16Theme;
+  export const atelierDune: Base16Theme;
+  export const atelierForest: Base16Theme;
+  export const atelierHeath: Base16Theme;
+  export const atelierLakeside: Base16Theme;
+  export const atelierSeaside: Base16Theme;
+  export const bespin: Base16Theme;
+  export const brewer: Base16Theme;
+  export const bright: Base16Theme;
+  export const chalk: Base16Theme;
+  export const codeschool: Base16Theme;
+  export const colors: Base16Theme;
+  const _default: Base16Theme;
+  export default _default;
+  export const eighties: Base16Theme;
+  export const embers: Base16Theme;
+  export const flat: Base16Theme;
+  export const google: Base16Theme;
+  export const grayscale: Base16Theme;
+  export const greenscreen: Base16Theme;
+  export const harmonic: Base16Theme;
+  export const hopscotch: Base16Theme;
+  export const isotope: Base16Theme;
+  export const marrakesh: Base16Theme;
+  export const mocha: Base16Theme;
+  export const monokai: Base16Theme;
+  export const ocean: Base16Theme;
+  export const paraiso: Base16Theme;
+  export const pop: Base16Theme;
+  export const railscasts: Base16Theme;
+  export const shapeshifter: Base16Theme;
+  export const solarized: Base16Theme;
+  export const summerfruit: Base16Theme;
+  export const tomorrow: Base16Theme;
+  export const tube: Base16Theme;
+  export const twilight: Base16Theme;
+}
diff --git a/packages/devui/src/colorSchemes/atom-one-dark.js b/packages/devui/src/colorSchemes/atom-one-dark.ts
similarity index 100%
rename from packages/devui/src/colorSchemes/atom-one-dark.js
rename to packages/devui/src/colorSchemes/atom-one-dark.ts
diff --git a/packages/devui/src/colorSchemes/default.js b/packages/devui/src/colorSchemes/default.ts
similarity index 100%
rename from packages/devui/src/colorSchemes/default.js
rename to packages/devui/src/colorSchemes/default.ts
diff --git a/packages/devui/src/colorSchemes/dracula.js b/packages/devui/src/colorSchemes/dracula.ts
similarity index 100%
rename from packages/devui/src/colorSchemes/dracula.js
rename to packages/devui/src/colorSchemes/dracula.ts
diff --git a/packages/devui/src/colorSchemes/github.js b/packages/devui/src/colorSchemes/github.ts
similarity index 100%
rename from packages/devui/src/colorSchemes/github.js
rename to packages/devui/src/colorSchemes/github.ts
diff --git a/packages/devui/src/colorSchemes/index.js b/packages/devui/src/colorSchemes/index.ts
similarity index 100%
rename from packages/devui/src/colorSchemes/index.js
rename to packages/devui/src/colorSchemes/index.ts
diff --git a/packages/devui/src/colorSchemes/ir-black.js b/packages/devui/src/colorSchemes/ir-black.ts
similarity index 100%
rename from packages/devui/src/colorSchemes/ir-black.js
rename to packages/devui/src/colorSchemes/ir-black.ts
diff --git a/packages/devui/src/colorSchemes/macintosh.js b/packages/devui/src/colorSchemes/macintosh.ts
similarity index 100%
rename from packages/devui/src/colorSchemes/macintosh.js
rename to packages/devui/src/colorSchemes/macintosh.ts
diff --git a/packages/devui/src/colorSchemes/materia.js b/packages/devui/src/colorSchemes/materia.ts
similarity index 100%
rename from packages/devui/src/colorSchemes/materia.js
rename to packages/devui/src/colorSchemes/materia.ts
diff --git a/packages/devui/src/colorSchemes/oceanic-next.js b/packages/devui/src/colorSchemes/oceanic-next.ts
similarity index 100%
rename from packages/devui/src/colorSchemes/oceanic-next.js
rename to packages/devui/src/colorSchemes/oceanic-next.ts
diff --git a/packages/devui/src/colorSchemes/phd.js b/packages/devui/src/colorSchemes/phd.ts
similarity index 100%
rename from packages/devui/src/colorSchemes/phd.js
rename to packages/devui/src/colorSchemes/phd.ts
diff --git a/packages/devui/src/colorSchemes/pico.js b/packages/devui/src/colorSchemes/pico.ts
similarity index 100%
rename from packages/devui/src/colorSchemes/pico.js
rename to packages/devui/src/colorSchemes/pico.ts
diff --git a/packages/devui/src/colorSchemes/solar-flare.js b/packages/devui/src/colorSchemes/solar-flare.ts
similarity index 100%
rename from packages/devui/src/colorSchemes/solar-flare.js
rename to packages/devui/src/colorSchemes/solar-flare.ts
diff --git a/packages/devui/src/colorSchemes/spacemacs.js b/packages/devui/src/colorSchemes/spacemacs.ts
similarity index 100%
rename from packages/devui/src/colorSchemes/spacemacs.js
rename to packages/devui/src/colorSchemes/spacemacs.ts
diff --git a/packages/devui/src/colorSchemes/unikitty.js b/packages/devui/src/colorSchemes/unikitty.ts
similarity index 100%
rename from packages/devui/src/colorSchemes/unikitty.js
rename to packages/devui/src/colorSchemes/unikitty.ts
diff --git a/packages/devui/src/colorSchemes/woodland.js b/packages/devui/src/colorSchemes/woodland.ts
similarity index 100%
rename from packages/devui/src/colorSchemes/woodland.js
rename to packages/devui/src/colorSchemes/woodland.ts
diff --git a/packages/devui/src/index.js b/packages/devui/src/index.ts
old mode 100755
new mode 100644
similarity index 88%
rename from packages/devui/src/index.js
rename to packages/devui/src/index.ts
index 28e17d9e..cf2dfa86
--- a/packages/devui/src/index.js
+++ b/packages/devui/src/index.ts
@@ -13,4 +13,4 @@ export * from './Toolbar';
 
 import color from './utils/color';
 export const effects = { color };
-export createStyledComponent from './utils/createStyledComponent';
+export { default as createStyledComponent } from './utils/createStyledComponent';
diff --git a/packages/devui/src/redux-devtools-themes.ts b/packages/devui/src/redux-devtools-themes.ts
new file mode 100644
index 00000000..895ce79d
--- /dev/null
+++ b/packages/devui/src/redux-devtools-themes.ts
@@ -0,0 +1,5 @@
+declare module 'redux-devtools-themes' {
+  import { Base16Theme } from 'base16';
+  export * from 'base16';
+  export const nicinabox: Base16Theme;
+}
diff --git a/packages/devui/src/simple-element-resize-detector.ts b/packages/devui/src/simple-element-resize-detector.ts
new file mode 100644
index 00000000..656048aa
--- /dev/null
+++ b/packages/devui/src/simple-element-resize-detector.ts
@@ -0,0 +1,6 @@
+declare module 'simple-element-resize-detector' {
+  export default function(
+    element: HTMLElement,
+    handler: () => void
+  ): HTMLIFrameElement;
+}
diff --git a/packages/devui/src/themes/default.js b/packages/devui/src/themes/default.js
deleted file mode 100644
index 0471c44f..00000000
--- a/packages/devui/src/themes/default.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export default colors => ({
-  ...colors,
-  fontFamily: "'Source Sans Pro', sans-serif",
-  codeFontFamily: "'Source Code Pro', monospace",
-  inputHeight: 30,
-  inputBorderWidth: 1,
-  inputBorderRadius: 4,
-  spinnerSize: 13, // Math.floor(theme.inputHeight / 2) - 2
-  inputPadding: 10, // theme.inputHeight / 3
-  selectArrowWidth: 4, // Math.floor(theme.inputHeight / 7)
-  inputInternalHeight: 28, // theme.inputHeight - theme.inputBorderWidth * 2
-  inputBorderColor: colors.base02,
-  inputFocusedStyle: `border-color: ${colors.base0D}`
-});
diff --git a/packages/devui/src/themes/default.ts b/packages/devui/src/themes/default.ts
new file mode 100644
index 00000000..fa244fcd
--- /dev/null
+++ b/packages/devui/src/themes/default.ts
@@ -0,0 +1,34 @@
+import { Base16Theme } from 'base16';
+import { FontFamilyProperty } from 'csstype';
+import * as themes from './index';
+
+export interface Theme extends Base16Theme {
+  fontFamily: FontFamilyProperty;
+  codeFontFamily: FontFamilyProperty;
+  inputHeight: number;
+  inputBorderWidth: number;
+  inputBorderRadius: number;
+  spinnerSize: number;
+  inputPadding: number;
+  selectArrowWidth: number;
+  inputInternalHeight: number;
+  inputBorderColor: string;
+  inputFocusedStyle: string;
+  type?: keyof typeof themes;
+  light?: boolean;
+}
+
+export default (colors: Base16Theme) => ({
+  ...colors,
+  fontFamily: "'Source Sans Pro', sans-serif",
+  codeFontFamily: "'Source Code Pro', monospace",
+  inputHeight: 30,
+  inputBorderWidth: 1,
+  inputBorderRadius: 4,
+  spinnerSize: 13, // Math.floor(theme.inputHeight / 2) - 2
+  inputPadding: 10, // theme.inputHeight / 3
+  selectArrowWidth: 4, // Math.floor(theme.inputHeight / 7)
+  inputInternalHeight: 28, // theme.inputHeight - theme.inputBorderWidth * 2
+  inputBorderColor: colors.base02,
+  inputFocusedStyle: `border-color: ${colors.base0D}`
+});
diff --git a/packages/devui/src/themes/index.js b/packages/devui/src/themes/index.ts
similarity index 100%
rename from packages/devui/src/themes/index.js
rename to packages/devui/src/themes/index.ts
diff --git a/packages/devui/src/themes/material.js b/packages/devui/src/themes/material.ts
similarity index 76%
rename from packages/devui/src/themes/material.js
rename to packages/devui/src/themes/material.ts
index dae0908b..0c033eaa 100644
--- a/packages/devui/src/themes/material.js
+++ b/packages/devui/src/themes/material.ts
@@ -1,4 +1,6 @@
-export default colors => ({
+import { Base16Theme } from 'base16';
+
+export default (colors: Base16Theme) => ({
   fontFamily: "'Roboto', sans-serif",
   codeFontFamily: "'Roboto Mono', monospace",
   inputPadding: 5,
diff --git a/packages/devui/src/utils/animations.js b/packages/devui/src/utils/animations.ts
similarity index 83%
rename from packages/devui/src/utils/animations.js
rename to packages/devui/src/utils/animations.ts
index 6ba8f7c6..35955788 100644
--- a/packages/devui/src/utils/animations.js
+++ b/packages/devui/src/utils/animations.ts
@@ -1,9 +1,10 @@
 import { keyframes } from 'styled-components';
+import { Theme } from '../themes/default';
 
 export const spin = keyframes`
   to { transform: rotate(1turn); }
 `;
-export const spinner = theme => `
+export const spinner = (theme: Theme) => `
   animation: ${spin} 400ms infinite linear;
   width: ${theme.spinnerSize}px;
   height: ${theme.spinnerSize}px;
@@ -21,7 +22,7 @@ export const fadeIn = keyframes`
 `;
 
 // Based on https://github.com/mladenplavsic/css-ripple-effect
-export const ripple = theme => `
+export const ripple = (theme: Theme) => `
   & {
     position: relative;
     overflow: hidden;
@@ -36,9 +37,7 @@ export const ripple = theme => `
     top: 0;
     left: 0;
     pointer-events: none;
-    background-image: radial-gradient(circle, ${
-      theme.base07
-    } 11%, transparent 11%);
+    background-image: radial-gradient(circle, ${theme.base07} 11%, transparent 11%);
     background-repeat: no-repeat;
     background-position: 50%;
     transform: scale(10, 10);
diff --git a/packages/devui/src/utils/autoPrefix.js b/packages/devui/src/utils/autoPrefix.js
deleted file mode 100644
index a7540be6..00000000
--- a/packages/devui/src/utils/autoPrefix.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export const prefixSelectors = (tag, selectors, style) =>
-  selectors.map(selector => `${tag}::-${selector} ${style}`);
diff --git a/packages/devui/src/utils/autoPrefix.ts b/packages/devui/src/utils/autoPrefix.ts
new file mode 100644
index 00000000..fc350bb4
--- /dev/null
+++ b/packages/devui/src/utils/autoPrefix.ts
@@ -0,0 +1,5 @@
+export const prefixSelectors = (
+  tag: string,
+  selectors: string[],
+  style: string
+) => selectors.map(selector => `${tag}::-${selector} ${style}`);
diff --git a/packages/devui/src/utils/color.js b/packages/devui/src/utils/color.ts
similarity index 57%
rename from packages/devui/src/utils/color.js
rename to packages/devui/src/utils/color.ts
index dee5ed5b..381b6d8f 100644
--- a/packages/devui/src/utils/color.js
+++ b/packages/devui/src/utils/color.ts
@@ -7,10 +7,10 @@ import Color from 'color';
     effect('#000000', 'alpha', 0.5);
 */
 
-export default (color, effect, val) =>
-  new Color(color)
-    [effect](val)
-    .hsl()
-    .string();
+export default (
+  color: string,
+  effect: 'fade' | 'lighten' | 'alpha',
+  val: number
+) => (Color(color)[effect](val) as Color).hsl().string();
 
 // TODO: memoize it
diff --git a/packages/devui/src/utils/createStyledComponent.js b/packages/devui/src/utils/createStyledComponent.js
deleted file mode 100644
index ce1febfe..00000000
--- a/packages/devui/src/utils/createStyledComponent.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import styled from 'styled-components';
-import getDefaultTheme from '../themes/default';
-
-const getStyle = (styles, type) =>
-  typeof styles === 'object' ? styles[type] || styles.default : styles;
-
-export default (styles, component) =>
-  styled(component || 'div')`
-    ${props =>
-      props.theme.type
-        ? getStyle(styles, props.theme.type)
-        : // used outside of container (theme provider)
-          getStyle(styles, 'default')({
-            ...props,
-            theme: getDefaultTheme(props.theme)
-          })}
-  `;
-
-// TODO: memoize it?
diff --git a/packages/devui/src/utils/createStyledComponent.ts b/packages/devui/src/utils/createStyledComponent.ts
new file mode 100644
index 00000000..c67508d6
--- /dev/null
+++ b/packages/devui/src/utils/createStyledComponent.ts
@@ -0,0 +1,92 @@
+import styled, {
+  Interpolation,
+  InterpolationFunction,
+  InterpolationValue,
+  StyledComponentClass,
+  ThemedStyledFunction,
+  ThemedStyledProps
+} from 'styled-components';
+import getDefaultTheme from '../themes/default';
+import { Base16Theme } from 'base16';
+import { Theme } from '../themes/default';
+import * as React from 'react';
+import { ThemeFromProvider } from './theme';
+
+function isObject<P>(
+  styles:
+    | {
+        [type: string]: Interpolation<ThemedStyledProps<P, Theme>>;
+        default: Interpolation<ThemedStyledProps<P, Theme>>;
+      }
+    | Interpolation<ThemedStyledProps<P, Theme>>
+): styles is {
+  [type: string]: InterpolationFunction<ThemedStyledProps<P, Theme>>;
+  default: InterpolationFunction<ThemedStyledProps<P, Theme>>;
+} {
+  return typeof styles === 'object';
+}
+
+const getStyle = <P>(
+  styles:
+    | {
+        [type: string]: InterpolationFunction<ThemedStyledProps<P, Theme>>;
+        default: InterpolationFunction<ThemedStyledProps<P, Theme>>;
+      }
+    | InterpolationFunction<ThemedStyledProps<P, Theme>>,
+  type: string
+) => (isObject(styles) ? styles[type] || styles.default : styles);
+
+function isThemeFromProvider(
+  theme: Theme | Base16Theme
+): theme is ThemeFromProvider {
+  return (theme as ThemeFromProvider).type !== undefined;
+}
+
+function createStyledComponent<P, TTag extends keyof JSX.IntrinsicElements>(
+  styles:
+    | {
+        [type: string]: InterpolationFunction<ThemedStyledProps<P, Theme>>;
+        default: InterpolationFunction<ThemedStyledProps<P, Theme>>;
+      }
+    | InterpolationFunction<ThemedStyledProps<P, Theme>>,
+  component?: TTag
+): StyledComponentClass<P, Theme, P & JSX.IntrinsicElements[TTag]>;
+function createStyledComponent<P>(
+  styles:
+    | {
+        [type: string]: InterpolationFunction<ThemedStyledProps<P, Theme>>;
+        default: InterpolationFunction<ThemedStyledProps<P, Theme>>;
+      }
+    | InterpolationFunction<ThemedStyledProps<P, Theme>>,
+  component?: React.ComponentClass<P>
+): StyledComponentClass<P, Theme>;
+function createStyledComponent<P, TTag extends keyof JSX.IntrinsicElements>(
+  styles:
+    | {
+        [type: string]: InterpolationFunction<ThemedStyledProps<P, Theme>>;
+        default: InterpolationFunction<ThemedStyledProps<P, Theme>>;
+      }
+    | InterpolationFunction<ThemedStyledProps<P, Theme>>,
+  component?: TTag | React.ComponentClass<P>
+): StyledComponentClass<P, Theme> {
+  return (styled((component || 'div') as TTag) as ThemedStyledFunction<
+    P,
+    Theme
+  >)`
+    ${(props: ThemedStyledProps<P, Theme>) =>
+      isThemeFromProvider(props.theme)
+        ? getStyle(styles, props.theme.type)
+        : // used outside of container (theme provider)
+          getStyle(
+            styles,
+            'default'
+          )({
+            ...props,
+            theme: getDefaultTheme(props.theme)
+          })}
+  `;
+}
+
+export default createStyledComponent;
+
+// TODO: memoize it?
diff --git a/packages/devui/src/utils/invertColors.js b/packages/devui/src/utils/invertColors.ts
similarity index 76%
rename from packages/devui/src/utils/invertColors.js
rename to packages/devui/src/utils/invertColors.ts
index 5a14b4e2..25464064 100644
--- a/packages/devui/src/utils/invertColors.js
+++ b/packages/devui/src/utils/invertColors.ts
@@ -1,4 +1,6 @@
-function invertColors(theme) {
+import { Base16Theme } from 'base16';
+
+function invertColors(theme: Base16Theme) {
   return {
     ...theme,
     base00: theme.base07,
diff --git a/packages/devui/src/utils/theme.js b/packages/devui/src/utils/theme.ts
similarity index 60%
rename from packages/devui/src/utils/theme.js
rename to packages/devui/src/utils/theme.ts
index bd99ebe2..a4aaab85 100644
--- a/packages/devui/src/utils/theme.js
+++ b/packages/devui/src/utils/theme.ts
@@ -1,8 +1,10 @@
 import * as themes from '../themes';
-import defaultDarkScheme from 'redux-devtools-themes/lib/nicinabox';
+import { nicinabox as defaultDarkScheme } from 'redux-devtools-themes';
 import * as baseSchemes from 'base16';
 import * as additionalSchemes from '../colorSchemes';
 import invertColors from '../utils/invertColors';
+import { Base16Theme } from 'base16';
+import { Theme } from '../themes/default';
 
 export const schemes = { ...baseSchemes, ...additionalSchemes };
 export const listSchemes = () =>
@@ -11,8 +13,23 @@ export const listSchemes = () =>
     .sort(); // remove `__esModule`
 export const listThemes = () => Object.keys(themes);
 
-export const getTheme = ({ theme: type, scheme, light }) => {
-  let colors;
+export interface ThemeData {
+  theme: keyof typeof themes;
+  scheme: keyof typeof schemes;
+  light: boolean;
+}
+
+export interface ThemeFromProvider extends Theme {
+  type: keyof typeof themes;
+  light: boolean;
+}
+
+export const getTheme = ({
+  theme: type,
+  scheme,
+  light
+}: ThemeData): ThemeFromProvider => {
+  let colors: Base16Theme;
   if (scheme === 'default') {
     colors = light ? schemes.default : defaultDarkScheme;
   } else {
diff --git a/packages/devui/tests/tsconfig.json b/packages/devui/tests/tsconfig.json
new file mode 100644
index 00000000..ca19def4
--- /dev/null
+++ b/packages/devui/tests/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../../../tsconfig.react.base.json",
+  "include": ["../src", "."]
+}
diff --git a/packages/devui/tsconfig.json b/packages/devui/tsconfig.json
new file mode 100644
index 00000000..7b7d1492
--- /dev/null
+++ b/packages/devui/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.react.base.json",
+  "compilerOptions": {
+    "outDir": "lib"
+  },
+  "include": ["src"]
+}