diff --git a/.travis.yml b/.travis.yml
index f4eb4c7..4b54a8f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: node_js
-addons: 
+addons:
   "firefox": "latest"
 node_js:
-  - "5"
+  - "7"
 before_script:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
diff --git a/most-typings.d.ts b/most-typings.d.ts
index 0d78209..245b476 100644
--- a/most-typings.d.ts
+++ b/most-typings.d.ts
@@ -1,5 +1,5 @@
 import {Stream} from 'most';
-import {Pathname, Location} from '@cycle/history/lib/interfaces';
+import {Pathname, Location} from '@cycle/history';
 import {RouteDefinitionsMap, RouteMatcherReturn} from './lib/interfaces';
 export interface RouterSource {
     history$: Stream<Location>;
diff --git a/package.json b/package.json
index 252b51e..dd72d8c 100644
--- a/package.json
+++ b/package.json
@@ -27,31 +27,32 @@
   },
   "homepage": "https://github.com/cyclejs-community/cyclic-router#readme",
   "dependencies": {
-    "@cycle/history": "^6.1.0",
-    "@types/history": "^4.5.0",
-    "history": "^4.5.0",
-    "@cycle/run": "^3.0.0"
+    "@cycle/history": "^6.2.0",
+    "@cycle/run": "^3.1.0",
+    "history": "^4.6.1"
   },
   "devDependencies": {
-    "@cycle/rxjs-run": "^6.1.0",
+    "@cycle/rxjs-run": "^7.0.0",
+    "@types/history": "^4.5.1",
+    "@types/mocha": "^2.2.41",
+    "@types/node": "^7.0.22",
     "assert": "^1.4.1",
-    "babel-preset-es2015": "^6.16.0",
-    "babel-register": "^6.18.0",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-register": "^6.24.1",
     "babelify": "^7.3.0",
-    "browserify": "^13.0.1",
+    "browserify": "^14.4.0",
     "cli-release": "^1.0.4",
     "ghooks": "^1.2.1",
     "mkdirp": "^0.5.1",
-    "mocha": "^2.5.3",
-    "rxjs": "^5.2.0",
-    "testem": "^1.10.4",
+    "mocha": "^3.4.2",
+    "rxjs": "^5.4.0",
+    "switch-path": "^1.2.0",
+    "testem": "^1.16.1",
     "tslint": "^3.10.2",
-    "typescript": "^2.0.7",
-    "typings": "^0.8.1",
-    "uglify-js": "^2.7.1",
+    "typescript": "^2.3.3",
+    "uglify-js": "^3.0.12",
     "validate-commit-message": "^3.0.1",
-    "xstream": "^10.3.0",
-    "switch-path": "^1.1.8"
+    "xstream": "^10.8.0"
   },
   "config": {
     "ghooks": {
@@ -67,7 +68,6 @@
     "pretest-ci": "npm run lib",
     "test-ci": "npm run lint && npm run test-node && testem ci",
     "predist": "rm -rf dist/ && mkdirp dist/",
-    "prelib": "typings install",
     "lib": "tsc",
     "start": "npm install && npm prune",
     "prerelease": "npm run lib",
diff --git a/rx-typings.d.ts b/rx-typings.d.ts
index 895b774..a99495d 100644
--- a/rx-typings.d.ts
+++ b/rx-typings.d.ts
@@ -1,5 +1,5 @@
 import {Observable} from 'rx';
-import {Pathname, Location} from '@cycle/history/lib/interfaces';
+import {Pathname, Location} from '@cycle/history';
 import {RouteDefinitionsMap, RouteMatcherReturn} from './lib/interfaces';
 export interface RouterSource {
     history$: Observable<Location>;
diff --git a/rxjs-typings.d.ts b/rxjs-typings.d.ts
index ddacd18..98cf29d 100644
--- a/rxjs-typings.d.ts
+++ b/rxjs-typings.d.ts
@@ -1,5 +1,5 @@
 import {Observable} from 'rxjs';
-import {Pathname, Location} from '@cycle/history/lib/interfaces';
+import {Pathname, Location} from '@cycle/history';
 import {RouteDefinitionsMap, RouteMatcherReturn} from './lib/interfaces';
 export interface RouterSource {
     history$: Observable<Location>;
diff --git a/src/index.ts b/src/index.ts
index 6a4f61f..2dafb63 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,2 +1,3 @@
 export {makeRouterDriver} from './makeRouterDriver';
 export {RouterSource} from './RouterSource';
+export * from './interfaces';
diff --git a/src/interfaces.ts b/src/interfaces.ts
index 745c58c..ff90bf4 100644
--- a/src/interfaces.ts
+++ b/src/interfaces.ts
@@ -13,4 +13,4 @@ export interface RouteMatcherReturn {
 
 export interface RouteMatcher {
   (path: string, routes: RouteDefinitionsMap | RouteDefinitionsArray): RouteMatcherReturn;
-} 
\ No newline at end of file
+}
diff --git a/typings.json b/typings.json
deleted file mode 100644
index b7e9453..0000000
--- a/typings.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "cyclic-router",
-  "ambientDevDependencies": {
-    "mocha": "github:DefinitelyTyped/DefinitelyTyped/mocha/mocha.d.ts#d6dd320291705694ba8e1a79497a908e9f5e6617",
-    "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#20e1eb9616922d382d918cc5a21870a9dbe255f5"
-  },
-  "ambientDependencies": {
-    "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654"
-  }
-}
diff --git a/xstream-typings.d.ts b/xstream-typings.d.ts
index 13a8045..3104a48 100644
--- a/xstream-typings.d.ts
+++ b/xstream-typings.d.ts
@@ -1,5 +1,5 @@
 import {Stream} from 'xstream';
-import {Pathname} from '@cycle/history/lib/interfaces';
+import {Pathname} from '@cycle/history';
 import {RouteDefinitionsMap, RouteMatcherReturn} from './lib/interfaces';
 export interface RouterSource {
     history$: Stream<Location>;