diff --git a/package.json b/package.json
index 82a032af3f..bdf438b2b5 100644
--- a/package.json
+++ b/package.json
@@ -10,12 +10,12 @@
     "packages/*"
   ],
   "resolutions": {
-    "@polkadot/api": "^0.82.0-beta.95",
-    "@polkadot/api-contract": "^0.82.0-beta.95",
-    "@polkadot/keyring": "^0.95.0-beta.0",
-    "@polkadot/types": "^0.82.0-beta.95",
-    "@polkadot/util": "^0.95.0-beta.0",
-    "@polkadot/util-crypto": "^0.95.0-beta.0",
+    "@polkadot/api": "^0.90.0-beta.1",
+    "@polkadot/api-contract": "^0.90.0-beta.1",
+    "@polkadot/keyring": "^0.95.0-beta.2",
+    "@polkadot/types": "^0.90.0-beta.1",
+    "@polkadot/util": "^0.95.0-beta.2",
+    "@polkadot/util-crypto": "^0.95.0-beta.2",
     "@types/styled-components": "4.1.8",
     "babel-core": "^7.0.0-bridge.0",
     "typescript": "^3.5.3"
diff --git a/packages/app-123code/src/SummaryBar.tsx b/packages/app-123code/src/SummaryBar.tsx
index 15294a412e..d0973cd887 100644
--- a/packages/app-123code/src/SummaryBar.tsx
+++ b/packages/app-123code/src/SummaryBar.tsx
@@ -3,12 +3,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId, RuntimeVersion } from '@polkadot/types/interfaces';
 import { ApiProps } from '@polkadot/ui-api/types';
 import { BareProps, I18nProps } from '@polkadot/ui-app/types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { AccountId, RuntimeVersion } from '@polkadot/types';
 import { withCalls } from '@polkadot/ui-api/with';
 import { Bubble, IdentityIcon } from '@polkadot/ui-app';
 import { formatBalance, formatNumber } from '@polkadot/util';
diff --git a/packages/app-accounts/src/modals/Transfer.tsx b/packages/app-accounts/src/modals/Transfer.tsx
index fdfd0a4536..599c995c87 100644
--- a/packages/app-accounts/src/modals/Transfer.tsx
+++ b/packages/app-accounts/src/modals/Transfer.tsx
@@ -3,15 +3,15 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { SubmittableExtrinsic } from '@polkadot/api/promise/types';
+import { Index } from '@polkadot/types/interfaces';
 import { ApiProps } from '@polkadot/ui-api/types';
 import { DerivedFees } from '@polkadot/api-derive/types';
 import { I18nProps } from '@polkadot/ui-app/types';
-import { SubmittableExtrinsic } from '@polkadot/api/promise/types';
 
 import BN from 'bn.js';
 import React from 'react';
 import styled from 'styled-components';
-import { Index } from '@polkadot/types';
 import { Button, InputAddress, InputBalance, Modal, TxButton } from '@polkadot/ui-app';
 import { Available } from '@polkadot/ui-reactive';
 import Checks, { calcSignatureLength } from '@polkadot/ui-signer/Checks';
diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json
index c29cb13e2c..c8d48fab76 100644
--- a/packages/app-contracts/package.json
+++ b/packages/app-contracts/package.json
@@ -11,7 +11,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.5.5",
-    "@polkadot/api-contract": "^0.82.0-beta.95",
+    "@polkadot/api-contract": "^0.90.0-beta.1",
     "@polkadot/ui-app": "^0.34.0-beta.87"
   }
 }
diff --git a/packages/app-contracts/src/Codes/Add.tsx b/packages/app-contracts/src/Codes/Add.tsx
index 77df592d11..dffa6ddd0a 100644
--- a/packages/app-contracts/src/Codes/Add.tsx
+++ b/packages/app-contracts/src/Codes/Add.tsx
@@ -3,8 +3,8 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import React from 'react';
+import { createType } from '@polkadot/types';
 import { Button, Input } from '@polkadot/ui-app';
-import { Hash } from '@polkadot/types';
 
 import ContractModal, { ContractModalProps, ContractModalState } from '../Modal';
 import ValidateCode from './ValidateCode';
@@ -94,7 +94,7 @@ class Add extends ContractModal<Props, State> {
 
     this.setState({ isBusy: true }, (): void => {
       store
-        .saveCode(new Hash(codeHash), { abi, name, tags })
+        .saveCode(createType('Hash', codeHash), { abi, name, tags })
         .then((): void => {
           this.setState(
             { isBusy: false },
diff --git a/packages/app-contracts/src/Codes/Upload.tsx b/packages/app-contracts/src/Codes/Upload.tsx
index 1d2457077d..e5f0d171fe 100644
--- a/packages/app-contracts/src/Codes/Upload.tsx
+++ b/packages/app-contracts/src/Codes/Upload.tsx
@@ -2,6 +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 { Hash } from '@polkadot/types/interfaces';
 import { ApiProps } from '@polkadot/ui-api/types';
 import { SubmittableResult } from '@polkadot/api/SubmittableExtrinsic';
 
@@ -10,7 +11,6 @@ import React from 'react';
 import { withApi, withMulti } from '@polkadot/ui-api';
 import { Button, InputFile, TxButton } from '@polkadot/ui-app';
 import { compactAddLength } from '@polkadot/util';
-import { Hash } from '@polkadot/types';
 
 import ContractModal, { ContractModalProps, ContractModalState } from '../Modal';
 import store from '../store';
diff --git a/packages/app-contracts/src/Codes/ValidateCode.tsx b/packages/app-contracts/src/Codes/ValidateCode.tsx
index 88fdada11f..32ff9f9f04 100644
--- a/packages/app-contracts/src/Codes/ValidateCode.tsx
+++ b/packages/app-contracts/src/Codes/ValidateCode.tsx
@@ -3,7 +3,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { PrefabWasmModule } from '@polkadot/types/srml/contracts/types';
+import { PrefabWasmModule } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
 import { ApiProps } from '@polkadot/ui-api/types';
 
diff --git a/packages/app-contracts/src/Contracts/ValidateAddr.tsx b/packages/app-contracts/src/Contracts/ValidateAddr.tsx
index 0e6bda1854..594b46a544 100644
--- a/packages/app-contracts/src/Contracts/ValidateAddr.tsx
+++ b/packages/app-contracts/src/Contracts/ValidateAddr.tsx
@@ -3,7 +3,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { ContractInfo } from '@polkadot/types/srml/contracts/types';
+import { ContractInfo } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
 import { ApiProps } from '@polkadot/ui-api/types';
 
diff --git a/packages/app-contracts/src/Deploy.tsx b/packages/app-contracts/src/Deploy.tsx
index 403653c925..dd3906492c 100644
--- a/packages/app-contracts/src/Deploy.tsx
+++ b/packages/app-contracts/src/Deploy.tsx
@@ -2,6 +2,8 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId } from '@polkadot/types/interfaces';
+import { TypeDef } from '@polkadot/types/types';
 import { ApiProps } from '@polkadot/ui-api/types';
 import { SubmittableResult } from '@polkadot/api/SubmittableExtrinsic';
 import { I18nProps } from '@polkadot/ui-app/types';
@@ -14,7 +16,7 @@ import { Abi } from '@polkadot/api-contract';
 import { withApi, withMulti } from '@polkadot/ui-api';
 import keyring from '@polkadot/ui-keyring';
 import { Button, Dropdown, InputBalance, TxButton } from '@polkadot/ui-app';
-import { AccountId, TypeDef, getTypeDef } from '@polkadot/types';
+import { getTypeDef } from '@polkadot/types';
 import createValues from '@polkadot/ui-params/values';
 
 import ContractModal, { ContractModalProps, ContractModalState } from './Modal';
diff --git a/packages/app-contracts/src/Params.tsx b/packages/app-contracts/src/Params.tsx
index 0885cc72a6..437443e91e 100644
--- a/packages/app-contracts/src/Params.tsx
+++ b/packages/app-contracts/src/Params.tsx
@@ -3,11 +3,12 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { ContractABIFnArg } from '@polkadot/api-contract/types';
+import { TypeDef } from '@polkadot/types/types';
 import { RawParams } from '@polkadot/ui-params/types';
 
 import React from 'react';
 import UIParams from '@polkadot/ui-params';
-import { getTypeDef, TypeDef } from '@polkadot/types';
+import { getTypeDef } from '@polkadot/types';
 
 interface Props {
   isDisabled?: boolean;
diff --git a/packages/app-contracts/src/store.ts b/packages/app-contracts/src/store.ts
index e82fe68fc9..7f783aa015 100644
--- a/packages/app-contracts/src/store.ts
+++ b/packages/app-contracts/src/store.ts
@@ -2,12 +2,13 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { Hash } from '@polkadot/types/interfaces';
 import { CodeJson, CodeStored } from './types';
 
 import EventEmitter from 'eventemitter3';
 import store from 'store';
 import { Abi } from '@polkadot/api-contract';
-import { Hash } from '@polkadot/types';
+import { createType } from '@polkadot/types';
 import { api } from '@polkadot/ui-api';
 
 const KEY_CODE = 'code:';
@@ -30,7 +31,7 @@ class Store extends EventEmitter {
   }
 
   public async saveCode (codeHash: string | Hash, partial: Partial<CodeJson>): Promise<void> {
-    const hex = (typeof codeHash === 'string' ? new Hash(codeHash) : codeHash).toHex();
+    const hex = (typeof codeHash === 'string' ? createType('Hash', codeHash) : codeHash).toHex();
 
     const existing = this.getCode(hex);
 
diff --git a/packages/app-council/src/Motions/Motion.tsx b/packages/app-council/src/Motions/Motion.tsx
index 049c0e52f9..436e40c6d4 100644
--- a/packages/app-council/src/Motions/Motion.tsx
+++ b/packages/app-council/src/Motions/Motion.tsx
@@ -2,11 +2,13 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { Proposal as ProposalType, Votes } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
-import { Option, Proposal as ProposalType, Votes } from '@polkadot/types';
 
 import BN from 'bn.js';
 import React from 'react';
+import { Option } from '@polkadot/types';
+
 import { ActionItem, InputAddress, Labelled, Voting } from '@polkadot/ui-app';
 import { withCalls, withMulti } from '@polkadot/ui-api';
 
diff --git a/packages/app-council/src/Motions/Propose.tsx b/packages/app-council/src/Motions/Propose.tsx
index fe1aab53eb..52e6773ec7 100644
--- a/packages/app-council/src/Motions/Propose.tsx
+++ b/packages/app-council/src/Motions/Propose.tsx
@@ -2,12 +2,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { Call, Proposal } from '@polkadot/types/interfaces';
 import { ApiProps } from '@polkadot/ui-api/types';
-import { Method, Proposal } from '@polkadot/types';
 
 import BN from 'bn.js';
 import React from 'react';
-
+import { createType } from '@polkadot/types';
 import { Button, Extrinsic, InputNumber } from '@polkadot/ui-app';
 import TxModal, { TxModalState, TxModalProps } from '@polkadot/ui-app/TxModal';
 import { withApi, withCalls, withMulti } from '@polkadot/ui-api';
@@ -19,7 +19,7 @@ interface Props extends TxModalProps, ApiProps {
 }
 
 interface State extends TxModalState {
-  method: Method | null;
+  method: Call | null;
   threshold: BN | null;
 }
 
@@ -54,7 +54,7 @@ class Propose extends TxModal<Props, State> {
 
     return [
       threshold,
-      ...(method ? [new Proposal(method)] : [])
+      ...(method ? [createType('Proposal', method)] : [])
     ];
   }
 
@@ -124,7 +124,7 @@ class Propose extends TxModal<Props, State> {
     this.setState({ threshold });
   }
 
-  private onChangeExtrinsic = (method: Method): void => {
+  private onChangeExtrinsic = (method: Call): void => {
     if (!method) {
       return;
     }
diff --git a/packages/app-council/src/Motions/index.tsx b/packages/app-council/src/Motions/index.tsx
index 810556e598..531e450cba 100644
--- a/packages/app-council/src/Motions/index.tsx
+++ b/packages/app-council/src/Motions/index.tsx
@@ -3,7 +3,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Hash } from '@polkadot/types';
+import { Hash } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
diff --git a/packages/app-council/src/Overview/Candidate.tsx b/packages/app-council/src/Overview/Candidate.tsx
index 0b5c57eb10..d6f98b5b0d 100644
--- a/packages/app-council/src/Overview/Candidate.tsx
+++ b/packages/app-council/src/Overview/Candidate.tsx
@@ -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 { AccountId } from '@polkadot/types';
+import { AccountId } from '@polkadot/types/interfaces';
 
 import React from 'react';
 import { AddressCard } from '@polkadot/ui-app';
diff --git a/packages/app-council/src/Overview/Member.tsx b/packages/app-council/src/Overview/Member.tsx
index 7d7100c0f9..46e00c5f1f 100644
--- a/packages/app-council/src/Overview/Member.tsx
+++ b/packages/app-council/src/Overview/Member.tsx
@@ -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 { BlockNumber } from '@polkadot/types';
+import { BlockNumber } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
diff --git a/packages/app-council/src/Overview/Vote.tsx b/packages/app-council/src/Overview/Vote.tsx
index 0d1783cad4..fdb635881d 100644
--- a/packages/app-council/src/Overview/Vote.tsx
+++ b/packages/app-council/src/Overview/Vote.tsx
@@ -2,8 +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 { VoteIndex } from '@polkadot/types';
-// import { SetIndex } from '@polkadot/types/srml/types';
+import { VoteIndex } from '@polkadot/types/interfaces';
 import { DerivedVoterPositions } from '@polkadot/api-derive/types';
 import { ApiProps } from '@polkadot/ui-api/types';
 import { ComponentProps } from './types';
@@ -11,6 +10,7 @@ import { ComponentProps } from './types';
 import BN from 'bn.js';
 import React from 'react';
 import styled from 'styled-components';
+import { createType } from '@polkadot/types';
 import { withApi, withCalls, withMulti } from '@polkadot/ui-api';
 import { AddressRow, Button, Icon, Toggle, TxButton } from '@polkadot/ui-app';
 import TxModal, { TxModalState, TxModalProps } from '@polkadot/ui-app/TxModal';
@@ -140,7 +140,7 @@ class Vote extends TxModal<Props, State> {
 
     return [
       approvals ? approvals.slice(0, 1 + approvals.lastIndexOf(true)) : [],
-      new VoteIndex(voteCount),
+      createType('VoteIndex', voteCount),
       voterPositions && accountId && voterPositions[accountId]
         ? voterPositions[accountId].setIndex
         : nextVoterSet
diff --git a/packages/app-council/src/Overview/index.tsx b/packages/app-council/src/Overview/index.tsx
index 610e45a7a2..0d2b5c5e63 100644
--- a/packages/app-council/src/Overview/index.tsx
+++ b/packages/app-council/src/Overview/index.tsx
@@ -2,14 +2,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { createType, BlockNumber, VoteIndex } from '@polkadot/types';
-import { SetIndex } from '@polkadot/types/srml/elections/types';
 import { DerivedElectionsInfo } from '@polkadot/api-derive/types';
 import { ComponentProps as Props } from './types';
 
 import BN from 'bn.js';
 import React from 'react';
-
+import { createType } from '@polkadot/types';
 import { withCalls } from '@polkadot/ui-api';
 import { Button } from '@polkadot/ui-app';
 
@@ -23,10 +21,10 @@ const NULL_INFO: DerivedElectionsInfo = {
   candidates: [],
   candidateCount: new BN(0),
   desiredSeats: new BN(0),
-  nextVoterSet: createType<SetIndex>('SetIndex', 0),
-  termDuration: new BlockNumber(0),
-  voteCount: new VoteIndex(0),
-  voterCount: createType<SetIndex>('SetIndex', 0)
+  nextVoterSet: createType('SetIndex'),
+  termDuration: createType('BlockNumber'),
+  voteCount: createType('VoteIndex'),
+  voterCount: createType('SetIndex')
 };
 
 class Overview extends React.PureComponent<Props> {
diff --git a/packages/app-council/src/Overview/types.ts b/packages/app-council/src/Overview/types.ts
index f2bccd0086..8e1d3534df 100644
--- a/packages/app-council/src/Overview/types.ts
+++ b/packages/app-council/src/Overview/types.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 { SetIndex } from '@polkadot/types/srml/types';
+import { SetIndex } from '@polkadot/types/interfaces';
 import { DerivedElectionsInfo } from '@polkadot/api-derive/types';
 
 import BN from 'bn.js';
diff --git a/packages/app-democracy/src/Overview/Proposal.tsx b/packages/app-democracy/src/Overview/Proposal.tsx
index a74d51e7a2..d2e411eb4d 100644
--- a/packages/app-democracy/src/Overview/Proposal.tsx
+++ b/packages/app-democracy/src/Overview/Proposal.tsx
@@ -3,11 +3,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId, Balance, Proposal } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { AccountId, Balance, Option, Proposal, Tuple, Vector } from '@polkadot/types';
+import { Option, Tuple, Vec } from '@polkadot/types';
 import { ActionItem, InputAddress, Labelled, Static } from '@polkadot/ui-app';
 import { withCalls, withMulti } from '@polkadot/ui-api';
 import { formatBalance } from '@polkadot/util';
@@ -16,7 +17,7 @@ import translate from '../translate';
 import Seconding from './Seconding';
 
 interface Props extends I18nProps {
-  democracy_depositOf?: [Balance, Vector<AccountId>] | null;
+  democracy_depositOf?: [Balance, Vec<AccountId>] | null;
   idNumber: BN;
   value: Proposal;
 }
diff --git a/packages/app-democracy/src/Overview/Proposals.tsx b/packages/app-democracy/src/Overview/Proposals.tsx
index 0443fc632d..2c85f393d2 100644
--- a/packages/app-democracy/src/Overview/Proposals.tsx
+++ b/packages/app-democracy/src/Overview/Proposals.tsx
@@ -3,11 +3,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { Proposal } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { Proposal } from '@polkadot/types';
 import { withCalls, withMulti } from '@polkadot/ui-api';
 import { Column } from '@polkadot/ui-app';
 
diff --git a/packages/app-democracy/src/Overview/Seconding.tsx b/packages/app-democracy/src/Overview/Seconding.tsx
index d843f3e6ca..5f0a19f152 100644
--- a/packages/app-democracy/src/Overview/Seconding.tsx
+++ b/packages/app-democracy/src/Overview/Seconding.tsx
@@ -2,12 +2,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
 import { SubjectInfo } from '@polkadot/ui-keyring/observable/types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { AccountId } from '@polkadot/types';
 import { Button, InputAddress, Modal, TxButton } from '@polkadot/ui-app';
 import accountObservable from '@polkadot/ui-keyring/observable/accounts';
 import { withMulti, withObservable } from '@polkadot/ui-api';
diff --git a/packages/app-democracy/src/Propose.tsx b/packages/app-democracy/src/Propose.tsx
index e6a014a72c..73febb0a7e 100644
--- a/packages/app-democracy/src/Propose.tsx
+++ b/packages/app-democracy/src/Propose.tsx
@@ -2,6 +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 { Call } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
 import { ApiProps } from '@polkadot/ui-api/types';
 
@@ -9,8 +10,7 @@ import BN from 'bn.js';
 import React from 'react';
 import { RouteComponentProps } from 'react-router';
 import { withRouter } from 'react-router-dom';
-import { Method, Proposal } from '@polkadot/types';
-
+import { createType } from '@polkadot/types';
 import { Button, Extrinsic, InputAddress, InputBalance, TxButton, TxComponent } from '@polkadot/ui-app';
 import { withApi, withMulti } from '@polkadot/ui-api';
 
@@ -22,7 +22,7 @@ type Props = I18nProps & ApiProps & RouteComponentProps & {
 
 interface State {
   accountId?: string;
-  method: Method | null;
+  method: Call | null;
   value: BN;
   isValid: boolean;
 }
@@ -69,7 +69,7 @@ class Propose extends TxComponent<Props, State> {
             tx='democracy.propose'
             isDisabled={!isValid}
             params={[
-              ...(method ? [new Proposal(method)] : []),
+              ...(method ? [createType('Proposal', method)] : []),
               ...(hasValue ? [value] : [])
             ]}
             onSuccess={this.onSubmitProposal}
@@ -100,7 +100,7 @@ class Propose extends TxComponent<Props, State> {
     this.nextState({ accountId });
   }
 
-  private onChangeExtrinsic = (method: Method): void => {
+  private onChangeExtrinsic = (method: Call): void => {
     if (!method) {
       return;
     }
diff --git a/packages/app-explorer/src/BestHash.tsx b/packages/app-explorer/src/BestHash.tsx
index b431ab3505..99a7f22a2c 100644
--- a/packages/app-explorer/src/BestHash.tsx
+++ b/packages/app-explorer/src/BestHash.tsx
@@ -3,10 +3,10 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { Header } from '@polkadot/types/interfaces';
 import { BareProps, CallProps } from '@polkadot/ui-api/types';
 
 import React from 'react';
-import { Header } from '@polkadot/types';
 import { withCalls } from '@polkadot/ui-api';
 
 type Props = BareProps & CallProps & {
diff --git a/packages/app-explorer/src/BlockHeader/index.tsx b/packages/app-explorer/src/BlockHeader/index.tsx
index f873e09c92..fd419a364b 100644
--- a/packages/app-explorer/src/BlockHeader/index.tsx
+++ b/packages/app-explorer/src/BlockHeader/index.tsx
@@ -27,9 +27,8 @@ export default class BlockHeader extends React.PureComponent<Props> {
       return null;
     }
 
-    const { author, blockNumber, hash } = value;
-    const hashHex = hash.toHex();
-    const textNumber = formatNumber(blockNumber);
+    const hashHex = value.hash.toHex();
+    const textNumber = formatNumber(value.number);
 
     return (
       <article className='explorer--BlockHeader'>
@@ -42,8 +41,8 @@ export default class BlockHeader extends React.PureComponent<Props> {
             }&nbsp;</div>
             <div className='hash'>{hashHex}</div>
             <div className='author ui--media-small'>{
-              author
-                ? <AddressMini value={author} />
+              value.author
+                ? <AddressMini value={value.author} />
                 : undefined
             }</div>
           </div>
@@ -62,7 +61,7 @@ export default class BlockHeader extends React.PureComponent<Props> {
     );
   }
 
-  private renderDetails ({ blockNumber, extrinsicsRoot, parentHash, stateRoot }: HeaderExtended): React.ReactNode {
+  private renderDetails ({ number: blockNumber, extrinsicsRoot, parentHash, stateRoot }: HeaderExtended): React.ReactNode {
     const parentHex = parentHash.toHex();
 
     return (
@@ -70,7 +69,7 @@ export default class BlockHeader extends React.PureComponent<Props> {
         <div className='info'>
           <label>parentHash</label>
           <span className='hash'>{
-            blockNumber.gtn(1)
+            blockNumber.unwrap().gtn(1)
               ? <Link to={`/explorer/query/${parentHex}`}>{parentHex}</Link>
               : parentHex
           }</span>
diff --git a/packages/app-explorer/src/BlockHeaders.tsx b/packages/app-explorer/src/BlockHeaders.tsx
index 2addb9894b..0410a682c3 100644
--- a/packages/app-explorer/src/BlockHeaders.tsx
+++ b/packages/app-explorer/src/BlockHeaders.tsx
@@ -21,7 +21,7 @@ const transform = (header: HeaderExtended): HeaderExtended[] => {
 
   blockHeaders = blockHeaders
     .filter((old, index): boolean =>
-      index < MAX_ITEMS && old.blockNumber.lt(header.blockNumber)
+      index < MAX_ITEMS && old.number.unwrap().lt(header.number.unwrap())
     )
     .reduce((next, header): HeaderExtended[] => {
       next.push(header);
@@ -29,7 +29,7 @@ const transform = (header: HeaderExtended): HeaderExtended[] => {
       return next;
     }, [header])
     .sort((a, b): number =>
-      b.blockNumber.cmp(a.blockNumber)
+      b.number.unwrap().cmp(a.number.unwrap())
     );
 
   return blockHeaders;
@@ -46,9 +46,9 @@ class BlockHeaders extends React.PureComponent<Props> {
     return headers.map((header, index): React.ReactNode => (
       <BlockHeader
         isSummary={!!index}
-        key={header.blockNumber.toString()}
+        key={header.number.toString()}
         value={header}
-        withLink={!header.blockNumber.isZero()}
+        withLink={!header.number.isEmpty}
       />
     ));
   }
diff --git a/packages/app-explorer/src/BlockInfo/ByHash.tsx b/packages/app-explorer/src/BlockInfo/ByHash.tsx
index 0d812dfc00..d4eabbc0e0 100644
--- a/packages/app-explorer/src/BlockInfo/ByHash.tsx
+++ b/packages/app-explorer/src/BlockInfo/ByHash.tsx
@@ -3,12 +3,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { EventRecord, SignedBlock } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
 import { ApiProps } from '@polkadot/ui-api/types';
 
 import React from 'react';
 import { HeaderExtended } from '@polkadot/api-derive';
-import { EventRecord, SignedBlock } from '@polkadot/types';
 import { withCalls } from '@polkadot/ui-api';
 import { Columar } from '@polkadot/ui-app';
 
@@ -43,7 +43,7 @@ class BlockByHash extends React.PureComponent<Props> {
         </header>
         <Columar>
           <Extrinsics
-            blockNumber={chain_getHeader.blockNumber}
+            blockNumber={chain_getHeader.number.unwrap()}
             value={chain_getBlock.block.extrinsics}
           />
           <Events value={system_events} />
diff --git a/packages/app-explorer/src/BlockInfo/ByNumber.tsx b/packages/app-explorer/src/BlockInfo/ByNumber.tsx
index 77e7571184..f8a6c292c6 100644
--- a/packages/app-explorer/src/BlockInfo/ByNumber.tsx
+++ b/packages/app-explorer/src/BlockInfo/ByNumber.tsx
@@ -3,10 +3,10 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { Hash } from '@polkadot/types/interfaces';
 import { ApiProps } from '@polkadot/ui-api/types';
 
 import React from 'react';
-import { Hash } from '@polkadot/types';
 import { withCalls } from '@polkadot/ui-api';
 
 import BlockByHash from './ByHash';
diff --git a/packages/app-explorer/src/BlockInfo/Events.tsx b/packages/app-explorer/src/BlockInfo/Events.tsx
index d32aff0413..aaf0a4f039 100644
--- a/packages/app-explorer/src/BlockInfo/Events.tsx
+++ b/packages/app-explorer/src/BlockInfo/Events.tsx
@@ -2,10 +2,10 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { EventRecord } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
-import { EventRecord } from '@polkadot/types';
 import { Column } from '@polkadot/ui-app';
 
 import EventsDisplay from '../Events';
diff --git a/packages/app-explorer/src/BlockInfo/Extrinsics.tsx b/packages/app-explorer/src/BlockInfo/Extrinsics.tsx
index 2db2dde338..0bcdf8b21b 100644
--- a/packages/app-explorer/src/BlockInfo/Extrinsics.tsx
+++ b/packages/app-explorer/src/BlockInfo/Extrinsics.tsx
@@ -2,13 +2,14 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { BlockNumber, Extrinsic } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
 import styled from 'styled-components';
+import { GenericCall } from '@polkadot/types';
 import { AddressMini, Call, Column, LinkPolkascan } from '@polkadot/ui-app';
 import { formatNumber } from '@polkadot/util';
-import { BlockNumber, Extrinsic, Method } from '@polkadot/types';
 
 import translate from '../translate';
 
@@ -42,7 +43,7 @@ class Extrinsics extends React.PureComponent<Props> {
   // FIXME This is _very_ similar to what we have in democracy/Item
   private renderExtrinsic = (extrinsic: Extrinsic, index: number): React.ReactNode => {
     const { blockNumber, t } = this.props;
-    const { meta, method, section } = Method.findFunction(extrinsic.callIndex);
+    const { meta, method, section } = GenericCall.findFunction(extrinsic.callIndex);
     const isMortal = extrinsic.era.isMortalEra;
     let eraEnd;
     let eraStart;
diff --git a/packages/app-explorer/src/BlockInfo/Logs.tsx b/packages/app-explorer/src/BlockInfo/Logs.tsx
index 275917e83d..3f564f5d0b 100644
--- a/packages/app-explorer/src/BlockInfo/Logs.tsx
+++ b/packages/app-explorer/src/BlockInfo/Logs.tsx
@@ -2,11 +2,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Codec } from '@polkadot/types/types';
+import { DigestItem } from '@polkadot/types/interfaces';
+import { Codec, TypeDef } from '@polkadot/types/types';
 import { I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
-import { DigestItem, Struct, Tuple, TypeDef, U8a, Vector, getTypeDef } from '@polkadot/types';
+import { Struct, Tuple, U8a, Vec, getTypeDef } from '@polkadot/types';
 import { Column } from '@polkadot/ui-app';
 import Params from '@polkadot/ui-params';
 
@@ -39,7 +40,7 @@ class Logs extends React.PureComponent<Props> {
       content = this.formatStruct(item.value);
     } else if (item.value instanceof Tuple) {
       content = this.formatTuple(item.value);
-    } else if (item.value instanceof Vector) {
+    } else if (item.value instanceof Vec) {
       content = this.formatVector(item.value);
     } else if (item.value instanceof U8a) {
       content = this.formatU8a(item.value);
@@ -114,7 +115,7 @@ class Logs extends React.PureComponent<Props> {
     );
   }
 
-  private formatVector (vector: Vector<any>): React.ReactNode {
+  private formatVector (vector: Vec<any>): React.ReactNode {
     const type = getTypeDef(vector.Type);
     const values = vector.toArray().map((value): { isValid: boolean; value: Codec } => ({
       isValid: true,
diff --git a/packages/app-explorer/src/BlockInfo/index.tsx b/packages/app-explorer/src/BlockInfo/index.tsx
index 52f0b4045d..76200366f1 100644
--- a/packages/app-explorer/src/BlockInfo/index.tsx
+++ b/packages/app-explorer/src/BlockInfo/index.tsx
@@ -3,12 +3,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { BlockNumber } from '@polkadot/types/interfaces';
 import { BareProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
 import { withCalls, withMulti } from '@polkadot/ui-api';
 import { isHex } from '@polkadot/util';
-import { BlockNumber } from '@polkadot/types';
 
 import Query from '../Query';
 import BlockByHash from './ByHash';
diff --git a/packages/app-explorer/src/NodeInfo/Peers.tsx b/packages/app-explorer/src/NodeInfo/Peers.tsx
index a6b546a374..7d9ecac70e 100644
--- a/packages/app-explorer/src/NodeInfo/Peers.tsx
+++ b/packages/app-explorer/src/NodeInfo/Peers.tsx
@@ -2,10 +2,10 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { PeerInfo } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
-import { PeerInfo } from '@polkadot/types';
 import { formatNumber } from '@polkadot/util';
 
 import translate from './translate';
diff --git a/packages/app-explorer/src/NodeInfo/index.tsx b/packages/app-explorer/src/NodeInfo/index.tsx
index d4bbdbb1c3..685709af21 100644
--- a/packages/app-explorer/src/NodeInfo/index.tsx
+++ b/packages/app-explorer/src/NodeInfo/index.tsx
@@ -2,13 +2,14 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { Health, PeerInfo, Extrinsic } from '@polkadot/types/interfaces';
 import { ApiProps } from '@polkadot/ui-api/types';
 import { AppProps, I18nProps } from '@polkadot/ui-app/types';
 import { Info } from './types';
 
 import React from 'react';
 import { withApi, withMulti } from '@polkadot/ui-api';
-import { Health, PeerInfo, PendingExtrinsics, Vector } from '@polkadot/types';
+import { Vec } from '@polkadot/types';
 
 import './index.css';
 
@@ -89,8 +90,8 @@ class App extends React.PureComponent<Props, State> {
       const [blockNumber, health, peers, extrinsics] = await Promise.all([
         api.derive.chain.bestNumber(),
         api.rpc.system.health<Health>(),
-        api.rpc.system.peers<Vector<PeerInfo>>(),
-        api.rpc.author.pendingExtrinsics<PendingExtrinsics>()
+        api.rpc.system.peers<Vec<PeerInfo>>(),
+        api.rpc.author.pendingExtrinsics<Vec<Extrinsic>>()
       ]);
 
       this.setInfo({ blockNumber, extrinsics, health, peers });
diff --git a/packages/app-explorer/src/NodeInfo/types.ts b/packages/app-explorer/src/NodeInfo/types.ts
index 306e394d57..11017acb33 100644
--- a/packages/app-explorer/src/NodeInfo/types.ts
+++ b/packages/app-explorer/src/NodeInfo/types.ts
@@ -2,11 +2,13 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { BlockNumber, Health, PeerInfo, PendingExtrinsics } from '@polkadot/types';
+import { BlockNumber, Extrinsic, Health, PeerInfo } from '@polkadot/types/interfaces';
+
+import { Vec } from '@polkadot/types';
 
 export interface Info {
   blockNumber?: BlockNumber;
   health?: Health | null;
   peers?: PeerInfo[] | null;
-  extrinsics?: PendingExtrinsics | null;
+  extrinsics?: Vec<Extrinsic> | null;
 }
diff --git a/packages/app-explorer/src/index.tsx b/packages/app-explorer/src/index.tsx
index 9e556aa4d0..d38ac856ea 100644
--- a/packages/app-explorer/src/index.tsx
+++ b/packages/app-explorer/src/index.tsx
@@ -3,6 +3,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { EventRecord } from '@polkadot/types/interfaces';
 import { AppProps, BareProps, I18nProps } from '@polkadot/ui-app/types';
 import { KeyedEvent } from './types';
 
@@ -11,7 +12,6 @@ import './index.css';
 import React from 'react';
 import { Route, Switch } from 'react-router';
 import styled from 'styled-components';
-import { EventRecord } from '@polkadot/types';
 import { withCalls, withMulti } from '@polkadot/ui-api';
 import Tabs, { TabItem } from '@polkadot/ui-app/Tabs';
 import uiSettings from '@polkadot/ui-settings';
diff --git a/packages/app-explorer/src/types.ts b/packages/app-explorer/src/types.ts
index 9b2e627b4e..ca9251ce89 100644
--- a/packages/app-explorer/src/types.ts
+++ b/packages/app-explorer/src/types.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 { EventRecord } from '@polkadot/types';
+import { EventRecord } from '@polkadot/types/interfaces';
 
 export interface KeyedEvent {
   key: string;
diff --git a/packages/app-extrinsics/src/Selection.tsx b/packages/app-extrinsics/src/Selection.tsx
index 19b239155c..784bd597bc 100644
--- a/packages/app-extrinsics/src/Selection.tsx
+++ b/packages/app-extrinsics/src/Selection.tsx
@@ -2,14 +2,14 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import BN from 'bn.js';
+import { Call } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
 import { QueueTxExtrinsicAdd } from '@polkadot/ui-app/Status/types';
 import { ApiProps } from '@polkadot/ui-api/types';
 import { SubmittableExtrinsic } from '@polkadot/api/promise/types';
 
+import BN from 'bn.js';
 import React from 'react';
-import { Method } from '@polkadot/types';
 import { Button, Extrinsic, InputAddress, Labelled, TxButton, TxComponent } from '@polkadot/ui-app';
 import { withApi, withMulti } from '@polkadot/ui-api';
 import { Nonce } from '@polkadot/ui-reactive';
@@ -24,7 +24,7 @@ type Props = ApiProps & I18nProps & {
 interface State {
   isValid: boolean;
   isValidUnsigned: boolean;
-  method: Method | null;
+  method: Call | null;
   accountNonce?: BN;
   accountId?: string;
 }
@@ -116,7 +116,7 @@ class Selection extends TxComponent<Props, State> {
     );
   }
 
-  private onChangeExtrinsic = (method: Method | null = null): void => {
+  private onChangeExtrinsic = (method: Call | null = null): void => {
     this.nextState({ method });
   }
 
@@ -136,7 +136,7 @@ class Selection extends TxComponent<Props, State> {
       return null;
     }
 
-    const fn = Method.findFunction(method.callIndex);
+    const fn = api.findCall(method.callIndex);
 
     return api.tx[fn.section][fn.method](...method.args);
   }
diff --git a/packages/app-staking/src/Actions/Account/InputValidationController.tsx b/packages/app-staking/src/Actions/Account/InputValidationController.tsx
index c0a7beab9d..0923c8aa1f 100644
--- a/packages/app-staking/src/Actions/Account/InputValidationController.tsx
+++ b/packages/app-staking/src/Actions/Account/InputValidationController.tsx
@@ -2,11 +2,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId, StakingLedger } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
 import { Icon } from '@polkadot/ui-app';
-import { AccountId, Option, StakingLedger } from '@polkadot/types';
+import { Option } from '@polkadot/types';
 import { withCalls } from '@polkadot/ui-api';
 
 import translate from '../../translate';
diff --git a/packages/app-staking/src/Actions/Account/Unbond.tsx b/packages/app-staking/src/Actions/Account/Unbond.tsx
index c8ea1e3776..06ec2fdeea 100644
--- a/packages/app-staking/src/Actions/Account/Unbond.tsx
+++ b/packages/app-staking/src/Actions/Account/Unbond.tsx
@@ -3,13 +3,14 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId, StakingLedger } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
 import { ApiProps } from '@polkadot/ui-api/types';
 
 import BN from 'bn.js';
 import React from 'react';
 import styled from 'styled-components';
-import { AccountId, Option, StakingLedger } from '@polkadot/types';
+import { Option } from '@polkadot/types';
 import { AddressInfo, Button, InputAddress, InputBalance, Modal, TxButton, TxComponent } from '@polkadot/ui-app';
 import { withCalls, withApi, withMulti } from '@polkadot/ui-api';
 
@@ -147,10 +148,10 @@ class Unbond extends TxComponent<Props, State> {
       return;
     }
 
-    const { active: maxBalance } = staking_ledger.unwrap();
+    const { active } = staking_ledger.unwrap();
 
     this.nextState({
-      maxBalance
+      maxBalance: active.unwrap()
     });
   }
 
diff --git a/packages/app-staking/src/Actions/Account/Validate.tsx b/packages/app-staking/src/Actions/Account/Validate.tsx
index 29a07aea8a..d83d8545aa 100644
--- a/packages/app-staking/src/Actions/Account/Validate.tsx
+++ b/packages/app-staking/src/Actions/Account/Validate.tsx
@@ -2,11 +2,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { ValidatorPrefs } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { ValidatorPrefs } from '@polkadot/types';
 import { Button, InputAddress, InputBalance, InputNumber, Modal, TxButton, TxComponent } from '@polkadot/ui-app';
 
 import InputValidationUnstakeThreshold from './InputValidationUnstakeThreshold';
diff --git a/packages/app-staking/src/Actions/Account/index.tsx b/packages/app-staking/src/Actions/Account/index.tsx
index 7a85fd8041..5a02c4232c 100644
--- a/packages/app-staking/src/Actions/Account/index.tsx
+++ b/packages/app-staking/src/Actions/Account/index.tsx
@@ -4,7 +4,7 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { RecentlyOfflineMap } from '../../types';
-import { AccountId, Exposure, StakingLedger, ValidatorPrefs } from '@polkadot/types';
+import { AccountId, Exposure, StakingLedger, ValidatorPrefs } from '@polkadot/types/interfaces';
 import { ApiProps } from '@polkadot/ui-api/types';
 import { DerivedBalances, DerivedStaking } from '@polkadot/api-derive/types';
 import { I18nProps } from '@polkadot/ui-app/types';
diff --git a/packages/app-staking/src/Overview/Address.tsx b/packages/app-staking/src/Overview/Address.tsx
index 524b29a460..357a3aa70f 100644
--- a/packages/app-staking/src/Overview/Address.tsx
+++ b/packages/app-staking/src/Overview/Address.tsx
@@ -3,13 +3,13 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId, Balance, Exposure } from '@polkadot/types/interfaces';
 import { DerivedBalancesMap, DerivedStaking } from '@polkadot/api-derive/types';
 import { I18nProps } from '@polkadot/ui-app/types';
 import { ValidatorFilter, RecentlyOfflineMap } from '../types';
 
 import React from 'react';
 import styled from 'styled-components';
-import { AccountId, Balance, Exposure } from '@polkadot/types';
 import { withCalls, withMulti } from '@polkadot/ui-api/with';
 import { AddressCard, AddressMini, RecentlyOffline } from '@polkadot/ui-app';
 import keyring from '@polkadot/ui-keyring';
@@ -79,8 +79,8 @@ class Address extends React.PureComponent<Props, State> {
   public render (): React.ReactNode {
     const { className, defaultName, filter } = this.props;
     const { controllerId, stakers, stashId } = this.state;
-    const bonded = stakers && !stakers.own.isZero()
-      ? [stakers.own, stakers.total.sub(stakers.own)]
+    const bonded = stakers && !stakers.own.isEmpty
+      ? [stakers.own.unwrap(), stakers.total.unwrap().sub(stakers.own.unwrap())]
       : true;
 
     if ((filter === 'hasNominators' && !this.hasNominators()) ||
@@ -148,7 +148,7 @@ class Address extends React.PureComponent<Props, State> {
     const { stakers } = this.state;
 
     return stakers
-      ? stakers.others.map(({ who, value }): [AccountId, Balance] => [who, value])
+      ? stakers.others.map(({ who, value }): [AccountId, Balance] => [who, value.unwrap()])
       : [];
   }
 
diff --git a/packages/app-staking/src/Overview/index.tsx b/packages/app-staking/src/Overview/index.tsx
index d6175b6718..c2d80e8449 100644
--- a/packages/app-staking/src/Overview/index.tsx
+++ b/packages/app-staking/src/Overview/index.tsx
@@ -41,7 +41,7 @@ class Overview extends React.PureComponent<Props> {
     let lastAuthor: string | undefined;
 
     if (chain_subscribeNewHead) {
-      lastBlock = formatNumber(chain_subscribeNewHead.blockNumber);
+      lastBlock = formatNumber(chain_subscribeNewHead.number);
       lastAuthor = (chain_subscribeNewHead.author || '').toString();
     }
 
diff --git a/packages/app-staking/src/index.tsx b/packages/app-staking/src/index.tsx
index 141a0afde9..0b134772c2 100644
--- a/packages/app-staking/src/index.tsx
+++ b/packages/app-staking/src/index.tsx
@@ -3,6 +3,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId } from '@polkadot/types/interfaces';
 import { AppProps, I18nProps } from '@polkadot/ui-app/types';
 import { ApiProps } from '@polkadot/ui-api/types';
 import { SubjectInfo } from '@polkadot/ui-keyring/observable/types';
@@ -10,7 +11,7 @@ import { ComponentProps, RecentlyOffline, RecentlyOfflineMap } from './types';
 
 import React from 'react';
 import { Route, Switch } from 'react-router';
-import { AccountId, Option } from '@polkadot/types';
+import { Option } from '@polkadot/types';
 import { HelpOverlay } from '@polkadot/ui-app';
 import Tabs, { TabItem } from '@polkadot/ui-app/Tabs';
 import { withCalls, withMulti, withObservable } from '@polkadot/ui-api';
diff --git a/packages/app-staking/src/types.ts b/packages/app-staking/src/types.ts
index 9a43998d97..7d25d60fb1 100644
--- a/packages/app-staking/src/types.ts
+++ b/packages/app-staking/src/types.ts
@@ -2,11 +2,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { AccountId, BlockNumber } from '@polkadot/types';
-import BN from 'bn.js';
+import { AccountId, BlockNumber } from '@polkadot/types/interfaces';
 import { DerivedFees, DerivedBalances } from '@polkadot/api-derive/types';
 import { SubjectInfo } from '@polkadot/ui-keyring/observable/types';
 
+import BN from 'bn.js';
+
 export type Nominators = Record<string, string[]>;
 
 export interface ComponentProps {
diff --git a/packages/app-storage/src/Selection/Modules.tsx b/packages/app-storage/src/Selection/Modules.tsx
index f0437df3c2..c3caf51e8a 100644
--- a/packages/app-storage/src/Selection/Modules.tsx
+++ b/packages/app-storage/src/Selection/Modules.tsx
@@ -3,13 +3,14 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { StorageEntryPromise } from '@polkadot/api/types';
-import { TypeDef, getTypeDef } from '@polkadot/types';
+import { TypeDef } from '@polkadot/types/types';
 import { I18nProps } from '@polkadot/ui-app/types';
 import { RawParams } from '@polkadot/ui-params/types';
 import { ApiProps } from '@polkadot/ui-api/types';
 import { ComponentProps } from '../types';
 
 import React from 'react';
+import { getTypeDef } from '@polkadot/types';
 import { Button, InputStorage, TxComponent } from '@polkadot/ui-app';
 import Params from '@polkadot/ui-params';
 import { withApi, withMulti } from '@polkadot/ui-api';
diff --git a/packages/app-sudo/src/Sudo.tsx b/packages/app-sudo/src/Sudo.tsx
index 4515985616..9796a3215e 100644
--- a/packages/app-sudo/src/Sudo.tsx
+++ b/packages/app-sudo/src/Sudo.tsx
@@ -2,12 +2,13 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { Call } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
 import { ApiProps } from '@polkadot/ui-api/types';
 import { ComponentProps } from './types';
 
 import React from 'react';
-import { Method, Proposal } from '@polkadot/types';
+import { createType } from '@polkadot/types';
 import { Button, Icon, Extrinsic, TxButton, TxComponent } from '@polkadot/ui-app';
 import { withApi, withMulti } from '@polkadot/ui-api';
 
@@ -18,7 +19,7 @@ type Props = I18nProps & ApiProps & ComponentProps & {
 };
 
 interface State {
-  method: Method | null;
+  method: Call | null;
   isValid: boolean;
 }
 
@@ -48,7 +49,7 @@ class Propose extends TxComponent<Props, State> {
               label={t('Submit')}
               tx='sudo.sudo'
               isDisabled={!method || !isValid}
-              params={method ? [new Proposal(method)] : []}
+              params={method ? [createType('Proposal', method)] : []}
               ref={this.button}
             />
           </Button.Group>
@@ -78,7 +79,7 @@ class Propose extends TxComponent<Props, State> {
     );
   }
 
-  private onChangeExtrinsic = (method: Method): void => {
+  private onChangeExtrinsic = (method: Call): void => {
     if (!method) {
       return;
     }
diff --git a/packages/app-toolbox/src/Rpc/Selection.tsx b/packages/app-toolbox/src/Rpc/Selection.tsx
index 5c522362a2..2a00ec527d 100644
--- a/packages/app-toolbox/src/Rpc/Selection.tsx
+++ b/packages/app-toolbox/src/Rpc/Selection.tsx
@@ -3,13 +3,14 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { RpcMethod } from '@polkadot/jsonrpc/types';
+import { TypeDef } from '@polkadot/types/types';
 import { RawParam } from '@polkadot/ui-params/types';
 import { I18nProps } from '@polkadot/ui-app/types';
 import { QueueTxRpcAdd } from '@polkadot/ui-app/Status/types';
 
 import React from 'react';
 import rpc from '@polkadot/jsonrpc';
-import { TypeDef, getTypeDef } from '@polkadot/types';
+import { getTypeDef } from '@polkadot/types';
 import { Button, InputRpc, TxComponent } from '@polkadot/ui-app';
 import Params from '@polkadot/ui-params';
 
diff --git a/packages/app-treasury/src/Overview/Approve.tsx b/packages/app-treasury/src/Overview/Approve.tsx
index 3c6d527ae8..d654185a3d 100644
--- a/packages/app-treasury/src/Overview/Approve.tsx
+++ b/packages/app-treasury/src/Overview/Approve.tsx
@@ -2,9 +2,9 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId, BlockNumber } from '@polkadot/types/interfaces';
 import { ApiProps } from '@polkadot/ui-api/types';
 import { I18nProps } from '@polkadot/ui-app/types';
-import { AccountId, BlockNumber } from '@polkadot/types';
 
 import React from 'react';
 import { Button, Dropdown } from '@polkadot/ui-app';
diff --git a/packages/app-treasury/src/Overview/Proposal.tsx b/packages/app-treasury/src/Overview/Proposal.tsx
index 4cea12cc86..26740be9d3 100644
--- a/packages/app-treasury/src/Overview/Proposal.tsx
+++ b/packages/app-treasury/src/Overview/Proposal.tsx
@@ -2,12 +2,13 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { TreasuryProposal as TreasuryProposalType } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
 import { SubjectInfo } from '@polkadot/ui-keyring/observable/types';
 
 import React from 'react';
 import styled from 'styled-components';
-import { Option, TreasuryProposal as TreasuryProposalType } from '@polkadot/types';
+import { Option } from '@polkadot/types';
 import { ActionItem, Icon, TreasuryProposal } from '@polkadot/ui-app';
 import { withCalls, withMulti, withObservable } from '@polkadot/ui-api';
 import keyring from '@polkadot/ui-keyring';
diff --git a/packages/app-treasury/src/Overview/Proposals.tsx b/packages/app-treasury/src/Overview/Proposals.tsx
index f943b07c21..4ff68075fb 100644
--- a/packages/app-treasury/src/Overview/Proposals.tsx
+++ b/packages/app-treasury/src/Overview/Proposals.tsx
@@ -3,8 +3,8 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { ProposalIndex } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
-import { ProposalIndex } from '@polkadot/types';
 
 import BN from 'bn.js';
 import React from 'react';
diff --git a/packages/app-treasury/src/Settings.tsx b/packages/app-treasury/src/Settings.tsx
index 7dd287c5f9..3788204e09 100644
--- a/packages/app-treasury/src/Settings.tsx
+++ b/packages/app-treasury/src/Settings.tsx
@@ -2,9 +2,9 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { BlockNumber, BalanceOf, Permill } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
 import { ApiProps } from '@polkadot/ui-api/types';
-import { BlockNumber, BalanceOf, Permill } from '@polkadot/types';
 
 import BN from 'bn.js';
 import React from 'react';
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 569288a635..75c5330072 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@babel/runtime": "^7.5.5",
     "@polkadot/ui-app": "^0.34.0-beta.87",
-    "@polkadot/ui-assets": "^0.42.0-beta.16",
+    "@polkadot/ui-assets": "^0.42.0-beta.19",
     "@polkadot/ui-signer": "^0.34.0-beta.87",
     "query-string": "^6.8.1"
   }
diff --git a/packages/apps/src/Content/Status.tsx b/packages/apps/src/Content/Status.tsx
index 34324afbea..cb9e58f336 100644
--- a/packages/apps/src/Content/Status.tsx
+++ b/packages/apps/src/Content/Status.tsx
@@ -3,13 +3,13 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { EventRecord } from '@polkadot/types/interfaces';
 import { KeyringOptions } from '@polkadot/ui-keyring/options/types';
 import { QueueStatus, QueueTx, QueueAction$Add } from '@polkadot/ui-app/Status/types';
 import { I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
 import keyringOption from '@polkadot/ui-keyring/options';
-import { EventRecord } from '@polkadot/types';
 import { Status as StatusDisplay } from '@polkadot/ui-app';
 import { withCalls, withMulti, withObservable } from '@polkadot/ui-api';
 import { stringToU8a } from '@polkadot/util';
diff --git a/packages/apps/src/SideBar/Item.tsx b/packages/apps/src/SideBar/Item.tsx
index ece0dfa176..8f261f01a2 100644
--- a/packages/apps/src/SideBar/Item.tsx
+++ b/packages/apps/src/SideBar/Item.tsx
@@ -25,6 +25,8 @@ type Props = I18nProps & ApiProps & {
 };
 
 class Item extends React.PureComponent<Props> {
+  private _disabledLog: Map<string, string> = new Map();
+
   public render (): React.ReactNode {
     const { route: { Modal, i18n, icon, name }, t, isCollapsed, onClick } = this.props;
 
@@ -78,6 +80,14 @@ class Item extends React.PureComponent<Props> {
     );
   }
 
+  private logDisabled (route: string, message: string): void {
+    if (!this._disabledLog.get(route)) {
+      this._disabledLog.set(route, message);
+
+      console.warn(`Disabling ${route}: ${message}`);
+    }
+  }
+
   private hasApi (endpoint: string): boolean {
     const { api } = this.props;
     const [area, section, method] = endpoint.split('.');
@@ -104,7 +114,7 @@ class Item extends React.PureComponent<Props> {
       return false;
     } else if (needsSudo) {
       if (!hasSudo) {
-        console.info('Disabling route sudo, no authority');
+        this.logDisabled('sudo', 'Sudo key not available');
         return false;
       }
     }
@@ -118,7 +128,7 @@ class Item extends React.PureComponent<Props> {
     });
 
     if (notFound.length !== 0) {
-      console.info(`Disabling route ${name}, API ${notFound} not available`);
+      this.logDisabled(name, `API not available: ${notFound}`);
     }
 
     return notFound.length === 0;
diff --git a/packages/ui-api/package.json b/packages/ui-api/package.json
index 2a9fd3f677..4708867e6f 100644
--- a/packages/ui-api/package.json
+++ b/packages/ui-api/package.json
@@ -31,8 +31,8 @@
   "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme",
   "dependencies": {
     "@babel/runtime": "^7.5.5",
-    "@polkadot/api": "^0.82.0-beta.95",
-    "@polkadot/extension-dapp": "^0.5.0-beta.5",
+    "@polkadot/api": "^0.90.0-beta.1",
+    "@polkadot/extension-dapp": "^0.5.1",
     "rxjs-compat": "^6.4.0"
   }
 }
diff --git a/packages/ui-api/src/Api.tsx b/packages/ui-api/src/Api.tsx
index 488ffed38f..c5b763ffc2 100644
--- a/packages/ui-api/src/Api.tsx
+++ b/packages/ui-api/src/Api.tsx
@@ -3,6 +3,7 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { ProviderInterface } from '@polkadot/rpc-provider/types';
+import { ChainProperties } from '@polkadot/types/interfaces';
 import { QueueTxPayloadAdd, QueueTxMessageSetStatus } from '@polkadot/ui-app/Status/types';
 import { Prefix } from '@polkadot/util-crypto/address/types';
 import { ApiProps } from './types';
@@ -16,7 +17,7 @@ import { InputNumber } from '@polkadot/ui-app/InputNumber';
 import keyring from '@polkadot/ui-keyring';
 import uiSettings from '@polkadot/ui-settings';
 import ApiSigner from '@polkadot/ui-signer/ApiSigner';
-import { ChainProperties, Text } from '@polkadot/types';
+import { createType, Text } from '@polkadot/types';
 import { formatBalance, isTestChain } from '@polkadot/util';
 
 import ApiContext from './ApiContext';
@@ -107,13 +108,16 @@ export default class Api extends React.PureComponent<Props, State> {
   }
 
   private async loadOnReady (api: ApiPromise): Promise<void> {
-    const [properties = new ChainProperties(), value] = await Promise.all([
+    const [properties = createType('ChainProperties'), value] = await Promise.all([
       api.rpc.system.properties<ChainProperties>(),
       api.rpc.system.chain<Text>()
     ]);
-    const addressPrefix = uiSettings.prefix === -1
-      ? properties.get('networkId')
-      : uiSettings.prefix as Prefix;
+    const addressPrefix = (
+      uiSettings.prefix === -1
+        ? 42
+        : uiSettings.prefix
+    ) as Prefix;
+    const tokenSymbol = properties.tokenSymbol.toString() || 'Unit';
     const chain = value
       ? value.toString()
       : null;
@@ -132,10 +136,10 @@ export default class Api extends React.PureComponent<Props, State> {
 
     // first setup the UI helpers
     formatBalance.setDefaults({
-      decimals: properties.tokenDecimals,
-      unit: properties.tokenSymbol
+      decimals: properties.tokenDecimals.toNumber(),
+      unit: tokenSymbol
     });
-    InputNumber.setUnit(properties.tokenSymbol);
+    InputNumber.setUnit(tokenSymbol);
 
     // finally load the keyring
     keyring.loadAll({
diff --git a/packages/ui-app/package.json b/packages/ui-app/package.json
index 20fa26ec80..8a5c70d271 100644
--- a/packages/ui-app/package.json
+++ b/packages/ui-app/package.json
@@ -11,12 +11,12 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.5.5",
-    "@polkadot/keyring": "^0.95.0-beta.0",
+    "@polkadot/keyring": "^0.95.0-beta.2",
+    "@polkadot/react-identicon": "^0.42.0-beta.19",
     "@polkadot/ui-api": "^0.34.0-beta.87",
-    "@polkadot/ui-identicon": "^0.42.0-beta.16",
-    "@polkadot/ui-keyring": "^0.42.0-beta.16",
+    "@polkadot/ui-keyring": "^0.42.0-beta.19",
     "@polkadot/ui-reactive": "^0.34.0-beta.87",
-    "@polkadot/ui-settings": "^0.42.0-beta.16",
+    "@polkadot/ui-settings": "^0.42.0-beta.19",
     "@types/chart.js": "^2.7.55",
     "@types/i18next": "^12.1.0",
     "@types/react-copy-to-clipboard": "^4.2.6",
diff --git a/packages/ui-app/src/ActionItem.tsx b/packages/ui-app/src/ActionItem.tsx
index d1ace85f9e..574b04ba7b 100644
--- a/packages/ui-app/src/ActionItem.tsx
+++ b/packages/ui-app/src/ActionItem.tsx
@@ -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 { Proposal } from '@polkadot/types';
+import { Proposal } from '@polkadot/types/interfaces';
 
 import BN from 'bn.js';
 import React from 'react';
diff --git a/packages/ui-app/src/AddressInfo.tsx b/packages/ui-app/src/AddressInfo.tsx
index d7d6ef8ea0..933ede9bca 100644
--- a/packages/ui-app/src/AddressInfo.tsx
+++ b/packages/ui-app/src/AddressInfo.tsx
@@ -255,8 +255,9 @@ class AddressInfo extends React.PureComponent<Props> {
         {validatorPrefsDisplay.validatorPayment && staking_info.validatorPrefs.validatorPayment && (
           <>
             <Label label={t('commision')} />
-            <div className='result'>{formatBalance(staking_info.validatorPrefs.validatorPayment.toBn())}
-            </div>
+            <div className='result'>{
+              formatBalance(staking_info.validatorPrefs.validatorPayment)
+            }</div>
           </>
         )}
       </>
diff --git a/packages/ui-app/src/AddressMini.tsx b/packages/ui-app/src/AddressMini.tsx
index 4b06f83202..fae90c29b9 100644
--- a/packages/ui-app/src/AddressMini.tsx
+++ b/packages/ui-app/src/AddressMini.tsx
@@ -2,12 +2,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
 import { BareProps } from './types';
 
 import BN from 'bn.js';
 import React from 'react';
 import styled from 'styled-components';
-import { AccountId, AccountIndex, Address } from '@polkadot/types';
 import { KeyringItemType } from '@polkadot/ui-keyring/types';
 
 import { classes, getAddressName, toShortAddress } from './util';
diff --git a/packages/ui-app/src/AddressRow.tsx b/packages/ui-app/src/AddressRow.tsx
index 3596673f14..c9f58bd1c6 100644
--- a/packages/ui-app/src/AddressRow.tsx
+++ b/packages/ui-app/src/AddressRow.tsx
@@ -3,14 +3,14 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
-import { AccountId, AccountIndex, Address } from '@polkadot/types';
 
 import BN from 'bn.js';
 import React from 'react';
 import styled from 'styled-components';
 import { withCalls, withMulti } from '@polkadot/ui-api';
-import BaseIdentityIcon from '@polkadot/ui-identicon';
+import BaseIdentityIcon from '@polkadot/react-identicon';
 import keyring from '@polkadot/ui-keyring';
 
 import AddressInfo, { BalanceActiveType } from './AddressInfo';
diff --git a/packages/ui-app/src/Available.tsx b/packages/ui-app/src/Available.tsx
index d025227db1..73d6ec3295 100644
--- a/packages/ui-app/src/Available.tsx
+++ b/packages/ui-app/src/Available.tsx
@@ -2,10 +2,10 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
 import { BareProps } from './types';
 
 import React from 'react';
-import { AccountId, AccountIndex, Address } from '@polkadot/types';
 import { Available } from '@polkadot/ui-reactive';
 
 import { classes } from './util';
diff --git a/packages/ui-app/src/Balance.tsx b/packages/ui-app/src/Balance.tsx
index 0925c19393..f49235c88a 100644
--- a/packages/ui-app/src/Balance.tsx
+++ b/packages/ui-app/src/Balance.tsx
@@ -2,11 +2,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
 import { BareProps } from './types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { AccountId, AccountIndex, Address } from '@polkadot/types';
 import { formatBalance } from '@polkadot/util';
 import { Balance } from '@polkadot/ui-reactive';
 
diff --git a/packages/ui-app/src/Bonded.tsx b/packages/ui-app/src/Bonded.tsx
index 587e6f26b8..3df6b2158e 100644
--- a/packages/ui-app/src/Bonded.tsx
+++ b/packages/ui-app/src/Bonded.tsx
@@ -2,11 +2,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
 import { BareProps } from './types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { AccountId, AccountIndex, Address } from '@polkadot/types';
 import { formatBalance } from '@polkadot/util';
 import { Bonded } from '@polkadot/ui-reactive';
 
diff --git a/packages/ui-app/src/Call.tsx b/packages/ui-app/src/Call.tsx
index 3a447b834f..e3aa8537df 100644
--- a/packages/ui-app/src/Call.tsx
+++ b/packages/ui-app/src/Call.tsx
@@ -2,12 +2,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Codec, IExtrinsic, IMethod } from '@polkadot/types/types';
+import { Codec, IExtrinsic, IMethod, TypeDef } from '@polkadot/types/types';
 import { BareProps, I18nProps } from './types';
 
 import React from 'react';
 import styled from 'styled-components';
-import { Method, getTypeDef, TypeDef } from '@polkadot/types';
+import { GenericCall, getTypeDef } from '@polkadot/types';
 import Params from '@polkadot/ui-params';
 
 import Static from './Static';
@@ -33,9 +33,9 @@ const Wrapper = styled.div`
 class Call extends React.PureComponent<Props> {
   public render (): React.ReactNode {
     const { children, className, style, mortality, value, withHash, t } = this.props;
-    const params = Method.filterOrigin(value.meta).map(({ name, type }): { name: string; type: TypeDef } => ({
+    const params = GenericCall.filterOrigin(value.meta).map(({ name, type }): { name: string; type: TypeDef } => ({
       name: name.toString(),
-      type: getTypeDef(type)
+      type: getTypeDef(type.toString())
     }));
     const values = value.args.map((value): { isValid: boolean; value: Codec } => ({
       isValid: true,
diff --git a/packages/ui-app/src/CodeRow.tsx b/packages/ui-app/src/CodeRow.tsx
index 30db931378..9facd31e81 100644
--- a/packages/ui-app/src/CodeRow.tsx
+++ b/packages/ui-app/src/CodeRow.tsx
@@ -4,11 +4,11 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { I18nProps } from '@polkadot/ui-app/types';
-import { Hash } from '@polkadot/types';
 import { CodeStored } from '@polkadot/app-contracts/types';
 
 import React from 'react';
 import styled from 'styled-components';
+import { createType } from '@polkadot/types';
 import { withMulti } from '@polkadot/ui-api';
 import { classes, toShortAddress } from '@polkadot/ui-app/util';
 import contracts from '@polkadot/app-contracts/store';
@@ -192,7 +192,7 @@ class CodeRow extends Row<Props, State> {
 
     // Save only if the name was changed or if it's no empty.
     if (trimmedName && codeHash) {
-      await contracts.saveCode(new Hash(codeHash), { name });
+      await contracts.saveCode(createType('Hash', codeHash), { name });
 
       this.setState({ isEditingName: false });
     }
@@ -202,7 +202,7 @@ class CodeRow extends Row<Props, State> {
     const { codeHash, tags } = this.state;
 
     if (codeHash) {
-      await contracts.saveCode(new Hash(codeHash), { tags });
+      await contracts.saveCode(createType('Hash', codeHash), { tags });
 
       this.setState({ isEditingTags: false });
     }
diff --git a/packages/ui-app/src/CryptoType.tsx b/packages/ui-app/src/CryptoType.tsx
index 476629d3b0..ec9050479b 100644
--- a/packages/ui-app/src/CryptoType.tsx
+++ b/packages/ui-app/src/CryptoType.tsx
@@ -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 { AccountId, AccountIndex, Address } from '@polkadot/types';
+import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
 import { BareProps } from './types';
 
 import React from 'react';
diff --git a/packages/ui-app/src/Event.tsx b/packages/ui-app/src/Event.tsx
index 2f4ea451eb..5a81e4d724 100644
--- a/packages/ui-app/src/Event.tsx
+++ b/packages/ui-app/src/Event.tsx
@@ -2,11 +2,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Codec } from '@polkadot/types/types';
+import { Event } from '@polkadot/types/interfaces';
+import { Codec, TypeDef } from '@polkadot/types/types';
 import { BareProps } from './types';
 
 import React from 'react';
-import { Event, TypeDef, getTypeDef } from '@polkadot/types';
+import { getTypeDef } from '@polkadot/types';
 import Params from '@polkadot/ui-params';
 
 import { classes } from './util';
diff --git a/packages/ui-app/src/Extrinsic.tsx b/packages/ui-app/src/Extrinsic.tsx
index 34c14cd605..d7678b0140 100644
--- a/packages/ui-app/src/Extrinsic.tsx
+++ b/packages/ui-app/src/Extrinsic.tsx
@@ -2,13 +2,14 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { MethodFunction } from '@polkadot/types/primitive/Method';
+import { Call } from '@polkadot/types/interfaces';
+import { CallFunction, TypeDef } from '@polkadot/types/types';
 import { BareProps } from '@polkadot/ui-app/types';
 import { ApiProps } from '@polkadot/ui-api/types';
 import { RawParam } from '@polkadot/ui-params/types';
 
 import React from 'react';
-import { Method, TypeDef, getTypeDef } from '@polkadot/types';
+import { GenericCall, getTypeDef } from '@polkadot/types';
 
 import { InputExtrinsic } from '@polkadot/ui-app';
 import Params from '@polkadot/ui-params';
@@ -18,18 +19,18 @@ import { isUndefined } from '@polkadot/util';
 import paramComponents from './Params';
 
 type Props = BareProps & ApiProps & {
-  defaultValue: MethodFunction;
+  defaultValue: CallFunction;
   isDisabled?: boolean;
   isError?: boolean;
   isPrivate?: boolean;
   label?: React.ReactNode;
-  onChange: (method?: Method) => void;
+  onChange: (method?: Call) => void;
   onEnter: () => void;
   withLabel?: boolean;
 };
 
 interface State {
-  methodfn: MethodFunction;
+  methodfn: CallFunction;
   params: { name: string; type: TypeDef }[];
   values: RawParam[];
 }
@@ -102,7 +103,7 @@ class ExtrinsicDisplay extends React.PureComponent<Props, State> {
     });
   }
 
-  private onChangeMethod = (methodfn: MethodFunction): void => {
+  private onChangeMethod = (methodfn: CallFunction): void => {
     this.nextState({
       methodfn,
       params: this.getParams(methodfn),
@@ -114,10 +115,10 @@ class ExtrinsicDisplay extends React.PureComponent<Props, State> {
     this.nextState({ values });
   }
 
-  private getParams (methodfn: MethodFunction): { name: string; type: TypeDef }[] {
-    return Method.filterOrigin(methodfn.meta).map((arg): { name: string; type: TypeDef } => ({
+  private getParams (methodfn: CallFunction): { name: string; type: TypeDef }[] {
+    return GenericCall.filterOrigin(methodfn.meta).map((arg): { name: string; type: TypeDef } => ({
       name: arg.name.toString(),
-      type: getTypeDef(arg.type)
+      type: getTypeDef(arg.type.toString())
     }));
   }
 }
diff --git a/packages/ui-app/src/IdentityIcon.tsx b/packages/ui-app/src/IdentityIcon.tsx
index 48e3ff8cbc..9449286c13 100644
--- a/packages/ui-app/src/IdentityIcon.tsx
+++ b/packages/ui-app/src/IdentityIcon.tsx
@@ -3,15 +3,16 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId } from '@polkadot/types/interfaces';
 import { ApiProps } from '@polkadot/ui-api/types';
-import { IdentityProps } from '@polkadot/ui-identicon/types';
+import { IdentityProps } from '@polkadot/react-identicon/types';
 import { QueueAction$Add } from './Status/types';
 import { I18nProps } from './types';
 
 import React from 'react';
-import { AccountId, Option } from '@polkadot/types';
+import { Option } from '@polkadot/types';
 import { withCalls } from '@polkadot/ui-api/with';
-import BaseIdentityIcon from '@polkadot/ui-identicon';
+import BaseIdentityIcon from '@polkadot/react-identicon';
 
 import { QueueConsumer } from './Status/Context';
 import translate from './translate';
diff --git a/packages/ui-app/src/InputExtrinsic/SelectMethod.tsx b/packages/ui-app/src/InputExtrinsic/SelectMethod.tsx
index 6a9dc9dfc7..e5132d0b18 100644
--- a/packages/ui-app/src/InputExtrinsic/SelectMethod.tsx
+++ b/packages/ui-app/src/InputExtrinsic/SelectMethod.tsx
@@ -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 { MethodFunction } from '@polkadot/types/primitive/Method';
+import { CallFunction } from '@polkadot/types/types';
 import { BareProps } from '../types';
 import { DropdownOptions } from '../util/types';
 
@@ -15,9 +15,9 @@ import { classes } from '../util';
 interface Props extends BareProps {
   api: ApiPromise;
   isError?: boolean;
-  onChange: (value: MethodFunction) => void;
+  onChange: (value: CallFunction) => void;
   options: DropdownOptions;
-  value: MethodFunction;
+  value: CallFunction;
 }
 
 export default class SelectMethod extends React.PureComponent<Props> {
@@ -42,7 +42,7 @@ export default class SelectMethod extends React.PureComponent<Props> {
     );
   }
 
-  private transform = (method: string): MethodFunction => {
+  private transform = (method: string): CallFunction => {
     const { api, value } = this.props;
 
     return api.tx[value.section][method];
diff --git a/packages/ui-app/src/InputExtrinsic/SelectSection.tsx b/packages/ui-app/src/InputExtrinsic/SelectSection.tsx
index 5a6d2e71da..0d4d48e7ea 100644
--- a/packages/ui-app/src/InputExtrinsic/SelectSection.tsx
+++ b/packages/ui-app/src/InputExtrinsic/SelectSection.tsx
@@ -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 { MethodFunction } from '@polkadot/types/primitive/Method';
+import { CallFunction } from '@polkadot/types/types';
 import { BareProps } from '../types';
 import { DropdownOptions } from '../util/types';
 
@@ -16,7 +16,7 @@ interface Props extends BareProps {
   isError?: boolean;
   onChange: (value: string) => void;
   options: DropdownOptions;
-  value: MethodFunction;
+  value: CallFunction;
 }
 
 export default class SelectSection extends React.PureComponent<Props> {
diff --git a/packages/ui-app/src/InputExtrinsic/index.tsx b/packages/ui-app/src/InputExtrinsic/index.tsx
index d5145e403a..1d35071d39 100644
--- a/packages/ui-app/src/InputExtrinsic/index.tsx
+++ b/packages/ui-app/src/InputExtrinsic/index.tsx
@@ -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 { MethodFunction } from '@polkadot/types/primitive/Method';
+import { CallFunction } from '@polkadot/types/types';
 import { ApiProps } from '@polkadot/ui-api/types';
 import { I18nProps } from '../types';
 import { DropdownOptions } from '../util/types';
@@ -20,20 +20,20 @@ import methodOptions from './options/method';
 import sectionOptions from './options/section';
 
 type Props = ApiProps & I18nProps & {
-  defaultValue: MethodFunction;
+  defaultValue: CallFunction;
   help?: React.ReactNode;
   isDisabled?: boolean;
   isError?: boolean;
   isPrivate?: boolean;
   label: React.ReactNode;
-  onChange: (value: MethodFunction) => void;
+  onChange: (value: CallFunction) => void;
   withLabel?: boolean;
 };
 
 interface State {
   optionsMethod?: DropdownOptions;
   optionsSection?: DropdownOptions;
-  value: MethodFunction;
+  value: CallFunction;
 }
 
 class InputExtrinsic extends React.PureComponent<Props, State> {
@@ -88,7 +88,7 @@ class InputExtrinsic extends React.PureComponent<Props, State> {
     );
   }
 
-  private onKeyChange = (newValue: MethodFunction): void => {
+  private onKeyChange = (newValue: CallFunction): void => {
     const { onChange } = this.props;
     const { value } = this.state;
 
diff --git a/packages/ui-app/src/Nonce.tsx b/packages/ui-app/src/Nonce.tsx
index 821b0f646c..5653c8312c 100644
--- a/packages/ui-app/src/Nonce.tsx
+++ b/packages/ui-app/src/Nonce.tsx
@@ -2,10 +2,10 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
 import { BareProps } from './types';
 
 import React from 'react';
-import { AccountId, AccountIndex, Address } from '@polkadot/types';
 import { Nonce } from '@polkadot/ui-reactive';
 
 import { classes } from './util';
diff --git a/packages/ui-app/src/Params/Extrinsic.tsx b/packages/ui-app/src/Params/Extrinsic.tsx
index e46bcdc24e..5cc1f2273d 100644
--- a/packages/ui-app/src/Params/Extrinsic.tsx
+++ b/packages/ui-app/src/Params/Extrinsic.tsx
@@ -2,17 +2,17 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { MethodFunction } from '@polkadot/types/primitive/Method';
+import { Call } from '@polkadot/types/interfaces';
+import { CallFunction } from '@polkadot/types/types';
 import { RawParamOnChange, RawParamOnEnter } from '@polkadot/ui-params/types';
 import { BareProps } from '../types';
 
 import React from 'react';
-import { Method } from '@polkadot/types';
 
 import BaseExtrinsic from '../Extrinsic';
 
 interface Props extends BareProps {
-  defaultValue: MethodFunction;
+  defaultValue: CallFunction;
   isDisabled?: boolean;
   isError?: boolean;
   isPrivate: boolean;
@@ -42,7 +42,7 @@ export default class ExtrinsicDisplay extends React.PureComponent<Props> {
     );
   }
 
-  private onChange = (method: Method): void => {
+  private onChange = (method: Call): void => {
     const { onChange } = this.props;
 
     onChange && onChange({
diff --git a/packages/ui-app/src/Params/Proposal.tsx b/packages/ui-app/src/Params/Proposal.tsx
index ccf854ccc6..005706d496 100644
--- a/packages/ui-app/src/Params/Proposal.tsx
+++ b/packages/ui-app/src/Params/Proposal.tsx
@@ -6,7 +6,7 @@ import { Props as BaseProps, RawParam } from '@polkadot/ui-params/types';
 import { ApiProps } from '@polkadot/ui-api/types';
 
 import React from 'react';
-import { Proposal } from '@polkadot/types';
+import { createType } from '@polkadot/types';
 import { withApi } from '@polkadot/ui-api';
 
 import ExtrinsicDisplay from './Extrinsic';
@@ -38,7 +38,7 @@ class ProposalDisplay extends React.PureComponent<Props> {
     let proposal = null;
 
     if (isValid && value) {
-      proposal = new Proposal(value);
+      proposal = createType('Proposal', value);
     }
 
     onChange && onChange({
diff --git a/packages/ui-app/src/ProposedAction.tsx b/packages/ui-app/src/ProposedAction.tsx
index 54e8dda5a8..5b79bb92ef 100644
--- a/packages/ui-app/src/ProposedAction.tsx
+++ b/packages/ui-app/src/ProposedAction.tsx
@@ -2,11 +2,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Method, Proposal } from '@polkadot/types';
+import { Proposal } from '@polkadot/types/interfaces';
 
 import BN from 'bn.js';
 import React from 'react';
 import styled from 'styled-components';
+import { GenericCall } from '@polkadot/types';
 import { formatNumber } from '@polkadot/util';
 
 import Call from './Call';
@@ -53,7 +54,7 @@ class ProposedAction extends React.PureComponent<Props> {
       );
     }
 
-    const { meta, method, section } = Method.findFunction(proposal.callIndex);
+    const { meta, method, section } = GenericCall.findFunction(proposal.callIndex);
 
     const header = `#${idNumber}: ${section}.${method}`;
     const documentation = (meta && meta.documentation)
diff --git a/packages/ui-app/src/RecentlyOffline.tsx b/packages/ui-app/src/RecentlyOffline.tsx
index 078f6d96f6..3eabf80530 100644
--- a/packages/ui-app/src/RecentlyOffline.tsx
+++ b/packages/ui-app/src/RecentlyOffline.tsx
@@ -1,7 +1,8 @@
 // Copyright 2017-2019 @polkadot/app-staking authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
-import { AccountId } from '@polkadot/types';
+
+import { AccountId } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
 import { OfflineStatus } from '@polkadot/app-staking/types';
 
diff --git a/packages/ui-app/src/Row.tsx b/packages/ui-app/src/Row.tsx
index c88c7391c0..005b1c3c92 100644
--- a/packages/ui-app/src/Row.tsx
+++ b/packages/ui-app/src/Row.tsx
@@ -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 { AccountId, AccountIndex } from '@polkadot/types';
+import { AccountId, AccountIndex } from '@polkadot/types/interfaces';
 import { KeyringItemType } from '@polkadot/ui-keyring/types';
 
 import { Label } from 'semantic-ui-react';
diff --git a/packages/ui-app/src/Status/Queue.tsx b/packages/ui-app/src/Status/Queue.tsx
index 11f52f7bce..b348735e65 100644
--- a/packages/ui-app/src/Status/Queue.tsx
+++ b/packages/ui-app/src/Status/Queue.tsx
@@ -9,7 +9,7 @@ import { ActionStatus, PartialQueueTxExtrinsic, PartialQueueTxRpc, QueueProps, Q
 
 import React from 'react';
 import jsonrpc from '@polkadot/jsonrpc';
-import { Extrinsic, Method } from '@polkadot/types';
+import { createType } from '@polkadot/types';
 
 import { QueueProvider } from './Context';
 import { SubmittableResult } from '@polkadot/api/SubmittableExtrinsic';
@@ -191,8 +191,8 @@ export default class Queue extends React.Component<Props, State> {
     return this.queueAdd({
       accountId: payload.address,
       // this is not great, but the Extrinsic we don't need a submittable
-      extrinsic: new Extrinsic(
-        { method: new Method(payload.method) },
+      extrinsic: createType('Extrinsic',
+        { method: createType('Call', payload.method) },
         { version: payload.version }
       ) as unknown as SubmittableExtrinsic,
       payload,
diff --git a/packages/ui-app/src/Status/index.tsx b/packages/ui-app/src/Status/index.tsx
index 8361f40f8c..cd6555e1d3 100644
--- a/packages/ui-app/src/Status/index.tsx
+++ b/packages/ui-app/src/Status/index.tsx
@@ -7,7 +7,7 @@ import { QueueStatus, QueueTx, QueueTxStatus } from './types';
 
 import React from 'react';
 import styled from 'styled-components';
-import { Method } from '@polkadot/types';
+import { GenericCall } from '@polkadot/types';
 
 import AddressMini from '../AddressMini';
 import Icon from '../Icon';
@@ -144,7 +144,7 @@ class Status extends React.PureComponent<Props> {
     let { method, section } = rpc;
 
     if (extrinsic) {
-      const found = Method.findFunction(extrinsic.callIndex);
+      const found = GenericCall.findFunction(extrinsic.callIndex);
 
       if (found.section !== 'unknown') {
         method = found.method;
diff --git a/packages/ui-app/src/Status/types.ts b/packages/ui-app/src/Status/types.ts
index e6bac063d0..7fba8739a4 100644
--- a/packages/ui-app/src/Status/types.ts
+++ b/packages/ui-app/src/Status/types.ts
@@ -6,7 +6,7 @@ import { SubmittableResult } from '@polkadot/api/SubmittableExtrinsic';
 import { SubmittableExtrinsic } from '@polkadot/api/promise/types';
 import { SignerPayload, SignerResult } from '@polkadot/api/types';
 import { RpcMethod } from '@polkadot/jsonrpc/types';
-import { AccountId, Address } from '@polkadot/types';
+import { AccountId, Address } from '@polkadot/types/interfaces';
 
 export type Actions = 'create' | 'edit' | 'restore' | 'forget' | 'backup' | 'changePassword' | 'transfer';
 
diff --git a/packages/ui-app/src/TreasuryProposal.tsx b/packages/ui-app/src/TreasuryProposal.tsx
index c37ab19a81..f1bcae64a4 100644
--- a/packages/ui-app/src/TreasuryProposal.tsx
+++ b/packages/ui-app/src/TreasuryProposal.tsx
@@ -2,11 +2,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { TreasuryProposal as TreasuryProposalType } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
 import { ApiProps } from '@polkadot/ui-api/types';
-import { Option, TreasuryProposal as TreasuryProposalType } from '@polkadot/types';
 
 import React from 'react';
+import { Option } from '@polkadot/types';
 import { InputAddress, Labelled, Static } from '@polkadot/ui-app';
 import { withMulti, withApi } from '@polkadot/ui-api';
 import { formatBalance } from '@polkadot/util';
diff --git a/packages/ui-app/src/TxButton.tsx b/packages/ui-app/src/TxButton.tsx
index 650759cbe3..225b80a037 100644
--- a/packages/ui-app/src/TxButton.tsx
+++ b/packages/ui-app/src/TxButton.tsx
@@ -5,7 +5,7 @@
 import { SubmittableExtrinsic } from '@polkadot/api/promise/types';
 import { ApiProps } from '@polkadot/ui-api/types';
 import { assert, isFunction, isUndefined } from '@polkadot/util';
-import { Index } from '@polkadot/types';
+import { Index } from '@polkadot/types/interfaces';
 import { IExtrinsic } from '@polkadot/types/types';
 import { QueueTx, QueueTxExtrinsicAdd, TxCallback, TxFailedCallback } from './Status/types';
 
diff --git a/packages/ui-app/src/Voting.tsx b/packages/ui-app/src/Voting.tsx
index 090e9672e1..a8e8e2af85 100644
--- a/packages/ui-app/src/Voting.tsx
+++ b/packages/ui-app/src/Voting.tsx
@@ -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 { Proposal } from '@polkadot/types';
+import { Proposal } from '@polkadot/types/interfaces';
 import { I18nProps } from '@polkadot/ui-app/types';
 import { SubjectInfo } from '@polkadot/ui-keyring/observable/types';
 
diff --git a/packages/ui-app/src/util/isTreasuryProposalVote.ts b/packages/ui-app/src/util/isTreasuryProposalVote.ts
index 8d0b2ff5ff..7dc93a46c6 100644
--- a/packages/ui-app/src/util/isTreasuryProposalVote.ts
+++ b/packages/ui-app/src/util/isTreasuryProposalVote.ts
@@ -2,14 +2,15 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Method, Proposal } from '@polkadot/types';
+import { Proposal } from '@polkadot/types/interfaces';
+import { GenericCall } from '@polkadot/types';
 
 export default function isTreasuryProposalVote (proposal?: Proposal | null): boolean {
   if (!proposal) {
     return false;
   }
 
-  const { method, section } = Method.findFunction(proposal.callIndex);
+  const { method, section } = GenericCall.findFunction(proposal.callIndex);
 
   return section === 'treasury' &&
     ['approveProposal', 'rejectProposal'].includes(method) &&
diff --git a/packages/ui-app/src/util/toShortAddress.ts b/packages/ui-app/src/util/toShortAddress.ts
index 02320cf30d..2a434fa965 100644
--- a/packages/ui-app/src/util/toShortAddress.ts
+++ b/packages/ui-app/src/util/toShortAddress.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 { AccountId, AccountIndex, Address } from '@polkadot/types';
+import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
 
 export default function toShortAddress (_address?: AccountId | AccountIndex | Address | string | null): string {
   const address = (_address || '').toString();
diff --git a/packages/ui-params/src/Param/Amount.tsx b/packages/ui-params/src/Param/Amount.tsx
index 7b19643620..51f1225a5c 100644
--- a/packages/ui-params/src/Param/Amount.tsx
+++ b/packages/ui-params/src/Param/Amount.tsx
@@ -6,7 +6,7 @@ import { Props } from '../types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { AccountIndex } from '@polkadot/types';
+import { ClassOf } from '@polkadot/types';
 import { Input } from '@polkadot/ui-app';
 import { bnToBn, formatNumber } from '@polkadot/util';
 
@@ -17,7 +17,7 @@ export default class Amount extends React.PureComponent<Props> {
     const { className, defaultValue: { value }, isDisabled, isError, label, onEnter, style, withLabel } = this.props;
     const defaultValue = isDisabled
       ? (
-        value instanceof AccountIndex
+        value instanceof ClassOf('AccountIndex')
           ? value.toString()
           : formatNumber(value)
       )
diff --git a/packages/ui-params/src/Param/Enum.tsx b/packages/ui-params/src/Param/Enum.tsx
index f37a552f84..975b6cc6e2 100644
--- a/packages/ui-params/src/Param/Enum.tsx
+++ b/packages/ui-params/src/Param/Enum.tsx
@@ -2,10 +2,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { TypeDef } from '@polkadot/types/types';
 import { Props as BaseProps, RawParam } from '../types';
 
 import React from 'react';
-import { Enum, TypeDef, createType, getTypeDef } from '@polkadot/types';
+import { Enum, createType, getTypeDef } from '@polkadot/types';
 import { Dropdown } from '@polkadot/ui-app';
 
 import Params from '../';
@@ -39,7 +40,7 @@ export default class EnumParam extends React.PureComponent<Props, State> {
       return null;
     }
 
-    const sub = getTypeDef(createType(type).toRawType()).sub as TypeDef[];
+    const sub = getTypeDef(createType(type as any).toRawType()).sub as TypeDef[];
     const options = sub.map(({ name }): Option => ({
       text: name,
       value: name
diff --git a/packages/ui-params/src/Param/KeyValueArray.tsx b/packages/ui-params/src/Param/KeyValueArray.tsx
index cd7b9d3528..f984301278 100644
--- a/packages/ui-params/src/Param/KeyValueArray.tsx
+++ b/packages/ui-params/src/Param/KeyValueArray.tsx
@@ -2,11 +2,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { WithTranslation } from 'react-i18next';
+import { KeyValue as Pair } from '@polkadot/types/interfaces';
 import { Props as BaseProps, RawParam } from '../types';
 
 import React from 'react';
-import { KeyValue as Pair, Vector } from '@polkadot/types';
+import { WithTranslation } from 'react-i18next';
+import { Vec } from '@polkadot/types';
 import translate from '@polkadot/ui-app/translate';
 import { assert, isHex, u8aToHex, u8aToString } from '@polkadot/util';
 
@@ -70,7 +71,7 @@ class KeyValueArray extends React.PureComponent<Props, State> {
 
   private renderReadOnly (): React.ReactNode {
     const { className, defaultValue: { value }, label, onEnter, style } = this.props;
-    const pairs = value as Vector<Pair>;
+    const pairs = value as Vec<Pair>;
 
     return (
       <>
@@ -83,7 +84,7 @@ class KeyValueArray extends React.PureComponent<Props, State> {
           <div />
         </Base>
         <div className='ui--Params'>
-          {pairs.map(({ key, value }): React.ReactNode => {
+          {pairs.map(([key, value]): React.ReactNode => {
             const keyHex = u8aToHex(key.toU8a(true));
 
             return (
diff --git a/packages/ui-params/src/Param/Proposal.tsx b/packages/ui-params/src/Param/Proposal.tsx
index c67b5d6ff8..661e4814d3 100644
--- a/packages/ui-params/src/Param/Proposal.tsx
+++ b/packages/ui-params/src/Param/Proposal.tsx
@@ -2,10 +2,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { Extrinsic } from '@polkadot/types/interfaces';
 import { Props } from '../types';
 
 import React from 'react';
-import { Extrinsic, Method } from '@polkadot/types';
+import { GenericCall } from '@polkadot/types';
 import { Call, Static } from '@polkadot/ui-app';
 import { classes } from '@polkadot/ui-app/util';
 
@@ -23,7 +24,7 @@ export default class Proposal extends React.PureComponent<Props> {
     }
 
     const proposal = value as Extrinsic;
-    const { method, section } = Method.findFunction(proposal.callIndex);
+    const { method, section } = GenericCall.findFunction(proposal.callIndex);
 
     return (
       <Bare>
diff --git a/packages/ui-params/src/Param/Struct.tsx b/packages/ui-params/src/Param/Struct.tsx
index 4f695416a8..89e2a10a08 100644
--- a/packages/ui-params/src/Param/Struct.tsx
+++ b/packages/ui-params/src/Param/Struct.tsx
@@ -2,10 +2,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { TypeDef } from '@polkadot/types/types';
 import { Props as BaseProps, RawParam } from '../types';
 
 import React from 'react';
-import { TypeDef, createType, getTypeDef } from '@polkadot/types';
+import { createType, getTypeDef } from '@polkadot/types';
 
 import Params from '../';
 import Base from './Base';
@@ -29,7 +30,7 @@ export default class StructParam extends React.PureComponent<Props, State> {
       return null;
     }
 
-    const defs = getTypeDef(createType(type).toRawType()).sub as TypeDef[];
+    const defs = getTypeDef(createType(type as any).toRawType()).sub as TypeDef[];
 
     return {
       defs,
diff --git a/packages/ui-params/src/Param/Tuple.tsx b/packages/ui-params/src/Param/Tuple.tsx
index 0a35ddc917..cfec18933b 100644
--- a/packages/ui-params/src/Param/Tuple.tsx
+++ b/packages/ui-params/src/Param/Tuple.tsx
@@ -2,11 +2,10 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Codec } from '@polkadot/types/types';
+import { Codec, TypeDef } from '@polkadot/types/types';
 import { Props, RawParam } from '../types';
 
 import React from 'react';
-import { TypeDef } from '@polkadot/types';
 import { isUndefined } from '@polkadot/util';
 
 import Bare from './Bare';
diff --git a/packages/ui-params/src/Param/Vector.tsx b/packages/ui-params/src/Param/Vector.tsx
index ef6ecd87f4..a617f33b86 100644
--- a/packages/ui-params/src/Param/Vector.tsx
+++ b/packages/ui-params/src/Param/Vector.tsx
@@ -3,7 +3,7 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { WithTranslation } from 'react-i18next';
-import { TypeDef } from '@polkadot/types';
+import { TypeDef } from '@polkadot/types/types';
 import { Props as BareProps, RawParam } from '../types';
 
 import React from 'react';
diff --git a/packages/ui-params/src/Param/VoteThreshold.tsx b/packages/ui-params/src/Param/VoteThreshold.tsx
index 44a38d605b..aa8b885418 100644
--- a/packages/ui-params/src/Param/VoteThreshold.tsx
+++ b/packages/ui-params/src/Param/VoteThreshold.tsx
@@ -5,7 +5,7 @@
 import { Props } from '../types';
 
 import React from 'react';
-import { VoteThreshold } from '@polkadot/types';
+import { ClassOf } from '@polkadot/types';
 import { Dropdown } from '@polkadot/ui-app';
 import { bnToBn } from '@polkadot/util';
 
@@ -28,7 +28,7 @@ export const textMap = options.reduce((textMap, { text, value }): TextMap => {
 export default class VoteThresholdParam extends React.PureComponent<Props> {
   public render (): React.ReactNode {
     const { className, defaultValue: { value }, isDisabled, isError, label, style, withLabel } = this.props;
-    const defaultValue = value instanceof VoteThreshold
+    const defaultValue = value instanceof ClassOf('VoteThreshold')
       ? value.toNumber()
       : bnToBn(value as number).toNumber();
 
diff --git a/packages/ui-params/src/Param/findComponent.ts b/packages/ui-params/src/Param/findComponent.ts
index 3e1104f263..978a3b86a8 100644
--- a/packages/ui-params/src/Param/findComponent.ts
+++ b/packages/ui-params/src/Param/findComponent.ts
@@ -2,10 +2,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { TypeDef, TypeDefInfo } from '@polkadot/types/types';
 import { Props, ComponentMap } from '../types';
 
 import BN from 'bn.js';
-import { TypeDef, TypeDefInfo, createType, getTypeDef } from '@polkadot/types';
+import { createType, getTypeDef } from '@polkadot/types';
 
 import Account from './Account';
 import Amount from './Amount';
@@ -78,7 +79,7 @@ export default function findComponent (def: TypeDef, overrides: ComponentMap = {
       case TypeDefInfo.Tuple:
         return 'Tuple';
 
-      case TypeDefInfo.Vector:
+      case TypeDefInfo.Vec:
         return ['Vec<KeyValue>'].includes(type)
           ? 'Vec<KeyValue>'
           : 'Vector';
@@ -92,7 +93,7 @@ export default function findComponent (def: TypeDef, overrides: ComponentMap = {
 
   if (!Component) {
     try {
-      const instance = createType(type);
+      const instance = createType(type as any);
       const raw = getTypeDef(instance.toRawType());
 
       if (instance instanceof BN) {
diff --git a/packages/ui-params/src/index.tsx b/packages/ui-params/src/index.tsx
index b7a62db30e..e488d0285b 100644
--- a/packages/ui-params/src/index.tsx
+++ b/packages/ui-params/src/index.tsx
@@ -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 { TypeDef } from '@polkadot/types';
+import { TypeDef } from '@polkadot/types/types';
 import { I18nProps } from '@polkadot/ui-app/types';
 import { ComponentMap, RawParam, RawParams, RawParamOnChange, RawParamOnChangeValue } from './types';
 
diff --git a/packages/ui-params/src/initValue.ts b/packages/ui-params/src/initValue.ts
index 0d2e4c79b8..faaeb70ccd 100644
--- a/packages/ui-params/src/initValue.ts
+++ b/packages/ui-params/src/initValue.ts
@@ -2,13 +2,14 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { TypeDef, TypeDefInfo } from '@polkadot/types/types';
 import { RawParamValue } from './types';
 
 import BN from 'bn.js';
-import { Bytes, Hash, TypeDef, TypeDefInfo, U8a, createType, getTypeDef } from '@polkadot/types';
+import { Bytes, U8a, createType, getTypeDef } from '@polkadot/types';
 
 export default function getInitValue (def: TypeDef): RawParamValue | RawParamValue[] {
-  if (def.info === TypeDefInfo.Vector) {
+  if (def.info === TypeDefInfo.Vec) {
     return [getInitValue(def.sub as TypeDef)];
   } else if (def.info === TypeDefInfo.Tuple) {
     return Array.isArray(def.sub)
@@ -72,7 +73,7 @@ export default function getInitValue (def: TypeDef): RawParamValue | RawParamVal
 
     case 'CodeHash':
     case 'Hash':
-      return new Hash();
+      return createType('Hash');
 
     case 'AccountId':
     case 'AccountIdOf':
@@ -97,7 +98,7 @@ export default function getInitValue (def: TypeDef): RawParamValue | RawParamVal
 
     default: {
       try {
-        const instance = createType(type);
+        const instance = createType(type as any);
         const raw = getTypeDef(instance.toRawType());
 
         if (instance instanceof BN) {
diff --git a/packages/ui-params/src/types.ts b/packages/ui-params/src/types.ts
index 2d14fb3326..8acf9c5b81 100644
--- a/packages/ui-params/src/types.ts
+++ b/packages/ui-params/src/types.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 { TypeDef } from '@polkadot/types';
+import { TypeDef } from '@polkadot/types/types';
 import { BareProps } from '@polkadot/ui-app/types';
 
 // FIXME Ideally, we want these as Base from api-codec - as a stop-gap, any this until we have
diff --git a/packages/ui-params/src/values.ts b/packages/ui-params/src/values.ts
index 57e9e7f082..6812fd2e0c 100644
--- a/packages/ui-params/src/values.ts
+++ b/packages/ui-params/src/values.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 { TypeDef } from '@polkadot/types';
+import { TypeDef } from '@polkadot/types/types';
 import { RawParam } from './types';
 
 import { isUndefined } from '@polkadot/util';
diff --git a/packages/ui-qr/LICENSE b/packages/ui-qr/LICENSE
deleted file mode 100644
index 0d381b2e97..0000000000
--- a/packages/ui-qr/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                    http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-  "License" shall mean the terms and conditions for use, reproduction,
-  and distribution as defined by Sections 1 through 9 of this document.
-
-  "Licensor" shall mean the copyright owner or entity authorized by
-  the copyright owner that is granting the License.
-
-  "Legal Entity" shall mean the union of the acting entity and all
-  other entities that control, are controlled by, or are under common
-  control with that entity. For the purposes of this definition,
-  "control" means (i) the power, direct or indirect, to cause the
-  direction or management of such entity, whether by contract or
-  otherwise, or (ii) ownership of fifty percent (50%) or more of the
-  outstanding shares, or (iii) beneficial ownership of such entity.
-
-  "You" (or "Your") shall mean an individual or Legal Entity
-  exercising permissions granted by this License.
-
-  "Source" form shall mean the preferred form for making modifications,
-  including but not limited to software source code, documentation
-  source, and configuration files.
-
-  "Object" form shall mean any form resulting from mechanical
-  transformation or translation of a Source form, including but
-  not limited to compiled object code, generated documentation,
-  and conversions to other media types.
-
-  "Work" shall mean the work of authorship, whether in Source or
-  Object form, made available under the License, as indicated by a
-  copyright notice that is included in or attached to the work
-  (an example is provided in the Appendix below).
-
-  "Derivative Works" shall mean any work, whether in Source or Object
-  form, that is based on (or derived from) the Work and for which the
-  editorial revisions, annotations, elaborations, or other modifications
-  represent, as a whole, an original work of authorship. For the purposes
-  of this License, Derivative Works shall not include works that remain
-  separable from, or merely link (or bind by name) to the interfaces of,
-  the Work and Derivative Works thereof.
-
-  "Contribution" shall mean any work of authorship, including
-  the original version of the Work and any modifications or additions
-  to that Work or Derivative Works thereof, that is intentionally
-  submitted to Licensor for inclusion in the Work by the copyright owner
-  or by an individual or Legal Entity authorized to submit on behalf of
-  the copyright owner. For the purposes of this definition, "submitted"
-  means any form of electronic, verbal, or written communication sent
-  to the Licensor or its representatives, including but not limited to
-  communication on electronic mailing lists, source code control systems,
-  and issue tracking systems that are managed by, or on behalf of, the
-  Licensor for the purpose of discussing and improving the Work, but
-  excluding communication that is conspicuously marked or otherwise
-  designated in writing by the copyright owner as "Not a Contribution."
-
-  "Contributor" shall mean Licensor and any individual or Legal Entity
-  on behalf of whom a Contribution has been received by Licensor and
-  subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-  this License, each Contributor hereby grants to You a perpetual,
-  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-  copyright license to reproduce, prepare Derivative Works of,
-  publicly display, publicly perform, sublicense, and distribute the
-  Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-  this License, each Contributor hereby grants to You a perpetual,
-  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-  (except as stated in this section) patent license to make, have made,
-  use, offer to sell, sell, import, and otherwise transfer the Work,
-  where such license applies only to those patent claims licensable
-  by such Contributor that are necessarily infringed by their
-  Contribution(s) alone or by combination of their Contribution(s)
-  with the Work to which such Contribution(s) was submitted. If You
-  institute patent litigation against any entity (including a
-  cross-claim or counterclaim in a lawsuit) alleging that the Work
-  or a Contribution incorporated within the Work constitutes direct
-  or contributory patent infringement, then any patent licenses
-  granted to You under this License for that Work shall terminate
-  as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-  Work or Derivative Works thereof in any medium, with or without
-  modifications, and in Source or Object form, provided that You
-  meet the following conditions:
-
-  (a) You must give any other recipients of the Work or
-      Derivative Works a copy of this License; and
-
-  (b) You must cause any modified files to carry prominent notices
-      stating that You changed the files; and
-
-  (c) You must retain, in the Source form of any Derivative Works
-      that You distribute, all copyright, patent, trademark, and
-      attribution notices from the Source form of the Work,
-      excluding those notices that do not pertain to any part of
-      the Derivative Works; and
-
-  (d) If the Work includes a "NOTICE" text file as part of its
-      distribution, then any Derivative Works that You distribute must
-      include a readable copy of the attribution notices contained
-      within such NOTICE file, excluding those notices that do not
-      pertain to any part of the Derivative Works, in at least one
-      of the following places: within a NOTICE text file distributed
-      as part of the Derivative Works; within the Source form or
-      documentation, if provided along with the Derivative Works; or,
-      within a display generated by the Derivative Works, if and
-      wherever such third-party notices normally appear. The contents
-      of the NOTICE file are for informational purposes only and
-      do not modify the License. You may add Your own attribution
-      notices within Derivative Works that You distribute, alongside
-      or as an addendum to the NOTICE text from the Work, provided
-      that such additional attribution notices cannot be construed
-      as modifying the License.
-
-  You may add Your own copyright statement to Your modifications and
-  may provide additional or different license terms and conditions
-  for use, reproduction, or distribution of Your modifications, or
-  for any such Derivative Works as a whole, provided Your use,
-  reproduction, and distribution of the Work otherwise complies with
-  the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-  any Contribution intentionally submitted for inclusion in the Work
-  by You to the Licensor shall be under the terms and conditions of
-  this License, without any additional terms or conditions.
-  Notwithstanding the above, nothing herein shall supersede or modify
-  the terms of any separate license agreement you may have executed
-  with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-  names, trademarks, service marks, or product names of the Licensor,
-  except as required for reasonable and customary use in describing the
-  origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-  agreed to in writing, Licensor provides the Work (and each
-  Contributor provides its Contributions) on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-  implied, including, without limitation, any warranties or conditions
-  of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-  PARTICULAR PURPOSE. You are solely responsible for determining the
-  appropriateness of using or redistributing the Work and assume any
-  risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-  whether in tort (including negligence), contract, or otherwise,
-  unless required by applicable law (such as deliberate and grossly
-  negligent acts) or agreed to in writing, shall any Contributor be
-  liable to You for damages, including any direct, indirect, special,
-  incidental, or consequential damages of any character arising as a
-  result of this License or out of the use or inability to use the
-  Work (including but not limited to damages for loss of goodwill,
-  work stoppage, computer failure or malfunction, or any and all
-  other commercial damages or losses), even if such Contributor
-  has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-  the Work or Derivative Works thereof, You may choose to offer,
-  and charge a fee for, acceptance of support, warranty, indemnity,
-  or other liability obligations and/or rights consistent with this
-  License. However, in accepting such obligations, You may act only
-  on Your own behalf and on Your sole responsibility, not on behalf
-  of any other Contributor, and only if You agree to indemnify,
-  defend, and hold each Contributor harmless for any liability
-  incurred by, or claims asserted against, such Contributor by reason
-  of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-  To apply the Apache License to your work, attach the following
-  boilerplate notice, with the fields enclosed by brackets "[]"
-  replaced with your own identifying information. (Don't include
-  the brackets!)  The text should be enclosed in the appropriate
-  comment syntax for the file format. We also recommend that a
-  file or class name and description of purpose be included on the
-  same "printed page" as the copyright notice for easier
-  identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/packages/ui-qr/README.md b/packages/ui-qr/README.md
deleted file mode 100644
index 1a279829c0..0000000000
--- a/packages/ui-qr/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# @polkadot/ui-qr
-
-A Qr-code component that allows for the transfer of addresses and transaction payloads to and from external readers
diff --git a/packages/ui-qr/package.json b/packages/ui-qr/package.json
deleted file mode 100644
index e6bc39ab65..0000000000
--- a/packages/ui-qr/package.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name": "@polkadot/ui-qr",
-  "version": "0.34.0-beta.87",
-  "description": "Generates and reads QR codes",
-  "main": "index.js",
-  "author": "Jaco Greeff <jacogr@gmail.com>",
-  "maintainers": [
-    "Jaco Greeff <jacogr@gmail.com>"
-  ],
-  "license": "Apache-2.0",
-  "dependencies": {
-    "@babel/runtime": "^7.5.5",
-    "@types/react-qr-reader": "^2.1.1",
-    "qrcode-generator": "^1.4.3",
-    "react-qr-reader": "^2.2.1"
-  }
-}
diff --git a/packages/ui-qr/src/Display.tsx b/packages/ui-qr/src/Display.tsx
deleted file mode 100644
index 9076165d35..0000000000
--- a/packages/ui-qr/src/Display.tsx
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2017-2019 @polkadot/ui-qr authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
-
-import { BaseProps } from './types';
-
-import React from 'react';
-import qrcode from 'qrcode-generator';
-import styled from 'styled-components';
-import { u8aConcat } from '@polkadot/util';
-import { xxhashAsHex } from '@polkadot/util-crypto';
-
-import { createSize } from './constants';
-import { encodeNumber, decodeString } from './util';
-
-interface Props extends BaseProps {
-  size?: number;
-  value: Uint8Array;
-  withMulti?: boolean;
-}
-
-interface State {
-  frames: string[];
-  frameIdx: number;
-  image: string | null;
-  timerId: NodeJS.Timeout | null;
-  valueHash: string | null;
-}
-
-const FRAME_DELAY = 2100;
-const FRAME_SIZE = 1716;
-const MULTIPART = new Uint8Array([0]);
-
-function getDataUrl (value: string): string {
-  const qr = qrcode(0, 'M');
-
-  qr.addData(value, 'Byte');
-  qr.make();
-
-  return qr.createDataURL(16, 0);
-}
-
-function createFrames (input: Uint8Array): string[] {
-  const frames = [];
-  let idx = 0;
-
-  while (idx < input.length) {
-    frames.push(input.subarray(idx, idx + FRAME_SIZE));
-
-    idx += FRAME_SIZE;
-  }
-
-  return frames.map((frame, index: number): string =>
-    decodeString(u8aConcat(
-      MULTIPART,
-      encodeNumber(frames.length),
-      encodeNumber(index),
-      frame
-    ))
-  );
-}
-
-class Display extends React.PureComponent<Props, State> {
-  public state: State = {
-    frames: [],
-    frameIdx: 0,
-    image: null,
-    timerId: null,
-    valueHash: null
-  };
-
-  public static getDerivedStateFromProps ({ value, withMulti = true }: Props, prevState: State): Pick<State, never> | null {
-    const valueHash = xxhashAsHex(value);
-
-    if (valueHash === prevState.valueHash) {
-      return null;
-    }
-
-    const frames: string[] = withMulti
-      ? createFrames(value)
-      : [decodeString(value)];
-
-    return {
-      frames,
-      frameIdx: 0,
-      image: getDataUrl(frames[0]),
-      valueHash
-    };
-  }
-
-  public componentDidMount (): void {
-    this.setState({
-      timerId: setInterval(this.nextFrame, FRAME_DELAY)
-    });
-  }
-
-  public componentWillUnmount (): void {
-    const { timerId } = this.state;
-
-    if (timerId) {
-      clearInterval(timerId);
-    }
-  }
-
-  public render (): React.ReactNode {
-    const { className, size, style } = this.props;
-    const { image } = this.state;
-
-    if (!image) {
-      return null;
-    }
-
-    return (
-      <div
-        className={className}
-        style={createSize(size)}
-      >
-        <div
-          className='ui--qr-Display'
-          style={style}
-        >
-          <img src={image} />
-        </div>
-      </div>
-    );
-  }
-
-  private nextFrame = (): void => {
-    const { frames, frameIdx } = this.state;
-
-    if (!frames || frames.length <= 1) {
-      return;
-    }
-
-    const nextIdx = frameIdx === frames.length - 1
-      ? 0
-      : frameIdx + 1;
-
-    this.setState({
-      frameIdx: nextIdx,
-      image: getDataUrl(frames[nextIdx])
-    });
-  }
-}
-
-export default styled(Display as React.ComponentClass<Props>)`
-  .ui--qr-Display {
-    height: 100%;
-    width: 100%;
-
-    img,
-    svg {
-      background: white;
-      height: auto !important;
-      max-height: 100%;
-      max-width: 100%;
-      width: auto !important;
-    }
-  }
-`;
diff --git a/packages/ui-qr/src/DisplayAddress.tsx b/packages/ui-qr/src/DisplayAddress.tsx
deleted file mode 100644
index 3f1e369d82..0000000000
--- a/packages/ui-qr/src/DisplayAddress.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2017-2019 @polkadot/ui-qr authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
-
-import { BaseProps } from './types';
-
-import React from 'react';
-import { u8aConcat } from '@polkadot/util';
-import { xxhashAsHex } from '@polkadot/util-crypto';
-
-import { ADDRESS_PREFIX } from './constants';
-import { encodeString } from './util';
-import QrDisplay from './Display';
-
-interface Props extends BaseProps {
-  address: string;
-}
-
-interface State {
-  data: Uint8Array | null;
-  dataHash: string | null;
-}
-
-const PREFIX = encodeString(ADDRESS_PREFIX);
-
-export default class DisplayExtrinsic extends React.PureComponent<Props, State> {
-  public state: State = {
-    data: null,
-    dataHash: null
-  };
-
-  public getDerivedStateFromProps ({ address }: Props, prevState: State): State | null {
-    const data = u8aConcat(
-      PREFIX,
-      encodeString(address)
-    );
-    const dataHash = xxhashAsHex(data);
-
-    if (dataHash === prevState.dataHash) {
-      return null;
-    }
-
-    return { data, dataHash };
-  }
-
-  public render (): React.ReactNode {
-    const { className, style } = this.props;
-    const { data } = this.state;
-
-    if (!data) {
-      return null;
-    }
-
-    return (
-      <QrDisplay
-        className={className}
-        style={style}
-        value={data}
-      />
-    );
-  }
-}
diff --git a/packages/ui-qr/src/DisplayPayload.tsx b/packages/ui-qr/src/DisplayPayload.tsx
deleted file mode 100644
index 1a5fc3a955..0000000000
--- a/packages/ui-qr/src/DisplayPayload.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2017-2019 @polkadot/ui-qr authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
-
-import { BaseProps } from './types';
-
-import React from 'react';
-import { u8aConcat } from '@polkadot/util';
-import { decodeAddress, xxhashAsHex } from '@polkadot/util-crypto';
-
-import QrDisplay from './Display';
-
-interface Props extends BaseProps {
-  address: string;
-  payload: Uint8Array;
-}
-
-interface State {
-  data: Uint8Array | null;
-  dataHash: string | null;
-}
-
-const SUBSTRATE = new Uint8Array([0x53]);
-const CRYPTO_SR25519 = new Uint8Array([0x01]);
-const SIGN_TX = new Uint8Array([0x00]);
-
-export default class DisplayPayload extends React.PureComponent<Props, State> {
-  public state: State = {
-    data: null,
-    dataHash: null
-  };
-
-  public getDerivedStateFromProps ({ address, payload }: Props, prevState: State): State | null {
-    const data = u8aConcat(
-      SUBSTRATE,
-      CRYPTO_SR25519,
-      SIGN_TX,
-      decodeAddress(address),
-      payload
-    );
-    const dataHash = xxhashAsHex(data);
-
-    if (dataHash === prevState.dataHash) {
-      return null;
-    }
-
-    return { data, dataHash };
-  }
-
-  public render (): React.ReactNode {
-    const { className, style } = this.props;
-    const { data } = this.state;
-
-    if (!data) {
-      return null;
-    }
-
-    return (
-      <QrDisplay
-        className={className}
-        style={style}
-        value={data}
-      />
-    );
-  }
-}
diff --git a/packages/ui-qr/src/Scan.tsx b/packages/ui-qr/src/Scan.tsx
deleted file mode 100644
index 4ad09be63b..0000000000
--- a/packages/ui-qr/src/Scan.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2017-2019 @polkadot/ui-qr authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
-
-import { BaseProps } from './types';
-
-import React from 'react';
-import Reader from 'react-qr-reader';
-import styled from 'styled-components';
-
-import { createSize } from './constants';
-
-interface Props extends BaseProps {
-  delay?: number;
-  onError?: (error: Error) => void;
-  onScan?: (data: string) => void;
-  size?: number;
-}
-
-const DEFAULT_DELAY = 150;
-const DEFAULT_ERROR = (error: Error): void => {
-  console.error('@polkadot/ui-qr:Scan', error.message);
-};
-
-class Scan extends React.PureComponent<Props> {
-  public render (): React.ReactNode {
-    const { className, delay = DEFAULT_DELAY, size, style } = this.props;
-
-    return (
-      <div
-        className={className}
-        style={createSize(size)}
-      >
-        <Reader
-          className='ui--qr-Scan'
-          delay={delay}
-          onError={this.onError}
-          onScan={this.onScan}
-          style={style}
-        />
-      </div>
-    );
-  }
-
-  private onError = (error: Error): void => {
-    const { onError = DEFAULT_ERROR } = this.props;
-
-    onError(error);
-  }
-
-  private onScan = (data: string | null): void => {
-    const { onScan } = this.props;
-
-    if (!data || !onScan) {
-      return;
-    }
-
-    onScan(data);
-  }
-}
-
-export default styled(Scan)`
-  .ui--qr-Scan {
-    display: inline-block;
-    height: 100%;
-    width: 100%;
-
-    video {
-      margin: 0;
-    }
-  }
-`;
diff --git a/packages/ui-qr/src/ScanAddress.tsx b/packages/ui-qr/src/ScanAddress.tsx
deleted file mode 100644
index 8eb8a82471..0000000000
--- a/packages/ui-qr/src/ScanAddress.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2017-2019 @polkadot/ui-qr authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
-
-import { BaseProps } from './types';
-
-import React from 'react';
-
-import { ADDRESS_PREFIX } from './constants';
-import QrScan from './Scan';
-import { decodeAddress } from '@polkadot/util-crypto';
-
-interface Props extends BaseProps {
-  onError?: (error: Error) => void;
-  onScan?: (data: string) => void;
-}
-
-export default class ScanAddress extends React.PureComponent<Props> {
-  public render (): React.ReactNode {
-    const { className, onError, style } = this.props;
-
-    return (
-      <QrScan
-        className={className}
-        onError={onError}
-        onScan={this.onScan}
-        style={style}
-      />
-    );
-  }
-
-  private onScan = (data: string | null): void => {
-    const { onScan } = this.props;
-
-    if (!data || !onScan || !data.startsWith(ADDRESS_PREFIX)) {
-      return;
-    }
-
-    const address = data.substr(ADDRESS_PREFIX.length);
-
-    try {
-      decodeAddress(address);
-      onScan(address);
-    } catch (error) {
-      console.error('@polkadot/ui-qr:QrScanAddress', error.message);
-    }
-  }
-}
diff --git a/packages/ui-qr/src/ScanSignature.tsx b/packages/ui-qr/src/ScanSignature.tsx
deleted file mode 100644
index b25f0f776a..0000000000
--- a/packages/ui-qr/src/ScanSignature.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2017-2019 @polkadot/ui-qr authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
-
-import { BaseProps } from './types';
-
-import React from 'react';
-
-import QrScan from './Scan';
-import { encodeString } from './util';
-
-interface Props extends BaseProps {
-  onError?: (error: Error) => void;
-  onScan?: (data: Uint8Array) => void;
-}
-
-export default class ScanSignature extends React.PureComponent<Props> {
-  public render (): React.ReactNode {
-    const { className, onError, style } = this.props;
-
-    return (
-      <QrScan
-        className={className}
-        onError={onError}
-        onScan={this.onScan}
-        style={style}
-      />
-    );
-  }
-
-  private onScan = (data: string | null): void => {
-    const { onScan } = this.props;
-
-    if (!data || !onScan) {
-      return;
-    }
-
-    onScan(encodeString(data));
-  }
-}
diff --git a/packages/ui-qr/src/constants.ts b/packages/ui-qr/src/constants.ts
deleted file mode 100644
index c655a01db3..0000000000
--- a/packages/ui-qr/src/constants.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2017-2019 @polkadot/ui-qr authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
-
-const DEFAULT_SIZE = 300;
-const ADDRESS_PREFIX = 'substrate:';
-
-function createSize (size: number = DEFAULT_SIZE): Record<string, string> {
-  const height = `${size}px`;
-
-  return {
-    height,
-    width: height
-  };
-}
-
-export {
-  ADDRESS_PREFIX,
-  DEFAULT_SIZE,
-  createSize
-};
diff --git a/packages/ui-qr/src/index.tsx b/packages/ui-qr/src/index.tsx
deleted file mode 100644
index eba1630c71..0000000000
--- a/packages/ui-qr/src/index.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2017-2019 @polkadot/ui-qr authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
-
-export { default as QrDisplayAddress } from './DisplayAddress';
-export { default as QrDisplayPayload } from './DisplayPayload';
-export { default as QrScanAddress } from './ScanAddress';
-export { default as QrScanSignature } from './ScanSignature';
diff --git a/packages/ui-qr/src/types.ts b/packages/ui-qr/src/types.ts
deleted file mode 100644
index 0ff83a8b65..0000000000
--- a/packages/ui-qr/src/types.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2017-2019 @polkadot/ui-qr authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
-
-export interface BaseProps {
-  className?: string;
-  style?: Record<string, string | number>;
-}
diff --git a/packages/ui-qr/src/util.ts b/packages/ui-qr/src/util.ts
deleted file mode 100644
index f13d34eece..0000000000
--- a/packages/ui-qr/src/util.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2017-2019 @polkadot/ui-qr authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
-
-export function encodeNumber (value: number): Uint8Array {
-  return new Uint8Array([value >> 8, value & 256]);
-}
-
-export function encodeString (value: string): Uint8Array {
-  const u8a = new Uint8Array(value.length);
-
-  for (let i = 0; i < value.length; i++) {
-    u8a[i] = value.charCodeAt(i);
-  }
-
-  return u8a;
-}
-
-export function decodeString (value: Uint8Array): string {
-  return value.reduce((str, code): string => {
-    return str + String.fromCharCode(code);
-  }, '');
-}
diff --git a/packages/ui-reactive/src/AccountIndex.tsx b/packages/ui-reactive/src/AccountIndex.tsx
index cfef33424f..1fe5336bbe 100644
--- a/packages/ui-reactive/src/AccountIndex.tsx
+++ b/packages/ui-reactive/src/AccountIndex.tsx
@@ -4,9 +4,9 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { BareProps, CallProps } from '@polkadot/ui-api/types';
+import { AccountId, AccountIndex } from '@polkadot/types/interfaces';
 
 import React from 'react';
-import { AccountId, AccountIndex } from '@polkadot/types';
 import { withCalls } from '@polkadot/ui-api';
 
 type Props = BareProps & CallProps & {
diff --git a/packages/ui-reactive/src/Available.tsx b/packages/ui-reactive/src/Available.tsx
index 85d11b0e2f..a3bc703a8b 100644
--- a/packages/ui-reactive/src/Available.tsx
+++ b/packages/ui-reactive/src/Available.tsx
@@ -3,9 +3,9 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { AccountId, AccountIndex, Address } from '@polkadot/types';
 import { BareProps, CallProps } from '@polkadot/ui-api/types';
 import { DerivedBalances } from '@polkadot/api-derive/types';
+import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
 
 import React from 'react';
 import { formatBalance } from '@polkadot/util';
diff --git a/packages/ui-reactive/src/Balance.tsx b/packages/ui-reactive/src/Balance.tsx
index 3186d85a7e..a5b641a634 100644
--- a/packages/ui-reactive/src/Balance.tsx
+++ b/packages/ui-reactive/src/Balance.tsx
@@ -3,9 +3,9 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { AccountId, AccountIndex, Address } from '@polkadot/types';
 import { BareProps, CallProps } from '@polkadot/ui-api/types';
 import { DerivedBalances } from '@polkadot/api-derive/types';
+import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
 
 import React from 'react';
 
diff --git a/packages/ui-reactive/src/BestFinalized.tsx b/packages/ui-reactive/src/BestFinalized.tsx
index 1c3f1863d5..411fa84f1f 100644
--- a/packages/ui-reactive/src/BestFinalized.tsx
+++ b/packages/ui-reactive/src/BestFinalized.tsx
@@ -4,9 +4,9 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { BareProps, CallProps } from '@polkadot/ui-api/types';
+import { BlockNumber } from '@polkadot/types/interfaces';
 
 import React from 'react';
-import { BlockNumber } from '@polkadot/types';
 import { withCalls } from '@polkadot/ui-api';
 import { formatNumber } from '@polkadot/util';
 
diff --git a/packages/ui-reactive/src/BestNumber.tsx b/packages/ui-reactive/src/BestNumber.tsx
index f30ee65f29..937d2ed7a6 100644
--- a/packages/ui-reactive/src/BestNumber.tsx
+++ b/packages/ui-reactive/src/BestNumber.tsx
@@ -4,9 +4,9 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { BareProps, CallProps } from '@polkadot/ui-api/types';
+import { BlockNumber } from '@polkadot/types/interfaces';
 
 import React from 'react';
-import { BlockNumber } from '@polkadot/types';
 import { withCalls } from '@polkadot/ui-api';
 import { formatNumber } from '@polkadot/util';
 
diff --git a/packages/ui-reactive/src/Bonded.tsx b/packages/ui-reactive/src/Bonded.tsx
index 650a3a4317..f36191cfb7 100644
--- a/packages/ui-reactive/src/Bonded.tsx
+++ b/packages/ui-reactive/src/Bonded.tsx
@@ -4,9 +4,9 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { BareProps, CallProps } from '@polkadot/ui-api/types';
+import { AccountId, AccountIndex, Address, StakingLedger } from '@polkadot/types/interfaces';
 
 import React from 'react';
-import { AccountId, AccountIndex, Address, StakingLedger } from '@polkadot/types';
 
 import { withCalls } from '@polkadot/ui-api';
 import { formatBalance } from '@polkadot/util';
diff --git a/packages/ui-reactive/src/Elapsed.tsx b/packages/ui-reactive/src/Elapsed.tsx
index 65bff12d90..6ec518ebc7 100644
--- a/packages/ui-reactive/src/Elapsed.tsx
+++ b/packages/ui-reactive/src/Elapsed.tsx
@@ -4,24 +4,25 @@
 
 import { BareProps } from '@polkadot/ui-api/types';
 
+import BN from 'bn.js';
 import React from 'react';
-import { Moment } from '@polkadot/types';
+import { bnToBn } from '@polkadot/util';
 
-type Ticker = (now: Date) => void;
+type Ticker = (now: number) => void;
 
 interface Props extends BareProps {
-  value?: Moment | Date | number;
+  value?: BN | Date | number;
 }
 
 interface State {
-  now?: Date;
+  now?: number;
 }
 
 const TICK_TIMEOUT = 100;
 const tickers = new Map<Elapsed, Ticker>();
 
 function tick (): void {
-  const now = new Date();
+  const now = Date.now();
 
   for (const ticker of tickers.values()) {
     ticker(now);
@@ -36,10 +37,8 @@ export default class Elapsed extends React.PureComponent<Props, State> {
   public state: State = {};
 
   public componentWillMount (): void {
-    tickers.set(this, (now: Date): void => {
-      this.setState({
-        now
-      });
+    tickers.set(this, (now: number): void => {
+      this.setState({ now });
     });
   }
 
@@ -61,13 +60,16 @@ export default class Elapsed extends React.PureComponent<Props, State> {
     );
   }
 
-  private getDisplayValue (now?: Date, value?: Moment | Date | number): string {
-    const tsNow = (now && now.getTime()) || 0;
-    const tsValue = (value && ((value as any).getTime ? (value as any).getTime() : value)) || 0;
+  private getDisplayValue (now: number = 0, value: BN | Date | number = 0): string {
+    const tsValue = (
+      value && (value as Date).getTime
+        ? (value as Date).getTime()
+        : bnToBn(value as number).toNumber()
+    ) || 0;
     let display = '0.0s';
 
-    if (tsNow && tsValue) {
-      const elapsed = Math.max(Math.abs(tsNow - tsValue), 0) / 1000;
+    if (now && tsValue) {
+      const elapsed = Math.max(Math.abs(now - tsValue), 0) / 1000;
 
       if (elapsed < 15) {
         display = `${elapsed.toFixed(1)}s`;
diff --git a/packages/ui-reactive/src/TimeNow.tsx b/packages/ui-reactive/src/TimeNow.tsx
index 934017bef4..93893515d5 100644
--- a/packages/ui-reactive/src/TimeNow.tsx
+++ b/packages/ui-reactive/src/TimeNow.tsx
@@ -3,10 +3,10 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { Moment } from '@polkadot/types/interfaces';
 import { BareProps, CallProps } from '@polkadot/ui-api/types';
 
 import React from 'react';
-import { Moment } from '@polkadot/types';
 import { withCalls } from '@polkadot/ui-api';
 
 import Elapsed from './Elapsed';
@@ -19,7 +19,10 @@ type Props = BareProps & CallProps & {
 
 export class TimeNow extends React.PureComponent<Props> {
   public render (): React.ReactNode {
-    const { children, className, label = '', style, timestamp_now } = this.props;
+    const { children, className, isSubstrateV2, label = '', style, timestamp_now } = this.props;
+    const value = isSubstrateV2 || !timestamp_now
+      ? timestamp_now
+      : timestamp_now.muln(1000); // for 1.x, timestamps are in seconds
 
     return (
       <div
@@ -27,7 +30,7 @@ export class TimeNow extends React.PureComponent<Props> {
         style={style}
       >
         {label}
-        <Elapsed value={timestamp_now} />
+        <Elapsed value={value} />
         {children}
       </div>
     );
diff --git a/packages/ui-reactive/src/TimePeriod.tsx b/packages/ui-reactive/src/TimePeriod.tsx
index 529d31553b..934cec4afd 100644
--- a/packages/ui-reactive/src/TimePeriod.tsx
+++ b/packages/ui-reactive/src/TimePeriod.tsx
@@ -3,10 +3,10 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { Moment } from '@polkadot/types/interfaces';
 import { BareProps, CallProps } from '@polkadot/ui-api/types';
 
 import React from 'react';
-import { Moment } from '@polkadot/types';
 import { withCalls } from '@polkadot/ui-api';
 import { formatNumber } from '@polkadot/util';
 
diff --git a/packages/ui-reactive/src/TotalIssuance.tsx b/packages/ui-reactive/src/TotalIssuance.tsx
index 5b6dd07f18..c02a88e7bc 100644
--- a/packages/ui-reactive/src/TotalIssuance.tsx
+++ b/packages/ui-reactive/src/TotalIssuance.tsx
@@ -4,9 +4,9 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { BareProps, CallProps } from '@polkadot/ui-api/types';
+import { Balance } from '@polkadot/types/interfaces';
 
 import React from 'react';
-import { Balance } from '@polkadot/types';
 import { withCalls } from '@polkadot/ui-api';
 import { formatBalance } from '@polkadot/util';
 
diff --git a/packages/ui-signer/src/ApiSigner.ts b/packages/ui-signer/src/ApiSigner.ts
index a5d4b4e23c..08430ad319 100644
--- a/packages/ui-signer/src/ApiSigner.ts
+++ b/packages/ui-signer/src/ApiSigner.ts
@@ -5,8 +5,9 @@
 import { Signer, SignerPayload, SignerResult } from '@polkadot/api/types';
 import { SubmittableResult } from '@polkadot/api';
 import { QueueTxPayloadAdd, QueueTxMessageSetStatus, QueueTxStatus } from '@polkadot/ui-app/Status/types';
+import { Hash } from '@polkadot/types/interfaces';
 
-import { Hash } from '@polkadot/types';
+import { ClassOf } from '@polkadot/types';
 
 export default class ApiSigner implements Signer {
   private _queuePayload: QueueTxPayloadAdd;
@@ -31,7 +32,7 @@ export default class ApiSigner implements Signer {
   }
 
   public update (id: number, result: Hash | SubmittableResult): void {
-    if (result instanceof Hash) {
+    if (result instanceof ClassOf('Hash')) {
       this._queueSetTxStatus(id, 'sent', result.toHex());
     } else {
       this._queueSetTxStatus(id, result.status.type.toLowerCase() as QueueTxStatus, status);
diff --git a/packages/ui-signer/src/Checks/constants.ts b/packages/ui-signer/src/Checks/constants.ts
index f1a089a489..ca602a98dd 100644
--- a/packages/ui-signer/src/Checks/constants.ts
+++ b/packages/ui-signer/src/Checks/constants.ts
@@ -5,11 +5,11 @@
 import { DerivedFees, DerivedBalances, DerivedContractFees } from '@polkadot/api-derive/types';
 
 import BN from 'bn.js';
-import { AccountId, Nonce } from '@polkadot/types';
+import { createType } from '@polkadot/types';
 
 const ZERO_BALANCE: DerivedBalances = {
-  accountId: new AccountId(),
-  accountNonce: new Nonce(0),
+  accountId: createType('AccountId'),
+  accountNonce: createType('Index'),
   availableBalance: new BN(0),
   lockedBalance: new BN(0),
   freeBalance: new BN(0),
diff --git a/packages/ui-signer/src/Checks/index.tsx b/packages/ui-signer/src/Checks/index.tsx
index d6d991adfc..a3da01c622 100644
--- a/packages/ui-signer/src/Checks/index.tsx
+++ b/packages/ui-signer/src/Checks/index.tsx
@@ -3,6 +3,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { ApiProps } from '@polkadot/ui-api/types';
 import { I18nProps } from '@polkadot/ui-app/types';
 import { DerivedFees, DerivedBalances, DerivedContractFees } from '@polkadot/api-derive/types';
 import { IExtrinsic } from '@polkadot/types/types';
@@ -10,7 +11,7 @@ import { ExtraFees } from './types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { Compact, Method, UInt } from '@polkadot/types';
+import { Compact, UInt } from '@polkadot/types';
 import { withCalls } from '@polkadot/ui-api';
 import { Icon } from '@polkadot/ui-app';
 import { compactToU8a, formatBalance } from '@polkadot/util';
@@ -34,7 +35,7 @@ interface State extends ExtraFees {
   overLimit: boolean;
 }
 
-interface Props extends I18nProps {
+interface Props extends ApiProps, I18nProps {
   balances_fees?: DerivedFees;
   balances_all?: DerivedBalances;
   contract_fees?: DerivedContractFees;
@@ -70,12 +71,12 @@ export class FeeDisplay extends React.PureComponent<Props, State> {
     overLimit: false
   };
 
-  public static getDerivedStateFromProps ({ accountId, balances_all = ZERO_BALANCE, extrinsic, balances_fees = ZERO_FEES_BALANCES, system_accountNonce = new BN(0) }: Props, prevState: State): State | null {
+  public static getDerivedStateFromProps ({ accountId, balances_all = ZERO_BALANCE, api, extrinsic, balances_fees = ZERO_FEES_BALANCES, system_accountNonce = new BN(0) }: Props, prevState: State): State | null {
     if (!accountId || !extrinsic) {
       return null;
     }
 
-    const fn = Method.findFunction(extrinsic.callIndex);
+    const fn = api.findCall(extrinsic.callIndex);
     const extMethod = fn.method;
     const extSection = fn.section;
     const txLength = calcSignatureLength(extrinsic, system_accountNonce);
diff --git a/packages/ui-signer/src/Modal.tsx b/packages/ui-signer/src/Modal.tsx
index 6da1e88912..9729392481 100644
--- a/packages/ui-signer/src/Modal.tsx
+++ b/packages/ui-signer/src/Modal.tsx
@@ -14,6 +14,7 @@ import { QueueTx, QueueTxMessageSetStatus, QueueTxResult, QueueTxStatus } from '
 
 import React from 'react';
 import { web3FromSource } from '@polkadot/extension-dapp';
+import { createType } from '@polkadot/types';
 import { Button, Modal } from '@polkadot/ui-app';
 import { withApi, withMulti, withObservable } from '@polkadot/ui-api';
 import keyring from '@polkadot/ui-keyring';
@@ -24,7 +25,6 @@ import PasswordCheck from './PasswordCheck';
 import Transaction from './Transaction';
 import translate from './translate';
 import Unlock from './Unlock';
-import { SignaturePayload } from '@polkadot/types';
 
 interface BaseProps extends BareProps {
   queue: QueueTx[];
@@ -389,7 +389,7 @@ class Signer extends React.PureComponent<Props, State> {
   private async makeExtrinsicSignature (payload: SignerPayload, { id, signerCb }: QueueTx, pair: KeyringPair): Promise<void> {
     console.log('makeExtrinsicSignature: payload ::', JSON.stringify(payload));
 
-    const result = new SignaturePayload(payload, { version: payload.version }).sign(pair);
+    const result = createType('ExtrinsicPayload', payload, { version: payload.version }).sign(pair);
 
     if (isFunction(signerCb)) {
       signerCb(id, { id, ...result });
diff --git a/packages/ui-signer/src/Transaction.tsx b/packages/ui-signer/src/Transaction.tsx
index e307381476..9b182ddaf0 100644
--- a/packages/ui-signer/src/Transaction.tsx
+++ b/packages/ui-signer/src/Transaction.tsx
@@ -6,7 +6,7 @@ import { I18nProps } from '@polkadot/ui-app/types';
 import { QueueTx } from '@polkadot/ui-app/Status/types';
 
 import React from 'react';
-import { Method } from '@polkadot/types';
+import { GenericCall } from '@polkadot/types';
 import { Call, InputAddress, Modal } from '@polkadot/ui-app';
 
 import Checks from './Checks';
@@ -26,7 +26,7 @@ class Transaction extends React.PureComponent<Props> {
       return null;
     }
 
-    const { meta, method, section } = Method.findFunction(extrinsic.callIndex);
+    const { meta, method, section } = GenericCall.findFunction(extrinsic.callIndex);
 
     return (
       <>
diff --git a/tsconfig.json b/tsconfig.json
index b1090709ce..a79f37bb4e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -49,8 +49,6 @@
       "@polkadot/ui-contracts/*": [ "packages/ui-contracts/src/*" ],
       "@polkadot/ui-params": [ "packages/ui-params/src" ],
       "@polkadot/ui-params/*": [ "packages/ui-params/src/*" ],
-      "@polkadot/ui-qr": [ "packages/ui-qr/src" ],
-      "@polkadot/ui-qr/*": [ "packages/ui-qr/src/*" ],
       "@polkadot/ui-reactive": [ "packages/ui-reactive/src" ],
       "@polkadot/ui-reactive/*": [ "packages/ui-reactive/src/*" ],
       "@polkadot/ui-signer": [ "packages/ui-signer/src" ],
diff --git a/yarn.lock b/yarn.lock
index a340b7a07d..d2c6c7dc0b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1873,45 +1873,45 @@
     universal-user-agent "^3.0.0"
     url-template "^2.0.8"
 
-"@polkadot/api-contract@^0.82.0-beta.95":
-  version "0.82.0-beta.95"
-  resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.82.0-beta.95.tgz#9525cb3c2197f06b0295895c623ed628f6739964"
-  integrity sha512-vHXNI7rxM66qFoO75wtcr3XmNMHtSejHGPRtVRpru483mnubzz6I9UJvwYsr2n7HRM+6TlnwHRAkiIcNahasdw==
+"@polkadot/api-contract@^0.90.0-beta.1":
+  version "0.90.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.90.0-beta.1.tgz#026f14644dba1f20456e52e06453260d54a47a7e"
+  integrity sha512-8HTETkvHEdXxYxGQQ01qYz+1dsJSUe8KGbngvai2Le4Jp0Yvp8AGoKucsIfbfbB3u9aOdKzK/wq4KLRrYTO2AA==
   dependencies:
     "@babel/runtime" "^7.5.5"
-    "@polkadot/types" "^0.82.0-beta.95"
+    "@polkadot/types" "^0.90.0-beta.1"
 
-"@polkadot/api-derive@^0.82.0-beta.95":
-  version "0.82.0-beta.95"
-  resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.82.0-beta.95.tgz#e71b6cffdb04daf2849bb309fb7f89781ea41839"
-  integrity sha512-mQoVdJhHxhwO9vIIUNZLXKlQ4yOV49wGUF0/+Y6FfDFnU0RwNEvwKhiXqWI78aIsdQm+1BZJfyxgbQxIiEJfdg==
+"@polkadot/api-derive@^0.90.0-beta.1":
+  version "0.90.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.90.0-beta.1.tgz#8852a2f513eb88ed172971dec500e483b0a10ae1"
+  integrity sha512-78aL+WOCldIy5/CQ4V5R7sFwzcHYz5LpADFAV+Uyeeu7OmWm8S9KuTr4QuFdzeIAvcujQULih2A0fetd9691ng==
   dependencies:
     "@babel/runtime" "^7.5.5"
-    "@polkadot/api" "^0.82.0-beta.95"
-    "@polkadot/types" "^0.82.0-beta.95"
+    "@polkadot/api" "^0.90.0-beta.1"
+    "@polkadot/types" "^0.90.0-beta.1"
 
-"@polkadot/api-metadata@^0.82.0-beta.95":
-  version "0.82.0-beta.95"
-  resolved "https://registry.yarnpkg.com/@polkadot/api-metadata/-/api-metadata-0.82.0-beta.95.tgz#362075ff215efd5740a3a3d540eae6ce6acbb24e"
-  integrity sha512-+jSAJux1hbaZ0qpS5qg0Yy7cav3UZOrnD+6Jl9OjAorzm2iLDgAwH3BPrSnGXOYSbeQqQi32XsiHskPR249cTw==
+"@polkadot/api-metadata@^0.90.0-beta.1":
+  version "0.90.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/api-metadata/-/api-metadata-0.90.0-beta.1.tgz#7758347218df62a127f5b65c5c27682d03e08fcb"
+  integrity sha512-lSszzgk1umq+OOdFGuFRMAT5RrRJzL6dKCBfpS8DHdwDHpuRkjn6duVPEcZog8krDbqySXgu9jnC6czdvTMraQ==
   dependencies:
     "@babel/runtime" "^7.5.5"
-    "@polkadot/types" "^0.82.0-beta.95"
-    "@polkadot/util" "^0.94.1"
-    "@polkadot/util-crypto" "^0.94.1"
+    "@polkadot/types" "^0.90.0-beta.1"
+    "@polkadot/util" "^0.95.0-beta.2"
+    "@polkadot/util-crypto" "^0.95.0-beta.2"
 
-"@polkadot/api@^0.82.0-beta.95":
-  version "0.82.0-beta.95"
-  resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.82.0-beta.95.tgz#b1d0db1272250214c65addd913dc4bfe05571f63"
-  integrity sha512-QT290eyWzYBC3TMPQ+gzt34kgM8NSicPgRrf+ELYNQfaQxFaEWjJpUiQDLua3/zJD8exy5kTngiymv69NKS08A==
+"@polkadot/api@^0.90.0-beta.1":
+  version "0.90.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.90.0-beta.1.tgz#b0eec9869303af556a57abd5105a5821bfda6acf"
+  integrity sha512-6zhtAqk79/PMY8qdO7dsqcA00fd7brIneoegaU1BGQGnoAqexJmSy4Fgxg6YUoAk7NpFV0VCz+8q2wU+fyMXIQ==
   dependencies:
     "@babel/runtime" "^7.5.5"
-    "@polkadot/api-derive" "^0.82.0-beta.95"
-    "@polkadot/api-metadata" "^0.82.0-beta.95"
-    "@polkadot/rpc-core" "^0.82.0-beta.95"
-    "@polkadot/rpc-provider" "^0.82.0-beta.95"
-    "@polkadot/types" "^0.82.0-beta.95"
-    "@polkadot/util-crypto" "^0.94.1"
+    "@polkadot/api-derive" "^0.90.0-beta.1"
+    "@polkadot/api-metadata" "^0.90.0-beta.1"
+    "@polkadot/rpc-core" "^0.90.0-beta.1"
+    "@polkadot/rpc-provider" "^0.90.0-beta.1"
+    "@polkadot/types" "^0.90.0-beta.1"
+    "@polkadot/util-crypto" "^0.95.0-beta.2"
 
 "@polkadot/dev-react@^0.30.0-beta.23":
   version "0.30.0-beta.23"
@@ -1998,55 +1998,69 @@
     typescript "^3.5.3"
     vuepress "^1.0.2"
 
-"@polkadot/extension-dapp@^0.5.0-beta.5":
-  version "0.5.0-beta.5"
-  resolved "https://registry.yarnpkg.com/@polkadot/extension-dapp/-/extension-dapp-0.5.0-beta.5.tgz#ee70906ea946f84fe9e29f4f0256212a98bda622"
-  integrity sha512-GWXWBD8zz1h8ASKKhjUxKGsYVN02J/TRY0M47sNhV4wbuCQmt7HCX5KZ7ExxEyu1DTJDNhV0l7s63cobemhnQg==
+"@polkadot/extension-dapp@^0.5.1":
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/extension-dapp/-/extension-dapp-0.5.1.tgz#e8f880d670ab2433db2b885731effeb727e84d7e"
+  integrity sha512-yQPXqdbT9xHHGehICl0vBuQhjs/yEuCErOSU/FQJ4xcqSBaLaLntAIh51gp15/kVvA9S2+R6fBDbB5zeQbl4lA==
   dependencies:
-    "@polkadot/extension-inject" "^0.5.0-beta.5"
+    "@polkadot/extension-inject" "^0.5.1"
 
-"@polkadot/extension-inject@^0.5.0-beta.5":
-  version "0.5.0-beta.5"
-  resolved "https://registry.yarnpkg.com/@polkadot/extension-inject/-/extension-inject-0.5.0-beta.5.tgz#2d3c4e3dcfa6918a6e0e430dc78eae9467143ebb"
-  integrity sha512-DxNw27JXGfIc3X4tXiVqcrNaKX9U37LwAY8BBjT3WeuZCCGBXHM7jEvlKH2lOtPeD8f6tmqit8JzGNBfdd96rw==
+"@polkadot/extension-inject@^0.5.1":
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/extension-inject/-/extension-inject-0.5.1.tgz#d5756fdd0b073cbdc34342205124a47c10884235"
+  integrity sha512-nXOHLr8InlVauz5EPuYGtfTkj7ZwBeAYFBgOEkcMQSKS9KXapNyIZz0LYiTJB2YKwSWlsxlZjg0ek06QWcnlmg==
 
-"@polkadot/jsonrpc@^0.82.0-beta.95":
-  version "0.82.0-beta.95"
-  resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.82.0-beta.95.tgz#601fffab84afe83070aa416e25db0b530c1d3269"
-  integrity sha512-qw3DVfGNaaC5VK0ZDhsS2GWjNbrc3tJSYU6wXq4Cu1u7I09jU+Ru9HgYN1h1KNEATznTlhrdaLliFbdkZjDaTg==
+"@polkadot/jsonrpc@^0.90.0-beta.1":
+  version "0.90.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.90.0-beta.1.tgz#f0ac34c1b8eed2d884f346a0353aae8d911d46b4"
+  integrity sha512-7RcmTXQn+5CDZhePzCpzDu1XKR2orv31hJ54vvXVNVnuAVAKUNvx1oVMgRMM25rX6bAL571k0kpDTOISkwWxgA==
   dependencies:
     "@babel/runtime" "^7.5.5"
 
-"@polkadot/keyring@^0.95.0-beta.0":
-  version "0.95.0-beta.0"
-  resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-0.95.0-beta.0.tgz#0ca6bf7f2e530f8520ec307231a69fb6dc228228"
-  integrity sha512-zzzkfJXb3be1LLU2u23aR50ndbFlMqwnzSDn5p+ytbDA8ekTHRjdN9IjPP1VdFvPyqD3kLLhUn4c6+OLh62hsQ==
+"@polkadot/keyring@^0.95.0-beta.2":
+  version "0.95.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-0.95.0-beta.2.tgz#fc3dde2bb45fabb0ee992c060c7c692ee27436da"
+  integrity sha512-EeDIE4XeWGCviRwLBVJ1EvQvwzNvDh9PZrk0Ed0TRERTg+x3tC8s7pkSqKXzElmQqliXMJmpkTKcH/YEnyTN0Q==
   dependencies:
     "@babel/runtime" "^7.5.5"
-    "@polkadot/util" "^0.95.0-beta.0"
-    "@polkadot/util-crypto" "^0.95.0-beta.0"
+    "@polkadot/util" "^0.95.0-beta.2"
+    "@polkadot/util-crypto" "^0.95.0-beta.2"
 
-"@polkadot/rpc-core@^0.82.0-beta.95":
-  version "0.82.0-beta.95"
-  resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.82.0-beta.95.tgz#9bc345b002939b0ca9269c4ebf5445bad977925d"
-  integrity sha512-wf8Mjn2tdMnv3j7mAqoaGA9P5S9ZsfJYcDfwWamm4XHq+LmGJXrJUgAjwfY5R13BWW1kA+5bgdg0m5DSRSpi8Q==
+"@polkadot/react-identicon@^0.42.0-beta.19":
+  version "0.42.0-beta.19"
+  resolved "https://registry.yarnpkg.com/@polkadot/react-identicon/-/react-identicon-0.42.0-beta.19.tgz#1d148bc1c6175c5f7a8d1f7d5920856f70342a28"
+  integrity sha512-To5G8lDYserSghCKEc+p24i218F9KFViuRTezi6F4KppS10/EOyLelTx2jfOX1AaUEaWnqFHnEytWuKQX0l9tA==
   dependencies:
     "@babel/runtime" "^7.5.5"
-    "@polkadot/jsonrpc" "^0.82.0-beta.95"
-    "@polkadot/rpc-provider" "^0.82.0-beta.95"
-    "@polkadot/types" "^0.82.0-beta.95"
-    "@polkadot/util" "^0.94.1"
+    "@polkadot/ui-settings" "^0.42.0-beta.19"
+    "@types/color" "^3.0.0"
+    "@types/react-copy-to-clipboard" "^4.2.6"
+    color "^3.1.2"
+    jdenticon "2.1.1"
+    react-copy-to-clipboard "^5.0.1"
+    styled-components "^4.3.1"
+
+"@polkadot/rpc-core@^0.90.0-beta.1":
+  version "0.90.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.90.0-beta.1.tgz#4b7569489c20a31d7eb2f38ff1b10a1c224b0c57"
+  integrity sha512-/5XN/LhKAC6Ec6CLGQMZY7LdhKPVmEhKsEfv9YP7KBJed/NV9CuY0ffCXYkQHy+QGOuH+N65oFTFD33brdgEGQ==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    "@polkadot/jsonrpc" "^0.90.0-beta.1"
+    "@polkadot/rpc-provider" "^0.90.0-beta.1"
+    "@polkadot/types" "^0.90.0-beta.1"
+    "@polkadot/util" "^0.95.0-beta.2"
     rxjs "^6.5.2"
 
-"@polkadot/rpc-provider@^0.82.0-beta.95":
-  version "0.82.0-beta.95"
-  resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.82.0-beta.95.tgz#d581f7800a3c41107db87a91bc92cb91248a1299"
-  integrity sha512-dA5dlwWyuvJaP84k+Ffg/a7kdB4OrdCOrMs6XJGUEEM+JCiaxrE9RYDoMzOrptkE+Rz60gtkiQ95Uv4xIEzYYA==
+"@polkadot/rpc-provider@^0.90.0-beta.1":
+  version "0.90.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.90.0-beta.1.tgz#c64a99bdcf8373d18bff8b431029f50928c0e1ba"
+  integrity sha512-PTCR2R48JvYzPXSOSKjeQPvLHRmtAxmvuUujPxlnJO5eNhbsbJ3e/pXyipanoO3bc3CGndtiNNEDZM6MvHHuCw==
   dependencies:
     "@babel/runtime" "^7.5.5"
-    "@polkadot/api-metadata" "^0.82.0-beta.95"
-    "@polkadot/util" "^0.94.1"
-    "@polkadot/util-crypto" "^0.94.1"
+    "@polkadot/api-metadata" "^0.90.0-beta.1"
+    "@polkadot/util" "^0.95.0-beta.2"
+    "@polkadot/util-crypto" "^0.95.0-beta.2"
     "@types/nock" "^10.0.3"
     eventemitter3 "^4.0.0"
     isomorphic-fetch "^2.2.1"
@@ -2059,42 +2073,28 @@
   dependencies:
     "@types/chrome" "^0.0.86"
 
-"@polkadot/types@^0.82.0-beta.95":
-  version "0.82.0-beta.95"
-  resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.82.0-beta.95.tgz#15868fa423e15aee73e626918f30e824c70beb0c"
-  integrity sha512-HmwJ7GuUxxzA21jB81WJG4uUqTanLUgUlNe8JTyFy+fEl1JLun1Y1fAA79fH5OqIbLJpcHt3kt6fVxg84NlcNw==
+"@polkadot/types@^0.90.0-beta.1":
+  version "0.90.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.90.0-beta.1.tgz#7d70e07c34e04d6be4ef9aaee706df29d05f9576"
+  integrity sha512-0XipN9z21KXgg79HyCCF0APOPvx4MhD0DkGN4zUZJi/ZaGNH/aEcjMDqnWNZZyXVSb80srQNPa/HosDR8qxmKA==
   dependencies:
     "@babel/runtime" "^7.5.5"
-    "@polkadot/util" "^0.94.1"
-    "@polkadot/util-crypto" "^0.94.1"
+    "@polkadot/util" "^0.95.0-beta.2"
+    "@polkadot/util-crypto" "^0.95.0-beta.2"
     "@types/memoizee" "^0.4.2"
     memoizee "^0.4.14"
 
-"@polkadot/ui-assets@^0.42.0-beta.16":
-  version "0.42.0-beta.16"
-  resolved "https://registry.yarnpkg.com/@polkadot/ui-assets/-/ui-assets-0.42.0-beta.16.tgz#409d55583a15ef4d3316cb2822c1c359e7fe1c72"
-  integrity sha512-DbxCgt8vddNOx5N/4rz6qEYq2Vih4zyq1nXnJNypHuLLZDRVFtibAoe7FazOrrRwb5gW8+p7jdRIzpJ7FSxruQ==
+"@polkadot/ui-assets@^0.42.0-beta.19":
+  version "0.42.0-beta.19"
+  resolved "https://registry.yarnpkg.com/@polkadot/ui-assets/-/ui-assets-0.42.0-beta.19.tgz#1c48fe4786bc87ebb6c6f19076baf16333bd72da"
+  integrity sha512-glPsrW4eUsmbtmnPkJRrMZV/mu4+W2EgJkqKdYBfw3MTR10lUK5K36xbtsJa3RltoTozfwhfs4aPQlKla5O8KA==
   dependencies:
     "@babel/runtime" "^7.5.5"
 
-"@polkadot/ui-identicon@^0.42.0-beta.16":
-  version "0.42.0-beta.16"
-  resolved "https://registry.yarnpkg.com/@polkadot/ui-identicon/-/ui-identicon-0.42.0-beta.16.tgz#c857600e145e8a0c151152a0768552deb0f5d13c"
-  integrity sha512-2dQ2pvyvMsyW1cW9nneER4w4J683YbHk9KMLOVIwyadNIsuhXPoo7ZP0DSnbdqZlKnR7XlUlyeTZFcw8bR9mpQ==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-    "@polkadot/ui-settings" "^0.42.0-beta.16"
-    "@types/color" "^3.0.0"
-    "@types/react-copy-to-clipboard" "^4.2.6"
-    color "^3.1.2"
-    jdenticon "2.1.1"
-    react-copy-to-clipboard "^5.0.1"
-    styled-components "^4.3.1"
-
-"@polkadot/ui-keyring@^0.42.0-beta.16":
-  version "0.42.0-beta.16"
-  resolved "https://registry.yarnpkg.com/@polkadot/ui-keyring/-/ui-keyring-0.42.0-beta.16.tgz#37b533d6ef16d7495da86e9a99b075e761ee059e"
-  integrity sha512-Qa3NER6rzxtal0X7Qeox24yW4uiNuEcjXtgK5f9GL7PUXl7E/1m53TdL34TtnL3D3PI34CNmAPacjF8gce5usQ==
+"@polkadot/ui-keyring@^0.42.0-beta.19":
+  version "0.42.0-beta.19"
+  resolved "https://registry.yarnpkg.com/@polkadot/ui-keyring/-/ui-keyring-0.42.0-beta.19.tgz#210bc05957b7acba072aa5c28b5859477343981a"
+  integrity sha512-6EijPEjJ84zWqZWRcgwMjY6GZ8WlAO5gTNE2atF2nkNEbZ1V3H6ecZml6dymdP0+LJueb6eTx/bs9NCZPs0J6g==
   dependencies:
     "@babel/runtime" "^7.5.5"
     "@types/mkdirp" "^0.5.2"
@@ -2104,22 +2104,22 @@
     store "^2.0.12"
     styled-components "^4.3.1"
 
-"@polkadot/ui-settings@^0.42.0-beta.16":
-  version "0.42.0-beta.16"
-  resolved "https://registry.yarnpkg.com/@polkadot/ui-settings/-/ui-settings-0.42.0-beta.16.tgz#f126334444dabc9281b79525259c9868d404fda1"
-  integrity sha512-88s33bUEGCvZ8c7oQOuHzP1u+wNjXQEyIp4oC+kW3UB+3N+WDxOL92uUuQfF7+NJTh5WUVoKQ7hvVBtzSbLwCA==
+"@polkadot/ui-settings@^0.42.0-beta.19":
+  version "0.42.0-beta.19"
+  resolved "https://registry.yarnpkg.com/@polkadot/ui-settings/-/ui-settings-0.42.0-beta.19.tgz#6d4f6885ec88b48c5cc0aff068be8f79b14f25d5"
+  integrity sha512-dzeWXN33A7VEnYY5YjmRztVuy5pfwPAIhwW+8/B71Nd4yQl0sjJKIIebHYHJhkoQiN5Zw7l4zOrA0TxaCX1+OQ==
   dependencies:
     "@babel/runtime" "^7.5.5"
     "@types/store" "^2.0.2"
     store "^2.0.12"
 
-"@polkadot/util-crypto@^0.94.1", "@polkadot/util-crypto@^0.95.0-beta.0":
-  version "0.95.0-beta.0"
-  resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.95.0-beta.0.tgz#4911b4f0e9efc2b5aac12d0c89f1d4cd5020e954"
-  integrity sha512-3/n75W8UjIIYUnuD0MoZKd5CWuMpzo2xCLXtiiWdki81+tVlGeko2TSiNuaHGTpEA6wt1yOc56x0l3x5hGfF4Q==
+"@polkadot/util-crypto@^0.95.0-beta.2":
+  version "0.95.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.95.0-beta.2.tgz#74ce062bf9ad6325b7fa0f2bc1bfd6759044036f"
+  integrity sha512-P7Q0fCwhxJGUfISjUs2C2Cfz6zDjbGWfwOIOTXrvcDkuT+NXrfCxMpm70N5H4Rsu1WNEwlJegDyzg1HFL9cWVQ==
   dependencies:
     "@babel/runtime" "^7.5.5"
-    "@polkadot/util" "^0.95.0-beta.0"
+    "@polkadot/util" "^0.95.0-beta.2"
     "@polkadot/wasm-crypto" "^0.13.1"
     "@types/bip39" "^2.4.2"
     "@types/bs58" "^4.0.0"
@@ -2135,10 +2135,10 @@
     tweetnacl "^1.0.1"
     xxhashjs "^0.2.2"
 
-"@polkadot/util@^0.94.1", "@polkadot/util@^0.95.0-beta.0":
-  version "0.95.0-beta.0"
-  resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.95.0-beta.0.tgz#b80a82da38b8b256ac475e6998b80963c6e487de"
-  integrity sha512-UjNPffq+i+5TAxa0JIDGlAVhDS2wKe8zQYXp7m4MTNaozYnhjM2H7Xs/QWd03FoMMYPRkX1cXJYgeXytFjnmfw==
+"@polkadot/util@^0.95.0-beta.2":
+  version "0.95.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.95.0-beta.2.tgz#50b56475206e9d1fdb641dd609f5ccbae21b08ab"
+  integrity sha512-yw4hERjg7O0Rm33MbVrlIyBmpmNuzc+tJ9t8cEUXfZO1Q0AQFVa2zd6KnKDWFJ2BkQJQTRWgYuUvUgGhFGr1nw==
   dependencies:
     "@babel/runtime" "^7.5.5"
     "@types/bn.js" "^4.11.5"
@@ -2438,13 +2438,6 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-qr-reader@^2.1.1":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@types/react-qr-reader/-/react-qr-reader-2.1.2.tgz#da7a674cf9e3ceb1c026e89d5aa41fb1587fc66b"
-  integrity sha512-tDLqqiQMZlTKBKtWedcf7QZ3L9fyz8nPHNq/j+1mcJoEvrdM3Y89i3/FKwdmZ4H7G6uUk4JqShpWXLCuYpZK+w==
-  dependencies:
-    "@types/react" "*"
-
 "@types/react-router-dom@^4.3.2":
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-4.3.4.tgz#63a7a8558129d2f4ff76e4bdd099bf4b98e25a0d"
@@ -9073,11 +9066,6 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
-jsqr@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/jsqr/-/jsqr-1.2.0.tgz#f93fc65fa7d1ded78b1bcb020fa044352b04261a"
-  integrity sha512-wKcQS9QC2VHGk7aphWCp1RrFyC0CM6fMgC5prZZ2KV/Lk6OKNoCod9IR6bao+yx3KPY0gZFC5dc+h+KFzCI0Wg==
-
 jstransform@^11.0.3:
   version "11.0.3"
   resolved "https://registry.yarnpkg.com/jstransform/-/jstransform-11.0.3.tgz#09a78993e0ae4d4ef4487f6155a91f6190cb4223"
@@ -12275,11 +12263,6 @@ q@^1.1.2, q@^1.5.1:
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
-qrcode-generator@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/qrcode-generator/-/qrcode-generator-1.4.3.tgz#4876e8f280e65b6c94615f4c19c484f6b964b199"
-  integrity sha512-++rVRvMRq5BlHfmAafl8a4ppUntzUxCCUTT2t0siUgqKwdnqRzY8IH6f6WSX5dZUhD2Ul5/MIKuTJddflwrGzw==
-
 qs@6.7.0:
   version "6.7.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
@@ -12501,15 +12484,6 @@ react-popper@^1.3.3:
     typed-styles "^0.0.7"
     warning "^4.0.2"
 
-react-qr-reader@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/react-qr-reader/-/react-qr-reader-2.2.1.tgz#dc89046d1c1a1da837a683dd970de5926817d55b"
-  integrity sha512-EL5JEj53u2yAOgtpAKAVBzD/SiKWn0Bl7AZy6ZrSf1lub7xHwtaXe6XSx36Wbhl1VMGmvmrwYMRwO1aSCT2fwA==
-  dependencies:
-    jsqr "^1.2.0"
-    prop-types "^15.7.2"
-    webrtc-adapter "^7.2.1"
-
 react-router-dom@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.0.1.tgz#ee66f4a5d18b6089c361958e443489d6bab714be"
@@ -13119,13 +13093,6 @@ rsvp@^4.8.4:
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
   integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
 
-rtcpeerconnection-shim@^1.2.15:
-  version "1.2.15"
-  resolved "https://registry.yarnpkg.com/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.15.tgz#e7cc189a81b435324c4949aa3dfb51888684b243"
-  integrity sha512-C6DxhXt7bssQ1nHb154lqeL0SXz5Dx4RczXZu2Aa/L1NJFnEVDxFwCBo3fqtuljhHIGceg5JKBV4XJ0gW5JKyw==
-  dependencies:
-    sdp "^2.6.0"
-
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
@@ -13232,11 +13199,6 @@ schema-utils@^2.0.0:
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
 
-sdp@^2.6.0, sdp@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/sdp/-/sdp-2.9.0.tgz#2eed2d9c0b26c81ff87593107895c68d6fb9a0a6"
-  integrity sha512-XAVZQO4qsfzVTHorF49zCpkdxiGmPNjA8ps8RcJGtGP3QJ/A8I9/SVg/QnkAFDMXIyGbHZBBFwYBw6WdnhT96w==
-
 secp256k1@^3.7.0:
   version "3.7.1"
   resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-3.7.1.tgz#12e473e0e9a7c2f2d4d4818e722ad0e14cc1e2f1"
@@ -15456,14 +15418,6 @@ webpackbar@3.2.0:
     text-table "^0.2.0"
     wrap-ansi "^5.1.0"
 
-webrtc-adapter@^7.2.1:
-  version "7.2.8"
-  resolved "https://registry.yarnpkg.com/webrtc-adapter/-/webrtc-adapter-7.2.8.tgz#1373fa874559c655aa713830c2836511588d77ab"
-  integrity sha512-d/rZVIIqqPqu/1I9rabhI+hmVhNtT+MoJk0eipCJasiVM9L9ZOTBoVhZmtC/naB4G8GTvnCaassrDz5IqWZP6w==
-  dependencies:
-    rtcpeerconnection-shim "^1.2.15"
-    sdp "^2.9.0"
-
 websocket-driver@>=0.5.1:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz#a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"