diff --git a/package.json b/package.json
index 3673b3d..97de9f2 100644
--- a/package.json
+++ b/package.json
@@ -42,9 +42,9 @@
     "stylelint-config-styled-components": "^0.1.1",
     "stylelint-processor-styled-components": "^1.8.0",
     "ts-jest": "^24.0.2",
-    "tslint": "^5.17.0",
-    "typescript": "^3.5.1",
-    "typescript-tslint-plugin": "^0.4.0"
+    "tslint": "^5.18.0",
+    "typescript": "^3.5.3",
+    "typescript-tslint-plugin": "^0.5.4"
   },
   "lint-staged": {
     "*.{ts,tsx}": [
diff --git a/packages/roleypoly-bot/package.json b/packages/roleypoly-bot/package.json
index 4c607d4..a3e09e0 100644
--- a/packages/roleypoly-bot/package.json
+++ b/packages/roleypoly-bot/package.json
@@ -15,7 +15,7 @@
   "devDependencies": {
     "@types/async-retry": "^1.4.1",
     "lint-staged": "^8.1.7",
-    "tslint": "^5.17.0",
-    "typescript": "^3.5.1"
+    "tslint": "^5.18.0",
+    "typescript": "^3.5.3"
   }
 }
diff --git a/packages/roleypoly-design/package.json b/packages/roleypoly-design/package.json
index 038e060..7db7647 100644
--- a/packages/roleypoly-design/package.json
+++ b/packages/roleypoly-design/package.json
@@ -42,9 +42,9 @@
     "react-test-renderer": "^16.8.6",
     "sinon": "^7.3.2",
     "stylelint": "^10.0.1",
-    "tslint": "^5.17.0",
+    "tslint": "^5.18.0",
     "tslint-config-standard": "^8.0.1",
-    "typescript": "^3.5.1"
+    "typescript": "^3.5.3"
   },
   "scripts": {
     "storybook": "start-storybook -p 6006",
diff --git a/packages/roleypoly-rpc/package.json b/packages/roleypoly-rpc/package.json
index fc0ea8e..50094f7 100644
--- a/packages/roleypoly-rpc/package.json
+++ b/packages/roleypoly-rpc/package.json
@@ -2,17 +2,21 @@
   "name": "@roleypoly/rpc",
   "version": "2.0.0",
   "devDependencies": {
-    "@types/superagent": "^4.1.1",
     "@types/cookie": "^0.3.3",
+    "@types/superagent": "^4.1.1",
     "lint-staged": "^8.1.7",
-    "tslint": "^5.17.0",
-    "typescript": "^3.5.1"
+    "tslint": "^5.18.0",
+    "typescript": "^3.5.3"
   },
   "scripts": {
     "generate": "bentoc ./**/*.proto",
     "build": "tsc",
     "precommit": "lint-staged"
   },
+  "files": [
+    "lib"
+  ],
+  "main": "lib/index.js",
   "private": true,
   "dependencies": {
     "@kayteh/bento": "^0.2.2",
diff --git a/packages/roleypoly-rpc/src/index.ts b/packages/roleypoly-rpc/src/index.ts
index 84beada..5bb9042 100644
--- a/packages/roleypoly-rpc/src/index.ts
+++ b/packages/roleypoly-rpc/src/index.ts
@@ -1,2 +1,7 @@
 export { default as NATSTransport } from './utils/NATSTransport'
 export { default as HTTPTransport } from './utils/HTTPTransport'
+
+import * as Servers from './services/servers.bento'
+export {
+  Servers
+}
diff --git a/packages/roleypoly-server/package.json b/packages/roleypoly-server/package.json
index 3e7a30d..14548de 100644
--- a/packages/roleypoly-server/package.json
+++ b/packages/roleypoly-server/package.json
@@ -36,7 +36,7 @@
     "@types/nanoid": "^2.0.0",
     "chokidar": "^3.0.1",
     "lint-staged": "^8.1.7",
-    "tslint": "^5.17.0",
-    "typescript": "^3.5.1"
+    "tslint": "^5.18.0",
+    "typescript": "^3.5.3"
   }
 }
diff --git a/packages/roleypoly-types/package.json b/packages/roleypoly-types/package.json
index fcc1626..675a81c 100644
--- a/packages/roleypoly-types/package.json
+++ b/packages/roleypoly-types/package.json
@@ -7,7 +7,7 @@
   },
   "devDependencies": {
     "lint-staged": "^8.1.7",
-    "tslint": "^5.17.0",
-    "typescript": "^3.5.1"
+    "tslint": "^5.18.0",
+    "typescript": "^3.5.3"
   }
 }
diff --git a/packages/roleypoly-ui-server/package.json b/packages/roleypoly-ui-server/package.json
index be4a5d5..359b174 100644
--- a/packages/roleypoly-ui-server/package.json
+++ b/packages/roleypoly-ui-server/package.json
@@ -20,7 +20,7 @@
     "chalk": "^2.4.2",
     "chokidar": "^3.0.1",
     "lint-staged": "^8.1.7",
-    "tslint": "^5.17.0",
-    "typescript": "^3.5.1"
+    "tslint": "^5.18.0",
+    "typescript": "^3.5.3"
   }
 }
diff --git a/packages/roleypoly-ui/config/rpc.ts b/packages/roleypoly-ui/config/rpc.ts
index a7765eb..cc729d0 100644
--- a/packages/roleypoly-ui/config/rpc.ts
+++ b/packages/roleypoly-ui/config/rpc.ts
@@ -1,23 +1,19 @@
-// @flow
-// import RPCClient from '@roleypoly/rpc-client'
+import { Servers as ServersRPC, HTTPTransport } from '@roleypoly/rpc'
+import Bento, { JSONSerializer } from '@kayteh/bento'
 
-// const client = new RPCClient({ forceDev: false })
-
-// export default client.rpc
-// export const withCookies = (ctx: any) => {
-//   if (ctx.req != null) {
-//     return client.withCookies(ctx.req.headers.cookie)
-//   } else {
-//     return client.rpc
-//   }
+// const o = {
+//   getCurrentUser: async (..._: any) => null,
+//   getServerSlug: async (..._: any) => null,
+//   checkAuthChallenge: async (..._: any) => false
 // }
-const o = {
-  getCurrentUser: async (..._: any) => null,
-  getServerSlug: async (..._: any) => null,
-  checkAuthChallenge: async (..._: any) => false
-}
 
-export default o
-export function withCookies () {
-  return o
-}
+export const bento = new Bento()
+export const transport = new HTTPTransport(
+  bento,
+  new JSONSerializer(),
+  process.env.RPC_URL || '/api/_rpc'
+)
+
+bento.transport = transport
+
+export const Servers = bento.client(ServersRPC.ServersClient)
diff --git a/packages/roleypoly-ui/next.config.js b/packages/roleypoly-ui/next.config.js
index d3aa7ef..cf2305d 100644
--- a/packages/roleypoly-ui/next.config.js
+++ b/packages/roleypoly-ui/next.config.js
@@ -1,6 +1,5 @@
 require('dotenv').config({ quiet: true })
-const withTypescript = require('@zeit/next-typescript')
-module.exports = withTypescript({
+module.exports = {
   publicRuntimeConfig: {
     BOT_HANDLE: process.env.BOT_HANDLE
   },
@@ -12,4 +11,4 @@ module.exports = withTypescript({
 
     return config
   }
-})
+}
diff --git a/packages/roleypoly-ui/package.json b/packages/roleypoly-ui/package.json
index 8e28560..352d9c8 100644
--- a/packages/roleypoly-ui/package.json
+++ b/packages/roleypoly-ui/package.json
@@ -7,8 +7,8 @@
     "precommit": "lint-staged"
   },
   "dependencies": {
-    "@roleypoly/rpc": "^2.0.0",
-    "@roleypoly/design": "^2.0.0",
+    "@roleypoly/design": "2.0.0",
+    "@roleypoly/rpc": "2.0.0",
     "color": "^3.1.2",
     "eventemitter3": "^3.1.2",
     "fast-redux": "^0.7.1",
@@ -27,10 +27,10 @@
     "superagent": "^5.0.5"
   },
   "devDependencies": {
-    "@zeit/next-typescript": "^1.1.1",
-    "@roleypoly/types": "^2.0.0",
     "@babel/plugin-transform-runtime": "^7.4.4",
+    "@roleypoly/types": "^2.0.0",
     "@types/next": "^8.0.5",
+    "@zeit/next-typescript": "^1.1.1",
     "babel-plugin-styled-components": "^1.10.0",
     "enzyme": "^3.10.0",
     "enzyme-adapter-react-16": "^1.14.0",
@@ -38,7 +38,7 @@
     "lint-staged": "^8.1.7",
     "react-test-renderer": "^16.8.6",
     "standard": "12.0.1",
-    "tslint": "^5.17.0",
-    "typescript": "^3.5.1"
+    "tslint": "^5.18.0",
+    "typescript": "^3.5.3"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 5e676f8..2dfcb6b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15119,10 +15119,10 @@ tslint-eslint-rules@^5.3.1:
     tslib "1.9.0"
     tsutils "^3.0.0"
 
-tslint@^5.17.0:
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.17.0.tgz#f9f0ce2011d8e90debaa6e9b4975f24cd16852b8"
-  integrity sha512-pflx87WfVoYepTet3xLfDOLDm9Jqi61UXIKePOuca0qoAZyrGWonDG9VTbji58Fy+8gciUn8Bt7y69+KEVjc/w==
+tslint@^5.18.0:
+  version "5.18.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.18.0.tgz#f61a6ddcf372344ac5e41708095bbf043a147ac6"
+  integrity sha512-Q3kXkuDEijQ37nXZZLKErssQVnwCV/+23gFEMROi8IlbaBG6tXqLPQJ5Wjcyt/yHPKBC+hD5SzuGaMora+ZS6w==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     builtin-modules "^1.1.1"
@@ -15231,19 +15231,19 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript-tslint-plugin@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.4.0.tgz#af1729e72b770489b2b912809694f46c3281bb72"
-  integrity sha512-83zipyk5bCqu/LHifaWPmJ7Xnl6lLn/3KmWINgr+XND79BrVWmkV8CudKc+a9Jhjs2opvVKq0n0P4O4NhHOixw==
+typescript-tslint-plugin@^0.5.4:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.5.4.tgz#febe0cca1fe65133f4f688841eba68262a1d55a5"
+  integrity sha512-CQEfGC+p0SoBARI4N2LrGsWJsp4/OE+uKZ68xsWYKHWqMFq4DFQHqOVlK0deEricSN01NmDTqjap63Pw/DHieg==
   dependencies:
     minimatch "^3.0.4"
     mock-require "^3.0.2"
     vscode-languageserver "^5.1.0"
 
-typescript@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.1.tgz#ba72a6a600b2158139c5dd8850f700e231464202"
-  integrity sha512-64HkdiRv1yYZsSe4xC1WVgamNigVYjlssIoaH2HcZF0+ijsk5YK2g0G34w9wJkze8+5ow4STd22AynfO6ZYYLw==
+typescript@^3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
+  integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
 
 ua-parser-js@^0.7.18:
   version "0.7.19"