diff --git a/packages/ui-identicon/package.json b/packages/ui-identicon/package.json
index a6621403..dd887e9c 100644
--- a/packages/ui-identicon/package.json
+++ b/packages/ui-identicon/package.json
@@ -23,8 +23,8 @@
     "react": "*"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^0.36.1",
-    "@polkadot/util-crypto": "^0.36.1",
+    "@polkadot/keyring": "^0.36.3",
+    "@polkadot/util-crypto": "^0.36.3",
     "xmlserializer": "^0.6.1"
   }
 }
diff --git a/packages/ui-identicon/src/Demo.tsx b/packages/ui-identicon/src/Demo.tsx
index ff028798..a07d998c 100644
--- a/packages/ui-identicon/src/Demo.tsx
+++ b/packages/ui-identicon/src/Demo.tsx
@@ -7,7 +7,7 @@ import ReactDOM from 'react-dom';
 import { encodeAddress } from '@polkadot/keyring';
 import { randomAsU8a } from '@polkadot/util-crypto';
 
-import IdentityIcon from './index';
+import IdentityIcon from '.';
 
 export default class Demo extends React.PureComponent {
   render () {
diff --git a/packages/ui-identicon/src/Identicon.tsx b/packages/ui-identicon/src/Identicon.tsx
index a2b17ff7..6786741f 100644
--- a/packages/ui-identicon/src/Identicon.tsx
+++ b/packages/ui-identicon/src/Identicon.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import CopyToClipboard from 'react-copy-to-clipboard';
 import styled from 'styled-components';
 import { decodeAddress, encodeAddress } from '@polkadot/keyring';
-import settings from '@polkadot/ui-settings/index';
+import settings from '@polkadot/ui-settings';
 import { isHex, isU8a } from '@polkadot/util';
 
 import { Beachball, Empty, Jdenticon, Polkadot } from './icons';
diff --git a/packages/ui-identicon/src/beachball/demo.ts b/packages/ui-identicon/src/beachball/demo.ts
index 3795596f..1c43fd8e 100644
--- a/packages/ui-identicon/src/beachball/demo.ts
+++ b/packages/ui-identicon/src/beachball/demo.ts
@@ -7,7 +7,7 @@ import { encodeAddress } from '@polkadot/keyring';
 import { isNull } from '@polkadot/util';
 import { randomAsU8a } from '@polkadot/util-crypto';
 
-import identicon from './index';
+import identicon from '.';
 
 const element = document.getElementById('demo');
 
diff --git a/packages/ui-identicon/src/beachball/index.spec.ts b/packages/ui-identicon/src/beachball/index.spec.ts
index a4c41858..cfd71313 100644
--- a/packages/ui-identicon/src/beachball/index.spec.ts
+++ b/packages/ui-identicon/src/beachball/index.spec.ts
@@ -4,7 +4,7 @@
 
 import xmlserializer from 'xmlserializer';
 
-import identicon from './index';
+import identicon from '.';
 
 describe('identicon', () => {
   it('generates a basic [0,..,0] identicon', () => {
diff --git a/packages/ui-identicon/src/icons/Beachball.tsx b/packages/ui-identicon/src/icons/Beachball.tsx
index b550a7b1..2a2022de 100644
--- a/packages/ui-identicon/src/icons/Beachball.tsx
+++ b/packages/ui-identicon/src/icons/Beachball.tsx
@@ -6,7 +6,7 @@ import { Props } from '../types';
 
 import React from 'react';
 
-import identicon from '../beachball/index';
+import identicon from '../beachball';
 
 export default class Beachball extends React.PureComponent<Props> {
   render () {
diff --git a/packages/ui-keyring/package.json b/packages/ui-keyring/package.json
index 95c9ae46..1c0f2de1 100644
--- a/packages/ui-keyring/package.json
+++ b/packages/ui-keyring/package.json
@@ -16,9 +16,9 @@
     "store": "^2.0.12"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^0.36.1",
-    "@polkadot/types": "^0.46.11",
-    "@polkadot/util": "^0.36.1"
+    "@polkadot/keyring": "^0.36.3",
+    "@polkadot/types": "^0.46.12",
+    "@polkadot/util": "^0.36.3"
   },
   "peerDependencies": {
     "@polkadot/keyring": "*",
diff --git a/packages/ui-keyring/src/options/KeyPair.tsx b/packages/ui-keyring/src/options/KeyPair.tsx
index a5c5183b..a64b3ff9 100644
--- a/packages/ui-keyring/src/options/KeyPair.tsx
+++ b/packages/ui-keyring/src/options/KeyPair.tsx
@@ -4,7 +4,7 @@
 
 import React from 'react';
 import styled from 'styled-components';
-import IdentityIcon from '@polkadot/ui-identicon/index';
+import IdentityIcon from '@polkadot/ui-identicon';
 
 type Props = {
   address: string,
diff --git a/packages/ui-keyring/src/options/index.spec.ts b/packages/ui-keyring/src/options/index.spec.ts
index f40c52ca..cce5540b 100644
--- a/packages/ui-keyring/src/options/index.spec.ts
+++ b/packages/ui-keyring/src/options/index.spec.ts
@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import keyringOptionInstance from './index';
+import keyringOptionInstance from '.';
 
 describe('KeyringOption', () => {
   it('should not allow initOptions to be called more than once', () => {
diff --git a/packages/ui-util/package.json b/packages/ui-util/package.json
index 60d55592..b08c309e 100644
--- a/packages/ui-util/package.json
+++ b/packages/ui-util/package.json
@@ -12,7 +12,7 @@
     "@babel/runtime": "^7.3.4"
   },
   "devDependencies": {
-    "@polkadot/types": "^0.46.11"
+    "@polkadot/types": "^0.46.12"
   },
   "peerDependencies": {
     "@polkadot/types": "*"
diff --git a/tsconfig.json b/tsconfig.json
index 9857f69b..11dc769a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,9 +3,13 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
+      "@polkadot/ui-assets": [ "packages/ui-assets/src" ],
       "@polkadot/ui-assets/*": [ "packages/ui-assets/src/*" ],
+      "@polkadot/ui-identicon": [ "packages/ui-identicon/src" ],
       "@polkadot/ui-identicon/*": [ "packages/ui-identicon/src/*" ],
+      "@polkadot/ui-keyring": [ "packages/ui-keyring/src" ],
       "@polkadot/ui-keyring/*": [ "packages/ui-keyring/src/*" ],
+      "@polkadot/ui-settings": [ "packages/ui-settings/src" ],
       "@polkadot/ui-settings/*": [ "packages/ui-settings/src/*" ]
     },
     "typeRoots": [
diff --git a/yarn.lock b/yarn.lock
index e7c74802..1acf05f9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1533,14 +1533,14 @@
     typescript "^3.3.3333"
     vuepress "^1.0.0-alpha.40"
 
-"@polkadot/keyring@^0.36.1":
-  version "0.36.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-0.36.1.tgz#c34b4c8132e96e80a374b906c7190f39c92e5eb5"
-  integrity sha512-LTEPA2IGjr6v0Q4UdWb8vhVCJMV1Iy9++vKFNm/MVjedwYAtcaHa2UqmjgejJhndHf1DJLKZvQYFHmPUUDI4jQ==
+"@polkadot/keyring@^0.36.3":
+  version "0.36.3"
+  resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-0.36.3.tgz#4114f17f71137daee6f8f21ec22642a30d54360f"
+  integrity sha512-1k/NHaEJpIAyUm2skr4yf0gWE6EiFdDcd28CZj1Ta63reKUJfcxbWbcebSDoW8KZLbkDgH8GLe5l6sEuux7a/w==
   dependencies:
     "@babel/runtime" "^7.3.4"
-    "@polkadot/util" "^0.36.1"
-    "@polkadot/util-crypto" "^0.36.1"
+    "@polkadot/util" "^0.36.3"
+    "@polkadot/util-crypto" "^0.36.3"
     "@types/bs58" "^4.0.0"
     bs58 "^4.0.1"
 
@@ -1554,24 +1554,24 @@
   resolved "https://registry.yarnpkg.com/@polkadot/ts/-/ts-0.1.56.tgz#ffd6e9c95704a7fb90b918193b9dc5c440114b27"
   integrity sha512-wnt4zXxZXyz6WaubTO/I+nUElwV2DogFzdl6CrKfVn2PTWp8uHN06W9s40FH57ORtmQfDr9rLRP8Nq+oIyElbg==
 
-"@polkadot/types@^0.46.11":
-  version "0.46.11"
-  resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.46.11.tgz#a33c491376e47820b3820f54112eda3b28fdba58"
-  integrity sha512-ZsT6S6F6aIywrCV0WSfYOnCkIgYK3HnXPPY6W6rWdrL/JDNgJUGHi0CpZR3CeWU993AmrzieXamarRuY9ELsWA==
+"@polkadot/types@^0.46.12":
+  version "0.46.12"
+  resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.46.12.tgz#c4c6b3fa39121da9d2167d80e0fa14c8ca4aa324"
+  integrity sha512-HRtw8JZSwqMONmCnI4RCwJXGJAGIiBiQfbZEFu5Ome3Cr601Kd38tSfJI4V2pPh5P6MIb1ejPXQs2oAsVb/iTA==
   dependencies:
     "@babel/runtime" "^7.3.4"
-    "@polkadot/keyring" "^0.36.1"
-    "@polkadot/util" "^0.36.1"
+    "@polkadot/keyring" "^0.36.3"
+    "@polkadot/util" "^0.36.3"
     core-js "^2.6.5"
 
-"@polkadot/util-crypto@^0.36.1":
-  version "0.36.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.36.1.tgz#8a706939bd9e2066a53f42c5573ca9b845be3827"
-  integrity sha512-To17e43Tl+a3b08BtM9LSoK9j49xnDA/V3YxNclHFMur+JEsraMYooNQegfehcQTCbnnkZW+j+TeadlvN1OCBw==
+"@polkadot/util-crypto@^0.36.3":
+  version "0.36.3"
+  resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.36.3.tgz#abf585e9ef55a3c2c53419ab7d14a3db36cb6a9a"
+  integrity sha512-QMNSYkd3ZT0lD771P0ozEzplUf/YHhflS0Y0v17Z2oEBx2tSFa6MQ9R+fLXT6lFKOExnSHnJmNszZfwns4EyDg==
   dependencies:
     "@babel/runtime" "^7.3.4"
     "@polkadot/schnorrkel-js" "^0.1.2-3"
-    "@polkadot/util" "^0.36.1"
+    "@polkadot/util" "^0.36.3"
     "@types/bip39" "^2.4.2"
     "@types/pbkdf2" "^3.0.0"
     "@types/secp256k1" "^3.5.0"
@@ -1584,10 +1584,10 @@
     tweetnacl "^1.0.1"
     xxhashjs "^0.2.2"
 
-"@polkadot/util@^0.36.1":
-  version "0.36.1"
-  resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.36.1.tgz#680b3e9358a9131f05a2e4fe7938cb03065a7afa"
-  integrity sha512-lAILZlBhPoSowtX1wjkZiJDE0y2TYLqe7QMQSaDvk5/u4VT9ZcSqdoIqeZWy0YInG8ISW3bd9L7rjNGmUGKpCg==
+"@polkadot/util@^0.36.3":
+  version "0.36.3"
+  resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.36.3.tgz#de5fa37d7bfd7af3f1cb549d38f69b4114ee35ea"
+  integrity sha512-biDXsSSsJw1gVoobqBHFXE1RzXMz5DWAERO5h02ZwKRSsJROISsHzlD0MF4fNmiIzcHJ5pe08Ul6YzR1ZPhGEw==
   dependencies:
     "@babel/runtime" "^7.3.4"
     "@types/bn.js" "^4.11.4"