diff --git a/.storybook/addons.js b/.storybook/addons.js
index 18e32752..17df6a36 100644
--- a/.storybook/addons.js
+++ b/.storybook/addons.js
@@ -1,2 +1,2 @@
-import '@kadira/storybook/addons';
+import '@storybook/addon-actions/register';
 import 'storybook-addon-a11y/register';
diff --git a/.storybook/config.js b/.storybook/config.js
index e2857937..0a0abcfd 100644
--- a/.storybook/config.js
+++ b/.storybook/config.js
@@ -1,4 +1,4 @@
-import { configure } from '@kadira/storybook';
+import { configure } from '@storybook/react';
 
 // automatically import all story.js files
 const req = require.context('../', true, /story\.jsx$/);
diff --git a/.storybook/head.html b/.storybook/preview-head.html
similarity index 100%
rename from .storybook/head.html
rename to .storybook/preview-head.html
diff --git a/Button/story.jsx b/Button/story.jsx
index 81f5ce96..fbb2e626 100644
--- a/Button/story.jsx
+++ b/Button/story.jsx
@@ -1,8 +1,6 @@
 import React from 'react';
-import {
-  action,
-  storiesOf,
-} from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
 import { checkA11y } from 'storybook-addon-a11y';
 import Button from './index';
 import CloseIcon from '../Icon/Icons/CloseIcon';
diff --git a/ButtonStateless/story.jsx b/ButtonStateless/story.jsx
index 7bbe82ab..593e333f 100644
--- a/ButtonStateless/story.jsx
+++ b/ButtonStateless/story.jsx
@@ -1,8 +1,6 @@
 import React from 'react';
-import {
-  storiesOf,
-  action,
-} from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
 import { checkA11y } from 'storybook-addon-a11y';
 import Button from './index';
 import Text from '../Text';
diff --git a/Card/story.jsx b/Card/story.jsx
index 9fb26879..6605b92d 100644
--- a/Card/story.jsx
+++ b/Card/story.jsx
@@ -1,8 +1,6 @@
 import React from 'react';
-import {
-  storiesOf,
-  action,
-} from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
 import { checkA11y } from 'storybook-addon-a11y';
 import Card from './index';
 import Link from '../Link';
diff --git a/Icon/story.jsx b/Icon/story.jsx
index 5a0ebfd0..df53959c 100644
--- a/Icon/story.jsx
+++ b/Icon/story.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { storiesOf } from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
 import { checkA11y } from 'storybook-addon-a11y';
 import AddMediaIcon from './Icons/AddMediaIcon';
 import AnalyticsIcon from './Icons/AnalyticsIcon';
diff --git a/IdTag/story.jsx b/IdTag/story.jsx
index e89d6e8d..e63c6150 100644
--- a/IdTag/story.jsx
+++ b/IdTag/story.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { storiesOf } from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
 import { checkA11y } from 'storybook-addon-a11y';
 import IdTag from './index';
 
diff --git a/Image/story.jsx b/Image/story.jsx
index 3380ad47..cdc6cf0e 100644
--- a/Image/story.jsx
+++ b/Image/story.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { storiesOf } from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
 import { checkA11y } from 'storybook-addon-a11y';
 import Image from './index';
 
diff --git a/Input/story.jsx b/Input/story.jsx
index 3f80c58d..9e76bdf5 100644
--- a/Input/story.jsx
+++ b/Input/story.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
-import { storiesOf, action } from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
 import { checkA11y } from 'storybook-addon-a11y';
 import Input from './index';
 
diff --git a/InputDate/story.jsx b/InputDate/story.jsx
index cc8aa92e..8d0d1285 100644
--- a/InputDate/story.jsx
+++ b/InputDate/story.jsx
@@ -1,8 +1,6 @@
 import React from 'react';
-import {
-  storiesOf,
-  action,
-} from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
 import { checkA11y } from 'storybook-addon-a11y';
 import InputDate from './index';
 
diff --git a/InputEmail/story.jsx b/InputEmail/story.jsx
index a7b725ed..f0f31f4b 100644
--- a/InputEmail/story.jsx
+++ b/InputEmail/story.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
-import { storiesOf, action } from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
 import { checkA11y } from 'storybook-addon-a11y';
 import InputEmail from './index';
 
diff --git a/InputPassword/story.jsx b/InputPassword/story.jsx
index 99632cd1..c95eb27d 100644
--- a/InputPassword/story.jsx
+++ b/InputPassword/story.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
-import { storiesOf, action } from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
 import { checkA11y } from 'storybook-addon-a11y';
 import InputPassword from './index';
 
diff --git a/InputTime/story.jsx b/InputTime/story.jsx
index 732220a4..e7d3dba9 100644
--- a/InputTime/story.jsx
+++ b/InputTime/story.jsx
@@ -1,8 +1,6 @@
 import React from 'react';
-import {
-  storiesOf,
-  action,
-} from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
 import { checkA11y } from 'storybook-addon-a11y';
 import InputTime from './index';
 
diff --git a/Link/story.jsx b/Link/story.jsx
index 2f93c588..5bdcb754 100644
--- a/Link/story.jsx
+++ b/Link/story.jsx
@@ -1,7 +1,5 @@
 import React from 'react';
-import {
-  storiesOf,
-} from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
 import { checkA11y } from 'storybook-addon-a11y';
 import Link from './index';
 
diff --git a/LinkStateless/story.jsx b/LinkStateless/story.jsx
index c79271d9..0935ebbb 100644
--- a/LinkStateless/story.jsx
+++ b/LinkStateless/story.jsx
@@ -1,8 +1,6 @@
 import React from 'react';
-import {
-  storiesOf,
-  action,
-} from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
 import { checkA11y } from 'storybook-addon-a11y';
 import LinkStateless from './index';
 
diff --git a/LinkifiedText/story.jsx b/LinkifiedText/story.jsx
index fc890317..f987612b 100644
--- a/LinkifiedText/story.jsx
+++ b/LinkifiedText/story.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { storiesOf } from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
 import { checkA11y } from 'storybook-addon-a11y';
 import LinkifiedText from './index';
 
diff --git a/List/story.jsx b/List/story.jsx
index c501fffd..64f61b56 100644
--- a/List/story.jsx
+++ b/List/story.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { storiesOf } from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
 import { checkA11y } from 'storybook-addon-a11y';
 import List from './index';
 
diff --git a/ListItem/story.jsx b/ListItem/story.jsx
index d8ce1f0d..7c3c2c3b 100644
--- a/ListItem/story.jsx
+++ b/ListItem/story.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { storiesOf } from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
 import { checkA11y } from 'storybook-addon-a11y';
 import ListItem from './index';
 
diff --git a/Loader/story.jsx b/Loader/story.jsx
index 15a5d0bf..d9cabec3 100644
--- a/Loader/story.jsx
+++ b/Loader/story.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { storiesOf } from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
 import { checkA11y } from 'storybook-addon-a11y';
 import Loader from './index';
 
diff --git a/MultipleImages/story.jsx b/MultipleImages/story.jsx
index 7a59f469..61011144 100644
--- a/MultipleImages/story.jsx
+++ b/MultipleImages/story.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { storiesOf } from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
 import MultipleImages from './index';
 
 storiesOf('MultipleImages')
diff --git a/NavBar/story.jsx b/NavBar/story.jsx
index 9054251f..a585e4b3 100644
--- a/NavBar/story.jsx
+++ b/NavBar/story.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { storiesOf } from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
 import { checkA11y } from 'storybook-addon-a11y';
 import NavBar from './index';
 
diff --git a/Overlay/story.jsx b/Overlay/story.jsx
index 387af2b5..a71b5a1f 100644
--- a/Overlay/story.jsx
+++ b/Overlay/story.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
-import { storiesOf, action } from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
 import { checkA11y } from 'storybook-addon-a11y';
 import Overlay from './index';
 import Image from '../Image';
diff --git a/Popover/story.jsx b/Popover/story.jsx
index 7e3a3c30..1b4b352d 100644
--- a/Popover/story.jsx
+++ b/Popover/story.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
-import { storiesOf, action } from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
 import { checkA11y } from 'storybook-addon-a11y';
 import Popover from './index';
 import Card from '../Card';
diff --git a/README.md b/README.md
index 27a07a17..530f7ad6 100644
--- a/README.md
+++ b/README.md
@@ -194,7 +194,7 @@ populate **story.js** with a default story
 ```js
 // story.js
 import React from 'react';
-import { storiesOf } from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
 import NewComponent from './index';
 
 storiesOf('Card')
diff --git a/SectionHeader/story.jsx b/SectionHeader/story.jsx
index 6ec544df..df460630 100644
--- a/SectionHeader/story.jsx
+++ b/SectionHeader/story.jsx
@@ -1,7 +1,5 @@
 import React from 'react';
-import {
-  storiesOf,
-} from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
 import { checkA11y } from 'storybook-addon-a11y';
 import SectionHeader from './index';
 
diff --git a/Select/story.jsx b/Select/story.jsx
index e1c34902..e17bd89e 100644
--- a/Select/story.jsx
+++ b/Select/story.jsx
@@ -1,7 +1,5 @@
 import React from 'react';
-import {
-  storiesOf,
-} from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
 import { checkA11y } from 'storybook-addon-a11y';
 import Select from './index';
 
diff --git a/Text/story.jsx b/Text/story.jsx
index 5d8b3b10..ede92cbf 100644
--- a/Text/story.jsx
+++ b/Text/story.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { storiesOf } from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
 import { checkA11y } from 'storybook-addon-a11y';
 import Text from './index';
 
diff --git a/Video/story.jsx b/Video/story.jsx
index 80aa153f..1b5a2662 100644
--- a/Video/story.jsx
+++ b/Video/story.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { storiesOf } from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
 import { checkA11y } from 'storybook-addon-a11y';
 import Video from './index';
 
diff --git a/package.json b/package.json
index 595f23bf..c4134c64 100644
--- a/package.json
+++ b/package.json
@@ -38,8 +38,10 @@
     "react": ">= 0.14.0"
   },
   "devDependencies": {
-    "@kadira/storybook": "2.35.3",
     "@kadira/storybook-deployer": "1.2.0",
+    "@storybook/addon-actions": "3.1.2",
+    "@storybook/addon-storyshots": "3.1.2",
+    "@storybook/react": "3.1.3",
     "babel-cli": "6.24.1",
     "babel-eslint": "7.2.3",
     "babel-jest": "20.0.3",
@@ -58,8 +60,7 @@
     "react-addons-test-utils": "15.5.1",
     "react-dom": "15.5.4",
     "react-test-renderer": "15.5.4",
-    "storybook-addon-a11y": "0.0.4",
-    "storyshots": "3.2.2",
+    "storybook-addon-a11y": "3.0.0",
     "style-loader": "0.18.1"
   },
   "dependencies": {
diff --git a/snapshot.test.js b/snapshot.test.js
index c2890a08..f04ee759 100644
--- a/snapshot.test.js
+++ b/snapshot.test.js
@@ -1,5 +1,5 @@
 // use story.js files as snapshots
-import initStoryshots from 'storyshots';
+import initStoryshots from '@storybook/addon-storyshots';
 
 initStoryshots({
   suit: 'Snapshots',