From 416d7bbb16dc11d93e92304abf51fd5f133878c4 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Thu, 13 Sep 2018 13:10:31 +0200
Subject: [PATCH] Parity Substrate theming (#296)

* Parity Substrate logo (THEME)

* Remove unused type

* Adjust page title based on theme

* Allow theme overrides

* Allow theme overrides on Modals

* Remove debug console log

* Page title hangs off renamed UI_THEME

* FIXME for Identicon

* UI_MODE removal of apps

* Update deps (after merge)

* Bump deps
---
 packages/app-democracy/package.json           |   4 +-
 packages/app-example/package.json             |   4 +-
 packages/app-explorer/package.json            |   4 +-
 packages/app-extrinsics/package.json          |   2 +-
 packages/app-staking/package.json             |   4 +-
 packages/apps/public/index.html               |   2 +-
 packages/apps/src/SideBar/SideBar.css         |  39 +++--
 packages/apps/src/SideBar/index.tsx           |  10 +-
 packages/apps/src/index.tsx                   |   3 +-
 packages/apps/src/routing/index.ts            |  21 ++-
 .../src/static/parity-substrate-white.svg     |   1 +
 packages/apps/src/static/parity-substrate.svg |   1 +
 packages/apps/webpack.config.js               |   7 +-
 packages/ui-app/package.json                  |   4 +-
 packages/ui-app/src/Modal.tsx                 |  28 ++-
 packages/ui-app/src/styles.ts                 |   2 +
 .../ui-app/src/styles/partials/_variables.css |  25 ---
 packages/ui-app/src/styles/semantic.css       |  76 ---------
 .../src/styles/theme/_colors-polkadot.css     |  29 ++++
 .../src/styles/theme/_colors-substrate.css    |   3 +
 packages/ui-app/src/styles/theme/polkadot.css |  84 +++++++++
 .../ui-app/src/styles/theme/substrate.css     |   8 +
 packages/ui-identicon/package.json            |   2 +-
 packages/ui-keyring/package.json              |   2 +-
 packages/ui-react-rx/package.json             |   6 +-
 packages/ui-react/package.json                |   2 +-
 packages/ui-react/src/IdentityIcon/index.tsx  |   5 +-
 packages/ui-signer/package.json               |   2 +-
 yarn.lock                                     | 160 +++++++++---------
 29 files changed, 316 insertions(+), 224 deletions(-)
 create mode 100644 packages/apps/src/static/parity-substrate-white.svg
 create mode 100644 packages/apps/src/static/parity-substrate.svg
 create mode 100644 packages/ui-app/src/styles/theme/_colors-polkadot.css
 create mode 100644 packages/ui-app/src/styles/theme/_colors-substrate.css
 create mode 100644 packages/ui-app/src/styles/theme/polkadot.css
 create mode 100644 packages/ui-app/src/styles/theme/substrate.css

diff --git a/packages/app-democracy/package.json b/packages/app-democracy/package.json
index e2a809b77e..cc43b16cb8 100644
--- a/packages/app-democracy/package.json
+++ b/packages/app-democracy/package.json
@@ -11,9 +11,9 @@
   "license": "ISC",
   "dependencies": {
     "@babel/runtime": "^7.0.0",
-    "@polkadot/storage": "^0.28.29",
+    "@polkadot/storage": "^0.28.34",
     "@polkadot/ui-react": "^0.20.2",
     "@polkadot/ui-react-rx": "^0.20.2",
-    "@polkadot/util-keyring": "^0.29.33"
+    "@polkadot/util-keyring": "^0.30.2"
   }
 }
diff --git a/packages/app-example/package.json b/packages/app-example/package.json
index 7daff474c4..68b008c731 100644
--- a/packages/app-example/package.json
+++ b/packages/app-example/package.json
@@ -11,9 +11,9 @@
   "license": "ISC",
   "dependencies": {
     "@babel/runtime": "^7.0.0",
-    "@polkadot/storage": "^0.28.29",
+    "@polkadot/storage": "^0.28.34",
     "@polkadot/ui-react": "^0.20.2",
     "@polkadot/ui-react-rx": "^0.20.2",
-    "@polkadot/util-keyring": "^0.29.33"
+    "@polkadot/util-keyring": "^0.30.2"
   }
 }
diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json
index 55476c30ba..c9cdfbc0d9 100644
--- a/packages/app-explorer/package.json
+++ b/packages/app-explorer/package.json
@@ -11,8 +11,8 @@
   "license": "ISC",
   "dependencies": {
     "@babel/runtime": "^7.0.0",
-    "@polkadot/primitives": "^0.28.29",
+    "@polkadot/primitives": "^0.28.34",
     "@polkadot/ui-app": "^0.20.2",
-    "@polkadot/util-crypto": "^0.29.33"
+    "@polkadot/util-crypto": "^0.30.2"
   }
 }
diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json
index 59c9a78d90..9e529118a9 100644
--- a/packages/app-extrinsics/package.json
+++ b/packages/app-extrinsics/package.json
@@ -11,7 +11,7 @@
   "license": "ISC",
   "dependencies": {
     "@babel/runtime": "^7.0.0",
-    "@polkadot/extrinsics": "^0.28.29",
+    "@polkadot/extrinsics": "^0.28.34",
     "@polkadot/ui-app": "^0.20.2",
     "@polkadot/ui-signer": "^0.20.2"
   }
diff --git a/packages/app-staking/package.json b/packages/app-staking/package.json
index 4d2f2c2aef..98844b3328 100644
--- a/packages/app-staking/package.json
+++ b/packages/app-staking/package.json
@@ -12,11 +12,11 @@
   "dependencies": {
     "@babel/runtime": "^7.0.0",
     "@polkadot/app-extrinsics": "^0.20.2",
-    "@polkadot/storage": "^0.28.29",
+    "@polkadot/storage": "^0.28.34",
     "@polkadot/ui-app": "^0.20.2",
     "@polkadot/ui-keyring": "^0.20.2",
     "@polkadot/ui-react": "^0.20.2",
     "@polkadot/ui-react-rx": "^0.20.2",
-    "@polkadot/util-keyring": "^0.29.33"
+    "@polkadot/util-keyring": "^0.30.2"
   }
 }
diff --git a/packages/apps/public/index.html b/packages/apps/public/index.html
index bcb1e111c9..4110f68845 100644
--- a/packages/apps/public/index.html
+++ b/packages/apps/public/index.html
@@ -6,7 +6,7 @@
     <meta name="theme-color" content="#000000">
     <link rel="manifest" href="manifest.json">
     <link rel="shortcut icon" href="favicon.ico">
-    <title>Polkadot Apps Portal</title>
+    <title><%= htmlWebpackPlugin.options.PAGE_TITLE %></title>
   </head>
   <body>
     <noscript>
diff --git a/packages/apps/src/SideBar/SideBar.css b/packages/apps/src/SideBar/SideBar.css
index 34910a3bad..10527932c5 100644
--- a/packages/apps/src/SideBar/SideBar.css
+++ b/packages/apps/src/SideBar/SideBar.css
@@ -2,6 +2,9 @@
 /* This software may be modified and distributed under the terms
 /* of the ISC license. See the LICENSE file for details. */
 
+@import '../../../ui-app/src/styles/theme/_colors-polkadot.css';
+@import '../../../ui-app/src/styles/theme/_colors-substrate.css';
+
 .apps--SideBar {
   /*
   background: #fcfcfc;
@@ -13,11 +16,11 @@
   padding: 0.75em 0 0 0.75em;
   position: relative;
   text-align: left;
-}
 
-.apps--SideBar .ui.vertical.menu {
-  margin: 0;
-  width: auto;
+  .ui.vertical.menu {
+    margin: 0;
+    width: auto;
+  }
 }
 
 .apps--SideBar-github {
@@ -38,17 +41,14 @@
   text-align: left;
 }
 
-.apps--SideBar-Item-NavLink {
-  /*
-  color: #4E4E4E;
-  */
+a.apps--SideBar-Item-NavLink {
   color: #eee;
   display: block;
   padding: 0.75em 0.75em;
   white-space: nowrap;
 }
 
-.apps--SideBar-Item-NavLink-active {
+a.apps--SideBar-Item-NavLink-active {
   background: white;
   border-radius: 0.28571429rem 0 0 0.28571429rem;
   /*
@@ -56,10 +56,23 @@
   border-right-color: white;
   margin-right: -1px;
   */
-  color: #D75EA1;
-  /* color: inherit; */
+  color: inherit;
+
+  &:hover {
+    color: inherit;
+  }
 }
 
-.apps--SideBar-Item-NavLink:hover {
-  color: #D75EA1;
+.theme--polkadot {
+  a.apps--SideBar-Item-NavLink:hover {
+    color: $nav-link;
+  }
+
+  a.apps--SideBar-Item-NavLink-active {
+    color: $nav-link;
+
+    &:hover {
+      color: $nav-link;
+    }
+  }
 }
diff --git a/packages/apps/src/SideBar/index.tsx b/packages/apps/src/SideBar/index.tsx
index bfc1e8739c..44f06befc5 100644
--- a/packages/apps/src/SideBar/index.tsx
+++ b/packages/apps/src/SideBar/index.tsx
@@ -11,6 +11,7 @@ import Icon from '@polkadot/ui-app/Icon';
 import Menu from '@polkadot/ui-app/Menu';
 
 import polkadotLogo from '../static/polkadot-white.svg';
+import substrateLogo from '../static/parity-substrate-white.svg';
 import routing from '../routing';
 import translate from '../translate';
 import Item from './Item';
@@ -19,6 +20,13 @@ type Props = I18nProps & {
   children?: React.ReactNode
 };
 
+const LOGOS: Map<string | undefined, any> = new Map([
+  ['polkadot', polkadotLogo],
+  ['substrate', substrateLogo]
+]);
+
+const LOGO = LOGOS.get(process.env.UI_THEME) || polkadotLogo;
+
 class SideBar extends React.PureComponent<Props> {
   render () {
     const { children, t } = this.props;
@@ -32,7 +40,7 @@ class SideBar extends React.PureComponent<Props> {
           <img
             alt='polkadot'
             className='apps--SideBar-logo'
-            src={polkadotLogo}
+            src={LOGO}
           />
           {
             routing.routes
diff --git a/packages/apps/src/index.tsx b/packages/apps/src/index.tsx
index ef52b2b97a..22517450c7 100644
--- a/packages/apps/src/index.tsx
+++ b/packages/apps/src/index.tsx
@@ -9,6 +9,7 @@ import './index.css';
 import React from 'react';
 import createApp from '@polkadot/ui-app/index';
 import Signer from '@polkadot/ui-signer/index';
+import classes from '@polkadot/ui-app/util/classes';
 
 import Connecting from './Connecting';
 import Content from './Content';
@@ -19,7 +20,7 @@ type Props = BareProps & {};
 
 function App (props: Props) {
   return (
-    <div className='apps--App'>
+    <div className={classes(`theme--${process.env.UI_THEME}`, 'apps--App')}>
       <SideBar>
         <NodeInfo />
       </SideBar>
diff --git a/packages/apps/src/routing/index.ts b/packages/apps/src/routing/index.ts
index 98a15b9548..efb3f21b4f 100644
--- a/packages/apps/src/routing/index.ts
+++ b/packages/apps/src/routing/index.ts
@@ -17,9 +17,16 @@ import toolbox from './toolbox';
 import transfer from './transfer';
 import vanitygen from './vanitygen';
 
-export default ({
-  default: 'explorer',
-  routes: ([] as Routes).concat(
+const routes: Routes = process.env.UI_MODE === 'light'
+  ? ([] as Routes).concat(
+    transfer,
+    staking,
+    democracy,
+    null,
+    accounts,
+    addresses
+  )
+  : ([] as Routes).concat(
     example,
     explorer,
     transfer,
@@ -35,5 +42,11 @@ export default ({
     vanitygen,
     rpc,
     toolbox
-  )
+  );
+
+export default ({
+  default: process.env.UI_MODE === 'light'
+    ? 'transfer'
+    : 'explorer',
+  routes
 } as Routing);
diff --git a/packages/apps/src/static/parity-substrate-white.svg b/packages/apps/src/static/parity-substrate-white.svg
new file mode 100644
index 0000000000..0eb6ad15dd
--- /dev/null
+++ b/packages/apps/src/static/parity-substrate-white.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 583.86 198.77"><defs><style>.cls-1{fill:#fff;}.cls-2{mask:url(#mask);}.cls-3{fill:#eee;}.cls-4{mask:url(#mask-2-2);}</style><mask id="mask" x="168.51" y="154.5" width="27.36" height="44.26" maskUnits="userSpaceOnUse"><g id="mask-2"><polygon id="path-1" class="cls-1" points="168.51 154.5 195.88 154.5 195.88 198.77 168.51 198.77 168.51 154.5"/></g></mask><mask id="mask-2-2" x="289.49" y="154.54" width="29.03" height="44.1" maskUnits="userSpaceOnUse"><g id="mask-4"><polygon id="path-3" class="cls-1" points="289.49 154.54 318.51 154.54 318.51 198.64 289.49 198.64 289.49 154.54"/></g></mask></defs><title>parity-substrate-3</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><g id="Variation-2"><g id="Logotype"><g id="Group-3"><g class="cls-2"><path id="Fill-1" class="cls-3" d="M182.22,159.36a23.43,23.43,0,0,0-3.17.22,5.82,5.82,0,0,0-5.13,5.82v12.43c0,3,2.5,5.46,5.95,5.73.8.06,1.59.09,2.36.09s1.43,0,2.12-.08c3.57-.28,5.76-2.26,6.16-5.57a70.44,70.44,0,0,0,0-13.07,5.85,5.85,0,0,0-5-5.34A24.33,24.33,0,0,0,182.22,159.36Zm-9.11,39.41c-1.59,0-4.6-.86-4.6-4.13v-31c0-3.13,2.35-5.83,3.93-6.89a16.08,16.08,0,0,1,6.13-2,35.09,35.09,0,0,1,4.09-.27,20.41,20.41,0,0,1,4.63.5c4.54,1.05,7.3,4,8.21,8.69a21,21,0,0,1,.32,3.64l0,1.17c0,2.65.08,5.39-.05,8.09a16.53,16.53,0,0,1-1,4.9c-1.36,3.68-4.16,5.93-8.32,6.7a20,20,0,0,1-3.58.32,24,24,0,0,1-3.11-.22,8.38,8.38,0,0,1-6.08-3.45v13.93Z"/></g></g><g id="Group-6"><g class="cls-4"><path id="Fill-4" class="cls-3" d="M297.12,198.64a3.77,3.77,0,0,1-.65,0l-.78-.11,4.61-11.09a4.36,4.36,0,0,0,.44-2.76c-2.76-6.85-5.4-13.44-8.09-20.17L290,157.91c-.46-1.17-.74-2-.34-2.57s1.28-.6,2.48-.6a2.56,2.56,0,0,1,2.69,2c.62,1.58,7.77,19.61,9.1,22.91l9.14-22.72a3.31,3.31,0,0,1,3-2.39,3.62,3.62,0,0,1,1.43.31,1.32,1.32,0,0,1,.92,1.75l-15.35,38a6.31,6.31,0,0,1-6,4"/></g></g><path id="Fill-7" class="cls-3" d="M214.78,172.78c-2.05,0-3.82.06-5.12.18-3.32.3-4.6,1.54-4.69,4.59a16.18,16.18,0,0,0,0,1.88,4,4,0,0,0,4.21,4.13c.93,0,1.71.05,2.44.05s1.53,0,2.23-.06a8.29,8.29,0,0,0,6.69-3.89c1-1.53,1-3.21.95-5,0-.3,0-.6,0-.91a4.39,4.39,0,0,0-.05-.71,5.54,5.54,0,0,0-.78-.08C219.05,172.85,216.85,172.78,214.78,172.78ZM226,188.46c-1.54,0-4.45-.87-4.45-4.16v-.21l-.08.08a10.75,10.75,0,0,1-8.3,4.26l-1.44,0a28.07,28.07,0,0,1-4.37-.31,8.32,8.32,0,0,1-7.07-6.2,12.9,12.9,0,0,1,0-7.36,7.76,7.76,0,0,1,6.92-5.9,68,68,0,0,1,7.87-.41c2,0,4,.06,5.7.19l.39,0a1,1,0,0,0,.38-.05,5.16,5.16,0,0,0,0-.89,35.36,35.36,0,0,0-.55-5c-.3-1.49-1.33-2.41-3.14-2.82a16.05,16.05,0,0,0-3.63-.42,11.15,11.15,0,0,0-8.56,3.5,2.67,2.67,0,0,1-1.8,1.13,1.42,1.42,0,0,1-.74-.22,12.37,12.37,0,0,1-2-1.55c-.34-.33-.49-1,.22-2a14.29,14.29,0,0,1,6.61-4.68,20.49,20.49,0,0,1,6.34-.92,24,24,0,0,1,5,.51,8.34,8.34,0,0,1,6.71,6.37,21.78,21.78,0,0,1,.66,4.59c.26,6,0,21.67,0,21.83v.6Z"/><path id="Fill-9" class="cls-3" d="M237.9,188.46c-1.56,0-4.51-.85-4.51-4.08V154.62H234c1.59,0,4.6.81,4.6,3.89v.06l0,0a16.26,16.26,0,0,1,2.93-2.36,10.72,10.72,0,0,1,5.73-1.49,16.4,16.4,0,0,1,2.06.13,13.53,13.53,0,0,1,3.12.67,1.48,1.48,0,0,1,1.05,2,6.3,6.3,0,0,1-.66,1.4l0,.07a1.43,1.43,0,0,1-1.31.85,4.8,4.8,0,0,1-1-.15,15.16,15.16,0,0,0-3.28-.38,9.62,9.62,0,0,0-3.73.67,17.1,17.1,0,0,0-2.91,1.57,4.41,4.41,0,0,0-2,4.13c0,3.28,0,7.63,0,11.83,0,3.93,0,7.72,0,10.39v.61Z"/><path id="Fill-11" class="cls-3" d="M262.17,188c-1.56,0-4.51-.76-4.51-3.68V154.52h.63A4.42,4.42,0,0,1,262.8,159v1c0,4.74,0,23.25,0,27.3V188Z"/><path id="Fill-13" class="cls-3" d="M277.59,188c-1.5,0-4.34-.76-4.34-3.68V160h-3.78c-.77,0-1.18-.86-1.18-1.49v-2.45c0-.64.4-1,1.18-1h3.78v-9.2h.62c1.5,0,4.34.56,4.34,3.68v5.52h7.38c1.07,0,1.3.53,1.3,1v2.45c0,.6-.55,1.49-1.3,1.49h-7.38v28Z"/><path id="Fill-15" class="cls-3" d="M260.21,148.07a3.53,3.53,0,1,1,3.57-3.52,3.55,3.55,0,0,1-3.57,3.52"/></g></g><path class="cls-3" d="M366.26,178.67c0,6.82-5.18,9.45-11.15,9.45h-2.63c-6,0-9.9-3-10.88-8.14-.13-.59.19-1,.85-1h1.64c.53,0,.85.33.92.92.85,3.54,3.15,5.05,7.47,5.05h2.63c4.46,0,7.93-1.38,7.93-6.3s-4.26-5.44-9.11-6c-7.09-.79-11.81-2-11.81-9.12,0-6.23,4.2-8.72,10.69-8.72h1.9c6.1,0,10.24,2.75,10.5,8.72,0,.66-.2,1-.92,1h-1.44a1,1,0,0,1-1-1c-.32-3.93-2.75-5.77-7.28-5.77h-1.64c-4.72,0-7.6,1.38-7.6,5.84,0,4.72,3.41,5.51,8.59,6.1C360.68,170.54,366.26,171.33,366.26,178.67Z"/><path class="cls-3" d="M372.81,176.44V156a.87.87,0,0,1,1-1H375a.87.87,0,0,1,1,1v20.27c0,5.7,1.31,8.65,7.21,8.65h1.05a11.2,11.2,0,0,0,9.64-5.11V156a.87.87,0,0,1,1-1h1.24a.87.87,0,0,1,1,1V186.8a.88.88,0,0,1-1,1h-1.24a.88.88,0,0,1-1-1v-4.13a12,12,0,0,1-10.16,5.38h-.53C375.5,188.05,372.81,184.05,372.81,176.44Z"/><path class="cls-3" d="M431.12,166.67v9.38c0,7.67-4.79,12.07-11.61,12.07h-2.36c-4.92,0-7.61-2-8.92-5.38v4.06a.87.87,0,0,1-1,1H406a.87.87,0,0,1-1-1V142.86a.86.86,0,0,1,1-1h1.25a.87.87,0,0,1,1,1v16.86c1.31-3.28,4-5,8.92-5h2.36C426.33,154.73,431.12,158.87,431.12,166.67Zm-3.22.2c0-6.1-3-9-8.46-9h-2.75c-5.44,0-8.46,2.89-8.46,9v9.44c0,5.64,3,8.66,8.46,8.66h2.75c5.45,0,8.46-3,8.46-8.66Z"/><path class="cls-3" d="M461.42,178.67c0,6.82-5.18,9.45-11.15,9.45h-2.63c-6,0-9.9-3-10.88-8.14-.13-.59.19-1,.85-1h1.64a.9.9,0,0,1,.92.92c.85,3.54,3.15,5.05,7.47,5.05h2.63c4.46,0,7.93-1.38,7.93-6.3s-4.26-5.44-9.11-6c-7.09-.79-11.81-2-11.81-9.12,0-6.23,4.2-8.72,10.69-8.72h1.9c6.1,0,10.23,2.75,10.5,8.72,0,.66-.2,1-.92,1H458a1,1,0,0,1-1-1c-.33-3.93-2.75-5.77-7.28-5.77H448.1c-4.72,0-7.6,1.38-7.6,5.84,0,4.72,3.41,5.51,8.59,6.1C455.84,170.54,461.42,171.33,461.42,178.67Z"/><path class="cls-3" d="M474.07,158.08v19.41c0,5.18,1.25,7.28,5.64,7.41.59-.06.86.4.86,1L480.5,187a.87.87,0,0,1-.92.92c-6.42-.13-8.72-3.48-8.72-10.3V158.08h-3.54a.88.88,0,0,1-1-1v-1c0-.73.33-1.05,1-1.05h3.54v-3.81a.87.87,0,0,1,1-1h1.25a.86.86,0,0,1,1,1V155h5.51c.72,0,1.05.32,1.05,1v1.11a.87.87,0,0,1-1,1Z"/><path class="cls-3" d="M504.18,158.34a9.66,9.66,0,0,0-3.35-.52H500A11.24,11.24,0,0,0,490.4,163v23.8a.87.87,0,0,1-1,1h-1.25a.87.87,0,0,1-1-1V156a.86.86,0,0,1,1-1h1.25a.86.86,0,0,1,1,1v4.13a12.25,12.25,0,0,1,10.69-5.38,18,18,0,0,1,4.27.53.9.9,0,0,1,.59,1.24l-.53,1.38A.86.86,0,0,1,504.18,158.34Z"/><path class="cls-3" d="M533.88,187.79h-2.09c-.73,0-1-.66-1-1.58v-3.93a11,11,0,0,1-9.91,5.84h-3c-5.9,0-9.51-3.28-9.51-9.78s3.74-9.44,9.38-9.44h13v-2c0-7-1.71-9.05-8-9.05h-1.25a16.57,16.57,0,0,0-8.13,1.77c-.59.33-1.18.46-1.38-.07l-.72-1.38c-.2-.39-.13-.72.52-1.11,2.63-1.71,6.1-2.3,9.71-2.3h1.25c8.13,0,11.21,3.74,11.21,12.07v19.41a4.94,4.94,0,0,0,.13,1C534.15,187.46,534.21,187.79,533.88,187.79Zm-3.14-10.1v-5.84H517.82c-4.07,0-6.3,1.58-6.3,6.49s2.23,6.63,6.3,6.63h2.75A10.05,10.05,0,0,0,530.74,177.69Z"/><path class="cls-3" d="M547.13,158.08v19.41c0,5.18,1.25,7.28,5.64,7.41.59-.06.86.4.86,1l-.07,1.11a.87.87,0,0,1-.92.92c-6.43-.13-8.72-3.48-8.72-10.3V158.08h-3.54a.88.88,0,0,1-1-1v-1c0-.73.33-1.05,1-1.05h3.54v-3.81a.87.87,0,0,1,1-1h1.25a.87.87,0,0,1,1,1V155h5.51c.72,0,1.05.32,1.05,1v1.11a.87.87,0,0,1-1,1Z"/><path class="cls-3" d="M583.86,166.6v4.14a2,2,0,0,1-2.16,2H561.82v3.87c0,5.31,3,8.33,8.46,8.33h2.17c4.59,0,5.84-1.9,7.87-4.33.46-.53.72-.66,1.38-.2l.85.59c.65.46.59.86.2,1.38-2.37,2.89-4.73,5.71-10.3,5.71h-2.17c-6.88,0-11.8-4.33-11.8-11.68v-9.77c0-7.8,4.92-11.94,11.8-11.94h2.17C578.09,154.73,583.86,158.93,583.86,166.6Zm-3.34.27c0-6.1-3.48-9.05-8.07-9.05h-2.17c-5.44,0-8.46,3-8.46,9v3h18.7Z"/><path class="cls-3" d="M197.77,65l-84.33,48.68-7.93-4.58L125.2,97.68V95l69.06-39.87-2.74-1.59L125.2,91.88V90l-8.91-5.14L181,47.48l-2.41-1.39-64.7,37.35-8.37-4.83L125.2,67.24V64.35L167.71,39.8l-2.08-1.21L125.2,61.94v-2.4L98.83,74.76l-8.46-4.89,8.53-4.93v-.76l55.54-32.07-1.75-1L98.9,62.15v-.76L87.29,68.1l-8.15-4.71L93.51,55.1l-1.74-1L98.9,50V48.83l42.26-24.4-1.42-.82L98.9,47.18V46.05L88.37,52.13l-1.53-.89-14.41,8.3v1.79L0,103.15v3.93L72.43,65.26v2L80.62,72,0,118.5V122L83.7,73.72l8.46,4.89L72.43,90v2L3.53,131.81l2.73,1.59L72.43,95.19v2.47l8.41,4.86-64.06,37,2.41,1.4,64.07-37L92,109,72.43,120.2v2.52L30,147.2l2.08,1.2,40.31-23.27v3l26.4-15.24,7.94,4.58-7.91,4.56v.76L43.3,154.89l1.75,1,53.81-31.07v.76l11-6.34,8.69,5-14.12,8.15,1.21.7L98.86,137v1.14l-42.3,24.43,1.42.82,40.88-23.6v1.13L109,135.08l2.07,1.19,14.11-8.12v-2.41l72.57-41.9V79.91l-72.57,41.9v-1.39l-8.69-5,81.26-46.92ZM79.14,93.83,98.83,82.46l8.37,4.84-8.34,4.81h0L87.52,98.67Zm19.6,11.32-8.81-5.09,9-5.18h0l10.72-6.18,8.91,5.14Z"/><polygon class="cls-3" points="98.86 153.51 69.81 170.28 70.91 170.92 98.86 154.78 98.86 156.29 197.77 99.19 197.77 94.88 98.86 151.99 98.86 153.51"/><polygon class="cls-3" points="98.86 168.86 83.07 177.97 83.84 178.42 98.86 169.75 98.86 171.64 197.77 114.54 197.77 109.85 98.86 166.95 98.86 168.86"/><polygon class="cls-3" points="98.86 184.21 96.33 185.67 96.77 185.92 98.86 184.72 98.86 186.99 130.15 168.93 197.77 129.68 197.77 124.82 98.86 181.92 98.86 184.21"/><polygon class="cls-3" points="98.91 2.78 101.34 1.38 100.91 1.12 98.91 2.28 98.91 0 11.15 50.67 0 57.12 0 62.17 98.91 5.07 98.91 2.78"/><polygon class="cls-3" points="98.91 18.13 114.62 9.06 113.85 8.62 98.91 17.25 98.91 15.35 0 72.45 0 77.14 98.91 20.04 98.91 18.13"/><polygon class="cls-3" points="98.91 33.48 127.89 16.75 126.8 16.11 98.91 32.21 98.91 30.7 0 87.8 0 92.11 98.91 35.01 98.91 33.48"/></g></g></svg>
diff --git a/packages/apps/src/static/parity-substrate.svg b/packages/apps/src/static/parity-substrate.svg
new file mode 100644
index 0000000000..b894a59985
--- /dev/null
+++ b/packages/apps/src/static/parity-substrate.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 583.86 198.77"><defs><style>.cls-1{fill:#fff;}.cls-2{mask:url(#mask);}.cls-3{fill:#282828;}.cls-4{mask:url(#mask-2-2);}</style><mask id="mask" x="168.51" y="154.5" width="27.36" height="44.26" maskUnits="userSpaceOnUse"><g id="mask-2"><polygon id="path-1" class="cls-1" points="168.51 154.5 195.88 154.5 195.88 198.77 168.51 198.77 168.51 154.5"/></g></mask><mask id="mask-2-2" x="289.49" y="154.54" width="29.03" height="44.1" maskUnits="userSpaceOnUse"><g id="mask-4"><polygon id="path-3" class="cls-1" points="289.49 154.54 318.51 154.54 318.51 198.64 289.49 198.64 289.49 154.54"/></g></mask></defs><title>parity-substrate-3</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><g id="Variation-2"><g id="Logotype"><g id="Group-3"><g class="cls-2"><path id="Fill-1" class="cls-3" d="M182.22,159.36a23.43,23.43,0,0,0-3.17.22,5.82,5.82,0,0,0-5.13,5.82v12.43c0,3,2.5,5.46,5.95,5.73.8.06,1.59.09,2.36.09s1.43,0,2.12-.08c3.57-.28,5.76-2.26,6.16-5.57a70.44,70.44,0,0,0,0-13.07,5.85,5.85,0,0,0-5-5.34A24.33,24.33,0,0,0,182.22,159.36Zm-9.11,39.41c-1.59,0-4.6-.86-4.6-4.13v-31c0-3.13,2.35-5.83,3.93-6.89a16.08,16.08,0,0,1,6.13-2,35.09,35.09,0,0,1,4.09-.27,20.41,20.41,0,0,1,4.63.5c4.54,1.05,7.3,4,8.21,8.69a21,21,0,0,1,.32,3.64l0,1.17c0,2.65.08,5.39-.05,8.09a16.53,16.53,0,0,1-1,4.9c-1.36,3.68-4.16,5.93-8.32,6.7a20,20,0,0,1-3.58.32,24,24,0,0,1-3.11-.22,8.38,8.38,0,0,1-6.08-3.45v13.93Z"/></g></g><g id="Group-6"><g class="cls-4"><path id="Fill-4" class="cls-3" d="M297.12,198.64a3.77,3.77,0,0,1-.65,0l-.78-.11,4.61-11.09a4.36,4.36,0,0,0,.44-2.76c-2.76-6.85-5.4-13.44-8.09-20.17L290,157.91c-.46-1.17-.74-2-.34-2.57s1.28-.6,2.48-.6a2.56,2.56,0,0,1,2.69,2c.62,1.58,7.77,19.61,9.1,22.91l9.14-22.72a3.31,3.31,0,0,1,3-2.39,3.62,3.62,0,0,1,1.43.31,1.32,1.32,0,0,1,.92,1.75l-15.35,38a6.31,6.31,0,0,1-6,4"/></g></g><path id="Fill-7" class="cls-3" d="M214.78,172.78c-2.05,0-3.82.06-5.12.18-3.32.3-4.6,1.54-4.69,4.59a16.18,16.18,0,0,0,0,1.88,4,4,0,0,0,4.21,4.13c.93,0,1.71.05,2.44.05s1.53,0,2.23-.06a8.29,8.29,0,0,0,6.69-3.89c1-1.53,1-3.21.95-5,0-.3,0-.6,0-.91a4.39,4.39,0,0,0-.05-.71,5.54,5.54,0,0,0-.78-.08C219.05,172.85,216.85,172.78,214.78,172.78ZM226,188.46c-1.54,0-4.45-.87-4.45-4.16v-.21l-.08.08a10.75,10.75,0,0,1-8.3,4.26l-1.44,0a28.07,28.07,0,0,1-4.37-.31,8.32,8.32,0,0,1-7.07-6.2,12.9,12.9,0,0,1,0-7.36,7.76,7.76,0,0,1,6.92-5.9,68,68,0,0,1,7.87-.41c2,0,4,.06,5.7.19l.39,0a1,1,0,0,0,.38-.05,5.16,5.16,0,0,0,0-.89,35.36,35.36,0,0,0-.55-5c-.3-1.49-1.33-2.41-3.14-2.82a16.05,16.05,0,0,0-3.63-.42,11.15,11.15,0,0,0-8.56,3.5,2.67,2.67,0,0,1-1.8,1.13,1.42,1.42,0,0,1-.74-.22,12.37,12.37,0,0,1-2-1.55c-.34-.33-.49-1,.22-2a14.29,14.29,0,0,1,6.61-4.68,20.49,20.49,0,0,1,6.34-.92,24,24,0,0,1,5,.51,8.34,8.34,0,0,1,6.71,6.37,21.78,21.78,0,0,1,.66,4.59c.26,6,0,21.67,0,21.83v.6Z"/><path id="Fill-9" class="cls-3" d="M237.9,188.46c-1.56,0-4.51-.85-4.51-4.08V154.62H234c1.59,0,4.6.81,4.6,3.89v.06l0,0a16.26,16.26,0,0,1,2.93-2.36,10.72,10.72,0,0,1,5.73-1.49,16.4,16.4,0,0,1,2.06.13,13.53,13.53,0,0,1,3.12.67,1.48,1.48,0,0,1,1.05,2,6.3,6.3,0,0,1-.66,1.4l0,.07a1.43,1.43,0,0,1-1.31.85,4.8,4.8,0,0,1-1-.15,15.16,15.16,0,0,0-3.28-.38,9.62,9.62,0,0,0-3.73.67,17.1,17.1,0,0,0-2.91,1.57,4.41,4.41,0,0,0-2,4.13c0,3.28,0,7.63,0,11.83,0,3.93,0,7.72,0,10.39v.61Z"/><path id="Fill-11" class="cls-3" d="M262.17,188c-1.56,0-4.51-.76-4.51-3.68V154.52h.63A4.42,4.42,0,0,1,262.8,159v1c0,4.74,0,23.25,0,27.3V188Z"/><path id="Fill-13" class="cls-3" d="M277.59,188c-1.5,0-4.34-.76-4.34-3.68V160h-3.78c-.77,0-1.18-.86-1.18-1.49v-2.45c0-.64.4-1,1.18-1h3.78v-9.2h.62c1.5,0,4.34.56,4.34,3.68v5.52h7.38c1.07,0,1.3.53,1.3,1v2.45c0,.6-.55,1.49-1.3,1.49h-7.38v28Z"/><path id="Fill-15" class="cls-3" d="M260.21,148.07a3.53,3.53,0,1,1,3.57-3.52,3.55,3.55,0,0,1-3.57,3.52"/></g></g><path class="cls-3" d="M366.26,178.67c0,6.82-5.18,9.45-11.15,9.45h-2.63c-6,0-9.9-3-10.88-8.14-.13-.59.19-1,.85-1h1.64c.53,0,.85.33.92.92.85,3.54,3.15,5.05,7.47,5.05h2.63c4.46,0,7.93-1.38,7.93-6.3s-4.26-5.44-9.11-6c-7.09-.79-11.81-2-11.81-9.12,0-6.23,4.2-8.72,10.69-8.72h1.9c6.1,0,10.24,2.75,10.5,8.72,0,.66-.2,1-.92,1h-1.44a1,1,0,0,1-1-1c-.32-3.93-2.75-5.77-7.28-5.77h-1.64c-4.72,0-7.6,1.38-7.6,5.84,0,4.72,3.41,5.51,8.59,6.1C360.68,170.54,366.26,171.33,366.26,178.67Z"/><path class="cls-3" d="M372.81,176.44V156a.87.87,0,0,1,1-1H375a.87.87,0,0,1,1,1v20.27c0,5.7,1.31,8.65,7.21,8.65h1.05a11.2,11.2,0,0,0,9.64-5.11V156a.87.87,0,0,1,1-1h1.24a.87.87,0,0,1,1,1V186.8a.88.88,0,0,1-1,1h-1.24a.88.88,0,0,1-1-1v-4.13a12,12,0,0,1-10.16,5.38h-.53C375.5,188.05,372.81,184.05,372.81,176.44Z"/><path class="cls-3" d="M431.12,166.67v9.38c0,7.67-4.79,12.07-11.61,12.07h-2.36c-4.92,0-7.61-2-8.92-5.38v4.06a.87.87,0,0,1-1,1H406a.87.87,0,0,1-1-1V142.86a.86.86,0,0,1,1-1h1.25a.87.87,0,0,1,1,1v16.86c1.31-3.28,4-5,8.92-5h2.36C426.33,154.73,431.12,158.87,431.12,166.67Zm-3.22.2c0-6.1-3-9-8.46-9h-2.75c-5.44,0-8.46,2.89-8.46,9v9.44c0,5.64,3,8.66,8.46,8.66h2.75c5.45,0,8.46-3,8.46-8.66Z"/><path class="cls-3" d="M461.42,178.67c0,6.82-5.18,9.45-11.15,9.45h-2.63c-6,0-9.9-3-10.88-8.14-.13-.59.19-1,.85-1h1.64a.9.9,0,0,1,.92.92c.85,3.54,3.15,5.05,7.47,5.05h2.63c4.46,0,7.93-1.38,7.93-6.3s-4.26-5.44-9.11-6c-7.09-.79-11.81-2-11.81-9.12,0-6.23,4.2-8.72,10.69-8.72h1.9c6.1,0,10.23,2.75,10.5,8.72,0,.66-.2,1-.92,1H458a1,1,0,0,1-1-1c-.33-3.93-2.75-5.77-7.28-5.77H448.1c-4.72,0-7.6,1.38-7.6,5.84,0,4.72,3.41,5.51,8.59,6.1C455.84,170.54,461.42,171.33,461.42,178.67Z"/><path class="cls-3" d="M474.07,158.08v19.41c0,5.18,1.25,7.28,5.64,7.41.59-.06.86.4.86,1L480.5,187a.87.87,0,0,1-.92.92c-6.42-.13-8.72-3.48-8.72-10.3V158.08h-3.54a.88.88,0,0,1-1-1v-1c0-.73.33-1.05,1-1.05h3.54v-3.81a.87.87,0,0,1,1-1h1.25a.86.86,0,0,1,1,1V155h5.51c.72,0,1.05.32,1.05,1v1.11a.87.87,0,0,1-1,1Z"/><path class="cls-3" d="M504.18,158.34a9.66,9.66,0,0,0-3.35-.52H500A11.24,11.24,0,0,0,490.4,163v23.8a.87.87,0,0,1-1,1h-1.25a.87.87,0,0,1-1-1V156a.86.86,0,0,1,1-1h1.25a.86.86,0,0,1,1,1v4.13a12.25,12.25,0,0,1,10.69-5.38,18,18,0,0,1,4.27.53.9.9,0,0,1,.59,1.24l-.53,1.38A.86.86,0,0,1,504.18,158.34Z"/><path class="cls-3" d="M533.88,187.79h-2.09c-.73,0-1-.66-1-1.58v-3.93a11,11,0,0,1-9.91,5.84h-3c-5.9,0-9.51-3.28-9.51-9.78s3.74-9.44,9.38-9.44h13v-2c0-7-1.71-9.05-8-9.05h-1.25a16.57,16.57,0,0,0-8.13,1.77c-.59.33-1.18.46-1.38-.07l-.72-1.38c-.2-.39-.13-.72.52-1.11,2.63-1.71,6.1-2.3,9.71-2.3h1.25c8.13,0,11.21,3.74,11.21,12.07v19.41a4.94,4.94,0,0,0,.13,1C534.15,187.46,534.21,187.79,533.88,187.79Zm-3.14-10.1v-5.84H517.82c-4.07,0-6.3,1.58-6.3,6.49s2.23,6.63,6.3,6.63h2.75A10.05,10.05,0,0,0,530.74,177.69Z"/><path class="cls-3" d="M547.13,158.08v19.41c0,5.18,1.25,7.28,5.64,7.41.59-.06.86.4.86,1l-.07,1.11a.87.87,0,0,1-.92.92c-6.43-.13-8.72-3.48-8.72-10.3V158.08h-3.54a.88.88,0,0,1-1-1v-1c0-.73.33-1.05,1-1.05h3.54v-3.81a.87.87,0,0,1,1-1h1.25a.87.87,0,0,1,1,1V155h5.51c.72,0,1.05.32,1.05,1v1.11a.87.87,0,0,1-1,1Z"/><path class="cls-3" d="M583.86,166.6v4.14a2,2,0,0,1-2.16,2H561.82v3.87c0,5.31,3,8.33,8.46,8.33h2.17c4.59,0,5.84-1.9,7.87-4.33.46-.53.72-.66,1.38-.2l.85.59c.65.46.59.86.2,1.38-2.37,2.89-4.73,5.71-10.3,5.71h-2.17c-6.88,0-11.8-4.33-11.8-11.68v-9.77c0-7.8,4.92-11.94,11.8-11.94h2.17C578.09,154.73,583.86,158.93,583.86,166.6Zm-3.34.27c0-6.1-3.48-9.05-8.07-9.05h-2.17c-5.44,0-8.46,3-8.46,9v3h18.7Z"/><path class="cls-3" d="M197.77,65l-84.33,48.68-7.93-4.58L125.2,97.68V95l69.06-39.87-2.74-1.59L125.2,91.88V90l-8.91-5.14L181,47.48l-2.41-1.39-64.7,37.35-8.37-4.83L125.2,67.24V64.35L167.71,39.8l-2.08-1.21L125.2,61.94v-2.4L98.83,74.76l-8.46-4.89,8.53-4.93v-.76l55.54-32.07-1.75-1L98.9,62.15v-.76L87.29,68.1l-8.15-4.71L93.51,55.1l-1.74-1L98.9,50V48.83l42.26-24.4-1.42-.82L98.9,47.18V46.05L88.37,52.13l-1.53-.89-14.41,8.3v1.79L0,103.15v3.93L72.43,65.26v2L80.62,72,0,118.5V122L83.7,73.72l8.46,4.89L72.43,90v2L3.53,131.81l2.73,1.59L72.43,95.19v2.47l8.41,4.86-64.06,37,2.41,1.4,64.07-37L92,109,72.43,120.2v2.52L30,147.2l2.08,1.2,40.31-23.27v3l26.4-15.24,7.94,4.58-7.91,4.56v.76L43.3,154.89l1.75,1,53.81-31.07v.76l11-6.34,8.69,5-14.12,8.15,1.21.7L98.86,137v1.14l-42.3,24.43,1.42.82,40.88-23.6v1.13L109,135.08l2.07,1.19,14.11-8.12v-2.41l72.57-41.9V79.91l-72.57,41.9v-1.39l-8.69-5,81.26-46.92ZM79.14,93.83,98.83,82.46l8.37,4.84-8.34,4.81h0L87.52,98.67Zm19.6,11.32-8.81-5.09,9-5.18h0l10.72-6.18,8.91,5.14Z"/><polygon class="cls-3" points="98.86 153.51 69.81 170.28 70.91 170.92 98.86 154.78 98.86 156.29 197.77 99.19 197.77 94.88 98.86 151.99 98.86 153.51"/><polygon class="cls-3" points="98.86 168.86 83.07 177.97 83.84 178.42 98.86 169.75 98.86 171.64 197.77 114.54 197.77 109.85 98.86 166.95 98.86 168.86"/><polygon class="cls-3" points="98.86 184.21 96.33 185.67 96.77 185.92 98.86 184.72 98.86 186.99 130.15 168.93 197.77 129.68 197.77 124.82 98.86 181.92 98.86 184.21"/><polygon class="cls-3" points="98.91 2.78 101.34 1.38 100.91 1.12 98.91 2.28 98.91 0 11.15 50.67 0 57.12 0 62.17 98.91 5.07 98.91 2.78"/><polygon class="cls-3" points="98.91 18.13 114.62 9.06 113.85 8.62 98.91 17.25 98.91 15.35 0 72.45 0 77.14 98.91 20.04 98.91 18.13"/><polygon class="cls-3" points="98.91 33.48 127.89 16.75 126.8 16.11 98.91 32.21 98.91 30.7 0 87.8 0 92.11 98.91 35.01 98.91 33.48"/></g></g></svg>
\ No newline at end of file
diff --git a/packages/apps/webpack.config.js b/packages/apps/webpack.config.js
index eec1879a42..142b83ab52 100644
--- a/packages/apps/webpack.config.js
+++ b/packages/apps/webpack.config.js
@@ -173,12 +173,17 @@ function createWebpack ({ alias = {}, context, name = 'index' }) {
         'process.env': {
           NODE_ENV: JSON.stringify(ENV),
           VERSION: JSON.stringify(pkgJson.version),
+          UI_MODE: JSON.stringify(process.env.UI_MODE || 'full'),
+          UI_THEME: JSON.stringify(process.env.UI_THEME || 'polkadot'),
           WS_URL: JSON.stringify(process.env.WS_URL)
         }
       }),
       new HtmlWebpackPlugin({
         inject: true,
-        template: path.join(context, `${hasPublic ? 'public/' : ''}${name}.html`)
+        template: path.join(context, `${hasPublic ? 'public/' : ''}${name}.html`),
+        PAGE_TITLE: process.env.UI_THEME === 'substrate'
+          ? 'Substrate Apps Portal'
+          : 'Polkadot Apps Portal'
       }),
       new webpack.optimize.SplitChunksPlugin(),
       new MiniCssExtractPlugin({
diff --git a/packages/ui-app/package.json b/packages/ui-app/package.json
index 2a6a2e2909..467103c151 100644
--- a/packages/ui-app/package.json
+++ b/packages/ui-app/package.json
@@ -11,8 +11,8 @@
   "license": "ISC",
   "dependencies": {
     "@babel/runtime": "^7.0.0",
-    "@polkadot/extrinsics": "^0.28.29",
-    "@polkadot/storage": "^0.28.29",
+    "@polkadot/extrinsics": "^0.28.34",
+    "@polkadot/storage": "^0.28.34",
     "@polkadot/ui-keyring": "^0.20.2",
     "@polkadot/ui-react": "^0.20.2",
     "@polkadot/ui-react-rx": "^0.20.2",
diff --git a/packages/ui-app/src/Modal.tsx b/packages/ui-app/src/Modal.tsx
index 76354f2a53..da99502619 100644
--- a/packages/ui-app/src/Modal.tsx
+++ b/packages/ui-app/src/Modal.tsx
@@ -2,6 +2,30 @@
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import Modal from 'semantic-ui-react/dist/commonjs/modules/Modal/Modal';
+import { BareProps } from './types';
 
-export default Modal;
+import React from 'react';
+import SUIModal from 'semantic-ui-react/dist/commonjs/modules/Modal/Modal';
+import classes from '@polkadot/ui-app/util/classes';
+
+type Props = BareProps & {
+  children: React.ReactNode,
+  [index: string]: any
+};
+
+export default class Modal extends React.PureComponent<Props> {
+  static Actions = SUIModal.Actions;
+  static Content = SUIModal.Content;
+  static Header = SUIModal.Header;
+
+  render () {
+    const { className } = this.props;
+
+    return (
+      <SUIModal
+        {...this.props}
+        className={classes(`theme--${process.env.UI_THEME}`, 'ui--Modal', className)}
+      />
+    );
+  }
+}
diff --git a/packages/ui-app/src/styles.ts b/packages/ui-app/src/styles.ts
index ad4aeea12d..74279ce63b 100644
--- a/packages/ui-app/src/styles.ts
+++ b/packages/ui-app/src/styles.ts
@@ -5,6 +5,8 @@
 import 'semantic-ui-css/semantic.min.css';
 
 import './styles/semantic.css';
+import './styles/theme/polkadot.css';
+import './styles/theme/substrate.css';
 
 import './styles/app.css';
 import './styles/form.css';
diff --git a/packages/ui-app/src/styles/partials/_variables.css b/packages/ui-app/src/styles/partials/_variables.css
index 4a7db9f82a..8494a11faf 100644
--- a/packages/ui-app/src/styles/partials/_variables.css
+++ b/packages/ui-app/src/styles/partials/_variables.css
@@ -3,28 +3,3 @@
 /* of the ISC license. See the LICENSE file for details. */
 
 $small-corner: .28571429rem;
-
-$green: #77c689;
-$orange: #f6a46e;
-$red: #e97f7f;
-
-$pewter-blue: #89acb4;
-$dark-sky-blue: #96bdc6;
-
-$silver-chalice: #a1b1b5;
-$cadet-grey: #98aaae;
-
-$wild-orchid: #d75ea1;
-$middle-purple: #e189ba;
-
-$light-slate-gray: #718d94;
-
-$button-primary-color: $dark-sky-blue;
-$button-primary-color-hover: $pewter-blue;
-$button-color: $silver-chalice;
-$button-color-hover: $cadet-grey;
-$button-negative-color: $wild-orchid;
-$button-negative-color-hover: $middle-purple;
-$anchor-color: $light-slate-gray;
-$anchor-color-hover: $cadet-grey;
-$progress-bar-color: $dark-sky-blue;
diff --git a/packages/ui-app/src/styles/semantic.css b/packages/ui-app/src/styles/semantic.css
index 8b0d535b75..80aed15731 100644
--- a/packages/ui-app/src/styles/semantic.css
+++ b/packages/ui-app/src/styles/semantic.css
@@ -95,79 +95,3 @@
 .ui.disabled.button:hover {
   opacity: 0.1 !important;
 }
-
-.ui.primary.button,
-.ui.buttons .primary.button,
-.ui.primary.button:active,
-.ui.buttons .primary.button:active,
-.ui.primary.button:focus,
-.ui.buttons .primary.button:focus {
-  background-color: $button-primary-color;
-}
-
-
-.ui.primary.button:hover,
-.ui.buttons .primary.button:hover {
-  background-color: $button-primary-color-hover;
-}
-
-.ui.button,
-.ui.buttons .button,
-.ui.button:active,
-.ui.buttons .button:active,
-.ui.button:focus,
-.ui.buttons .button:focus,
-.ui.positive.button,
-.ui.buttons .positive.button,
-.ui.positive.button:active,
-.ui.buttons .positive.button:active,
-.ui.positive.button:focus,
-.ui.buttons .positive.button:focus {
-  background-color: $button-color;
-  color: white;
-}
-
-.ui.button:hover,
-.ui.buttons .button:hover,
-.ui.positive.button:hover,
-.ui.buttons .positive.button:hover {
-  background-color: $button-color-hover;
-  color: white;
-}
-
-.ui.negative.button,
-.ui.buttons .negative.button,
-.ui.negative.button:focus,
-.ui.buttons .negative.button:focus,
-.ui.negative.button:active,
-.ui.buttons .negative.button:active {
-  background-color: $button-negative-color;
-}
-
-.ui.negative.button:hover,
-.ui.buttons .negative.button:hover {
-  background-color: $button-negative-color-hover;
-}
-
-.ui.blue.progress .bar {
-  background-color: $progress-bar-color;
-}
-
-a {
-  color: $anchor-color;
-}
-
-a:hover {
-  color: $anchor-color-hover;
-}
-
-.ui.green.progress .bar {
-    background-color: $green;
-}
-
-.ui.orange.progress .bar {
-    background-color: $orange;
-}
-.ui.red.progress .bar {
-    background-color: $red;
-}
diff --git a/packages/ui-app/src/styles/theme/_colors-polkadot.css b/packages/ui-app/src/styles/theme/_colors-polkadot.css
new file mode 100644
index 0000000000..443ef7c818
--- /dev/null
+++ b/packages/ui-app/src/styles/theme/_colors-polkadot.css
@@ -0,0 +1,29 @@
+/* Copyright 2017-2018 @polkadot/ui-app authors & contributors
+/* This software may be modified and distributed under the terms
+/* of the ISC license. See the LICENSE file for details. */
+
+$green: #77c689;
+$orange: #f6a46e;
+$red: #e97f7f;
+
+$pewter-blue: #89acb4;
+$dark-sky-blue: #96bdc6;
+
+$silver-chalice: #a1b1b5;
+$cadet-grey: #98aaae;
+
+$wild-orchid: #d75ea1;
+$middle-purple: #e189ba;
+
+$light-slate-gray: #718d94;
+
+$button-primary-color: $dark-sky-blue;
+$button-primary-color-hover: $pewter-blue;
+$button-color: $silver-chalice;
+$button-color-hover: $cadet-grey;
+$button-negative-color: $wild-orchid;
+$button-negative-color-hover: $middle-purple;
+$anchor-color: $light-slate-gray;
+$anchor-color-hover: $cadet-grey;
+$progress-bar-color: $dark-sky-blue;
+$nav-link: $wild-orchid;
diff --git a/packages/ui-app/src/styles/theme/_colors-substrate.css b/packages/ui-app/src/styles/theme/_colors-substrate.css
new file mode 100644
index 0000000000..baf1b9b284
--- /dev/null
+++ b/packages/ui-app/src/styles/theme/_colors-substrate.css
@@ -0,0 +1,3 @@
+/* Copyright 2017-2018 @polkadot/ui-app authors & contributors
+/* This software may be modified and distributed under the terms
+/* of the ISC license. See the LICENSE file for details. */
diff --git a/packages/ui-app/src/styles/theme/polkadot.css b/packages/ui-app/src/styles/theme/polkadot.css
new file mode 100644
index 0000000000..010ca4a0af
--- /dev/null
+++ b/packages/ui-app/src/styles/theme/polkadot.css
@@ -0,0 +1,84 @@
+/* Copyright 2017-2018 @polkadot/ui-app authors & contributors
+/* This software may be modified and distributed under the terms
+/* of the ISC license. See the LICENSE file for details. */
+
+@import './_colors-polkadot.css';
+
+.theme--polkadot {
+  .ui.primary.button,
+  .ui.buttons .primary.button,
+  .ui.primary.button:active,
+  .ui.buttons .primary.button:active,
+  .ui.primary.button:focus,
+  .ui.buttons .primary.button:focus {
+    background-color: $button-primary-color;
+  }
+
+
+  .ui.primary.button:hover,
+  .ui.buttons .primary.button:hover {
+    background-color: $button-primary-color-hover;
+  }
+
+  .ui.button,
+  .ui.buttons .button,
+  .ui.button:active,
+  .ui.buttons .button:active,
+  .ui.button:focus,
+  .ui.buttons .button:focus,
+  .ui.positive.button,
+  .ui.buttons .positive.button,
+  .ui.positive.button:active,
+  .ui.buttons .positive.button:active,
+  .ui.positive.button:focus,
+  .ui.buttons .positive.button:focus {
+    background-color: $button-color;
+    color: white;
+  }
+
+  .ui.button:hover,
+  .ui.buttons .button:hover,
+  .ui.positive.button:hover,
+  .ui.buttons .positive.button:hover {
+    background-color: $button-color-hover;
+    color: white;
+  }
+
+  .ui.negative.button,
+  .ui.buttons .negative.button,
+  .ui.negative.button:focus,
+  .ui.buttons .negative.button:focus,
+  .ui.negative.button:active,
+  .ui.buttons .negative.button:active {
+    background-color: $button-negative-color;
+  }
+
+  .ui.negative.button:hover,
+  .ui.buttons .negative.button:hover {
+    background-color: $button-negative-color-hover;
+  }
+
+  .ui.blue.progress .bar {
+    background-color: $progress-bar-color;
+  }
+
+  a {
+    color: $anchor-color;
+  }
+
+  a:hover {
+    color: $anchor-color-hover;
+  }
+
+  .ui.green.progress .bar {
+    background-color: $green;
+  }
+
+  .ui.orange.progress .bar {
+    background-color: $orange;
+  }
+
+  .ui.red.progress .bar {
+    background-color: $red;
+  }
+}
diff --git a/packages/ui-app/src/styles/theme/substrate.css b/packages/ui-app/src/styles/theme/substrate.css
new file mode 100644
index 0000000000..1633f3925d
--- /dev/null
+++ b/packages/ui-app/src/styles/theme/substrate.css
@@ -0,0 +1,8 @@
+/* Copyright 2017-2018 @polkadot/ui-app authors & contributors
+/* This software may be modified and distributed under the terms
+/* of the ISC license. See the LICENSE file for details. */
+
+@import './_colors-substrate.css';
+
+.theme--substrate {
+}
diff --git a/packages/ui-identicon/package.json b/packages/ui-identicon/package.json
index 1861c90b10..05be0e1d6c 100644
--- a/packages/ui-identicon/package.json
+++ b/packages/ui-identicon/package.json
@@ -22,7 +22,7 @@
     "color": "^3.0.0"
   },
   "devDependencies": {
-    "@polkadot/util-crypto": "^0.29.33",
+    "@polkadot/util-crypto": "^0.30.2",
     "xmlserializer": "^0.6.1"
   }
 }
diff --git a/packages/ui-keyring/package.json b/packages/ui-keyring/package.json
index d33e96b128..f4395f5d6e 100644
--- a/packages/ui-keyring/package.json
+++ b/packages/ui-keyring/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@babel/runtime": "^7.0.0",
     "@polkadot/ui-react": "^0.20.2",
-    "@polkadot/util-keyring": "^0.29.33",
+    "@polkadot/util-keyring": "^0.30.2",
     "store": "^2.0.12"
   },
   "peerDependencies": {
diff --git a/packages/ui-react-rx/package.json b/packages/ui-react-rx/package.json
index 6605511c6c..2eec00a0e1 100644
--- a/packages/ui-react-rx/package.json
+++ b/packages/ui-react-rx/package.json
@@ -31,9 +31,9 @@
   "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-react-rx#readme",
   "dependencies": {
     "@babel/runtime": "^7.0.0",
-    "@polkadot/api-rx": "^0.28.29",
-    "@polkadot/extrinsics": "^0.28.29",
-    "@polkadot/storage": "^0.28.29",
+    "@polkadot/api-rx": "^0.28.34",
+    "@polkadot/extrinsics": "^0.28.34",
+    "@polkadot/storage": "^0.28.34",
     "rxjs-compat": "^6.3.2"
   },
   "devDependencies": {
diff --git a/packages/ui-react/package.json b/packages/ui-react/package.json
index 3b22f0f17e..4818d4b148 100644
--- a/packages/ui-react/package.json
+++ b/packages/ui-react/package.json
@@ -15,7 +15,7 @@
     "polkadot-identicon": "^1.0.2"
   },
   "devDependencies": {
-    "@polkadot/util-keyring": "^0.29.33",
+    "@polkadot/util-keyring": "^0.30.2",
     "empty": "^0.10.1",
     "react": "^16.5.0",
     "react-dom": "^16.5.0"
diff --git a/packages/ui-react/src/IdentityIcon/index.tsx b/packages/ui-react/src/IdentityIcon/index.tsx
index 7472802f14..b9308a1f1e 100644
--- a/packages/ui-react/src/IdentityIcon/index.tsx
+++ b/packages/ui-react/src/IdentityIcon/index.tsx
@@ -7,7 +7,7 @@ import { BaseProps } from '../types';
 import './IdentityIcon.css';
 
 import React from 'react';
-import Identicon from 'polkadot-identicon';
+import PolkadotIdenticon from 'polkadot-identicon';
 
 type Props = BaseProps & {
   size?: number,
@@ -20,13 +20,14 @@ export default class IdentityIcon extends React.PureComponent<Props> {
   render () {
     const { className, size = DEFAULT_SIZE, style, value } = this.props;
 
+    // FIXME For UI_THEME=substrate we want to change the icon
     return (
       <div
         className={['ui--IdentityIcon', className].join(' ')}
         key={value.toString()}
         style={style}
       >
-        <Identicon
+        <PolkadotIdenticon
           id={value}
           size={size}
         />
diff --git a/packages/ui-signer/package.json b/packages/ui-signer/package.json
index 6b788ce979..b21953033f 100644
--- a/packages/ui-signer/package.json
+++ b/packages/ui-signer/package.json
@@ -11,7 +11,7 @@
   "license": "ISC",
   "dependencies": {
     "@babel/runtime": "^7.0.0",
-    "@polkadot/extrinsics": "^0.28.29",
+    "@polkadot/extrinsics": "^0.28.34",
     "@polkadot/ui-app": "^0.20.2",
     "@polkadot/ui-keyring": "^0.20.2"
   },
diff --git a/yarn.lock b/yarn.lock
index 02ab4a3c9d..05e16f825f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1348,50 +1348,50 @@
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.0.tgz#50c1e2260ac0ed9439a181de3725a0168d59c48a"
 
-"@polkadot/api-format@^0.28.29":
-  version "0.28.29"
-  resolved "https://registry.yarnpkg.com/@polkadot/api-format/-/api-format-0.28.29.tgz#dd0ac95a6211743c4f918926549044e574424f75"
+"@polkadot/api-format@^0.28.34":
+  version "0.28.34"
+  resolved "https://registry.yarnpkg.com/@polkadot/api-format/-/api-format-0.28.34.tgz#4647c2eb4a47e93406acca2a8cfb9cd060ab7925"
   dependencies:
     "@babel/runtime" "^7.0.0"
-    "@polkadot/jsonrpc" "^0.28.29"
-    "@polkadot/primitives" "^0.28.29"
-    "@polkadot/util" "^0.29.33"
-    "@polkadot/util-keyring" "^0.29.33"
+    "@polkadot/jsonrpc" "^0.28.34"
+    "@polkadot/primitives" "^0.28.34"
+    "@polkadot/util" "^0.30.2"
+    "@polkadot/util-keyring" "^0.30.2"
 
-"@polkadot/api-provider@^0.28.29":
-  version "0.28.29"
-  resolved "https://registry.yarnpkg.com/@polkadot/api-provider/-/api-provider-0.28.29.tgz#94c7cb7d3add29740796059cfcf99d16cf968227"
+"@polkadot/api-provider@^0.28.34":
+  version "0.28.34"
+  resolved "https://registry.yarnpkg.com/@polkadot/api-provider/-/api-provider-0.28.34.tgz#144b16144f2d0a4f6b7428079eb47b4ad2602d22"
   dependencies:
     "@babel/runtime" "^7.0.0"
-    "@polkadot/storage" "^0.28.29"
-    "@polkadot/util" "^0.29.33"
-    "@polkadot/util-crypto" "^0.29.33"
-    "@polkadot/util-keyring" "^0.29.33"
+    "@polkadot/storage" "^0.28.34"
+    "@polkadot/util" "^0.30.2"
+    "@polkadot/util-crypto" "^0.30.2"
+    "@polkadot/util-keyring" "^0.30.2"
     "@types/nock" "^9.1.3"
     eventemitter3 "^3.1.0"
     isomorphic-fetch "^2.2.1"
     websocket "^1.0.25"
 
-"@polkadot/api-rx@^0.28.29":
-  version "0.28.29"
-  resolved "https://registry.yarnpkg.com/@polkadot/api-rx/-/api-rx-0.28.29.tgz#68bdcc82bf6b6deefdab4550c341d7a6b66c5f25"
+"@polkadot/api-rx@^0.28.34":
+  version "0.28.34"
+  resolved "https://registry.yarnpkg.com/@polkadot/api-rx/-/api-rx-0.28.34.tgz#09e254f937c40afc07c710c4bbcd64a9c5d29134"
   dependencies:
     "@babel/runtime" "^7.0.0"
-    "@polkadot/api" "^0.28.29"
-    "@polkadot/api-provider" "^0.28.29"
+    "@polkadot/api" "^0.28.34"
+    "@polkadot/api-provider" "^0.28.34"
     "@types/rx" "^4.1.1"
     rxjs "^6.3.2"
 
-"@polkadot/api@^0.28.29":
-  version "0.28.29"
-  resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.28.29.tgz#fdbf97c11cbb901b0bb175c8e146f88a19f08710"
+"@polkadot/api@^0.28.34":
+  version "0.28.34"
+  resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.28.34.tgz#2abfa7a481074df0cbdbeba941ef098d4df3f320"
   dependencies:
     "@babel/runtime" "^7.0.0"
-    "@polkadot/api-format" "^0.28.29"
-    "@polkadot/api-provider" "^0.28.29"
-    "@polkadot/jsonrpc" "^0.28.29"
-    "@polkadot/params" "^0.28.29"
-    "@polkadot/util" "^0.29.33"
+    "@polkadot/api-format" "^0.28.34"
+    "@polkadot/api-provider" "^0.28.34"
+    "@polkadot/jsonrpc" "^0.28.34"
+    "@polkadot/params" "^0.28.34"
+    "@polkadot/util" "^0.30.2"
 
 "@polkadot/dev-react@^0.20.19":
   version "0.20.19"
@@ -1461,96 +1461,96 @@
     typedoc-plugin-markdown "^1.1.15"
     typescript "^3.0.1"
 
-"@polkadot/extrinsics@^0.28.29":
-  version "0.28.29"
-  resolved "https://registry.yarnpkg.com/@polkadot/extrinsics/-/extrinsics-0.28.29.tgz#6b4909a641b21b7b3a57d41e29021dc203a8a98c"
+"@polkadot/extrinsics@^0.28.34":
+  version "0.28.34"
+  resolved "https://registry.yarnpkg.com/@polkadot/extrinsics/-/extrinsics-0.28.34.tgz#33b6d882ebee6eb819244315da657c787f97b563"
   dependencies:
     "@babel/runtime" "^7.0.0"
-    "@polkadot/params" "^0.28.29"
-    "@polkadot/primitives" "^0.28.29"
-    "@polkadot/util" "^0.29.33"
+    "@polkadot/params" "^0.28.34"
+    "@polkadot/primitives" "^0.28.34"
+    "@polkadot/util" "^0.30.2"
 
-"@polkadot/jsonrpc@^0.28.29":
-  version "0.28.29"
-  resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.28.29.tgz#d6169dacf02f7d24d7e948219b36f2f2c449206e"
+"@polkadot/jsonrpc@^0.28.34":
+  version "0.28.34"
+  resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.28.34.tgz#aaeee0fcdb10e0677430f300ce076843be94f72c"
   dependencies:
-    "@polkadot/params" "^0.28.29"
+    "@polkadot/params" "^0.28.34"
     babel-runtime "^6.26.0"
 
-"@polkadot/params@^0.28.29":
-  version "0.28.29"
-  resolved "https://registry.yarnpkg.com/@polkadot/params/-/params-0.28.29.tgz#d079b827c604c5f32663ffbfacdd5d4e4a28021a"
+"@polkadot/params@^0.28.34":
+  version "0.28.34"
+  resolved "https://registry.yarnpkg.com/@polkadot/params/-/params-0.28.34.tgz#20b5e51bc02bfbcfa5deba8d90c67b520c146df7"
   dependencies:
     "@babel/runtime" "^7.0.0"
-    "@polkadot/extrinsics" "^0.28.29"
-    "@polkadot/params" "^0.28.29"
-    "@polkadot/primitives" "^0.28.29"
-    "@polkadot/util" "^0.29.33"
-    "@polkadot/util-keyring" "^0.29.33"
+    "@polkadot/extrinsics" "^0.28.34"
+    "@polkadot/params" "^0.28.34"
+    "@polkadot/primitives" "^0.28.34"
+    "@polkadot/util" "^0.30.2"
+    "@polkadot/util-keyring" "^0.30.2"
 
-"@polkadot/primitives@^0.28.29":
-  version "0.28.29"
-  resolved "https://registry.yarnpkg.com/@polkadot/primitives/-/primitives-0.28.29.tgz#0b0b99242048e606701a8b33cd12c2eeff7d7857"
+"@polkadot/primitives@^0.28.34":
+  version "0.28.34"
+  resolved "https://registry.yarnpkg.com/@polkadot/primitives/-/primitives-0.28.34.tgz#654560fa4a8c1b04594171f09b430543e7307cdf"
   dependencies:
     "@babel/runtime" "^7.0.0"
-    "@polkadot/trie-hash" "^0.29.33"
-    "@polkadot/util" "^0.29.33"
+    "@polkadot/trie-hash" "^0.30.2"
+    "@polkadot/util" "^0.30.2"
 
-"@polkadot/storage@^0.28.29":
-  version "0.28.29"
-  resolved "https://registry.yarnpkg.com/@polkadot/storage/-/storage-0.28.29.tgz#a96ea7ad7db953788beaa1b1b2d59cd303313b1d"
+"@polkadot/storage@^0.28.34":
+  version "0.28.34"
+  resolved "https://registry.yarnpkg.com/@polkadot/storage/-/storage-0.28.34.tgz#aa723a366e328a3d4befeb6016fb55331f4802d1"
   dependencies:
     "@babel/runtime" "^7.0.0"
-    "@polkadot/params" "^0.28.29"
-    "@polkadot/primitives" "^0.28.29"
-    "@polkadot/util" "^0.29.33"
-    "@polkadot/util-crypto" "^0.29.33"
-    "@polkadot/util-keyring" "^0.29.33"
+    "@polkadot/params" "^0.28.34"
+    "@polkadot/primitives" "^0.28.34"
+    "@polkadot/util" "^0.30.2"
+    "@polkadot/util-crypto" "^0.30.2"
+    "@polkadot/util-keyring" "^0.30.2"
 
-"@polkadot/trie-hash@^0.29.33":
-  version "0.29.33"
-  resolved "https://registry.yarnpkg.com/@polkadot/trie-hash/-/trie-hash-0.29.33.tgz#530757d2a080620175fb1907fe3d56a1970dc415"
+"@polkadot/trie-hash@^0.30.2":
+  version "0.30.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/trie-hash/-/trie-hash-0.30.2.tgz#731ef56c9a401ca6a57a05a213b16def501a3403"
   dependencies:
     "@babel/runtime" "^7.0.0"
-    "@polkadot/util" "^0.29.33"
-    "@polkadot/util-crypto" "^0.29.33"
-    "@polkadot/util-rlp" "^0.29.33"
+    "@polkadot/util" "^0.30.2"
+    "@polkadot/util-crypto" "^0.30.2"
+    "@polkadot/util-rlp" "^0.30.2"
 
 "@polkadot/ts@^0.1.27":
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/@polkadot/ts/-/ts-0.1.27.tgz#88ddd9e90f4c5c98996ecd433670839eaf530d73"
 
-"@polkadot/util-crypto@^0.29.33":
-  version "0.29.33"
-  resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.29.33.tgz#299136ce92bb68d616f8b2b00cb5c4630a4fee67"
+"@polkadot/util-crypto@^0.30.2":
+  version "0.30.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.30.2.tgz#9804bc339f4d9b64e7b538c4537a41da1329af77"
   dependencies:
     "@babel/runtime" "^7.0.0"
-    "@polkadot/util" "^0.29.33"
+    "@polkadot/util" "^0.30.2"
     blakejs "^1.1.0"
     js-sha3 "^0.8.0"
     tweetnacl "^1.0.0"
     xxhashjs "^0.2.2"
 
-"@polkadot/util-keyring@^0.29.33":
-  version "0.29.33"
-  resolved "https://registry.yarnpkg.com/@polkadot/util-keyring/-/util-keyring-0.29.33.tgz#c6fd3325c08fb103cf0a4f49aa74977722ab16ee"
+"@polkadot/util-keyring@^0.30.2":
+  version "0.30.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/util-keyring/-/util-keyring-0.30.2.tgz#f15610d54165475560633dddfe3c9240f0db9a11"
   dependencies:
     "@babel/runtime" "^7.0.0"
-    "@polkadot/util" "^0.29.33"
-    "@polkadot/util-crypto" "^0.29.33"
+    "@polkadot/util" "^0.30.2"
+    "@polkadot/util-crypto" "^0.30.2"
     "@types/bs58" "^3.0.30"
     bs58 "^4.0.1"
 
-"@polkadot/util-rlp@^0.29.33":
-  version "0.29.33"
-  resolved "https://registry.yarnpkg.com/@polkadot/util-rlp/-/util-rlp-0.29.33.tgz#0a5f9b2d954cc2f9cd92964f0efd0372a03ee808"
+"@polkadot/util-rlp@^0.30.2":
+  version "0.30.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/util-rlp/-/util-rlp-0.30.2.tgz#ffb354e8291fd016a3ddc0c44d25af5eedae0f09"
   dependencies:
     "@babel/runtime" "^7.0.0"
-    "@polkadot/util" "^0.29.33"
+    "@polkadot/util" "^0.30.2"
 
-"@polkadot/util@^0.29.33":
-  version "0.29.33"
-  resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.29.33.tgz#b8e59146584c4649ca9308aa636d63d0b2ea2db3"
+"@polkadot/util@^0.30.2":
+  version "0.30.2"
+  resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.30.2.tgz#097eb2cbd5af7fed3809323b95df99b0369f5ef3"
   dependencies:
     "@babel/runtime" "^7.0.0"
     "@types/bn.js" "^4.11.1"