diff --git a/.gitignore b/.gitignore
index a6a2eece..6993143b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,10 +52,11 @@ Thumbs.db
 node_modules
 dist
 ng-dist
-ng-dist/vendor.js
-ng-dist/styles.css
-ng-dist/scripts.js
-ng-dist/polyfills.js
-ng-dist/main.js
-ng-dist/index.html
-ng-dist/3rdpartylicenses.txt
+ng-dist/vendor.js
+ng-dist/styles.css
+ng-dist/scripts.js
+ng-dist/polyfills.js
+ng-dist/main.js
+ng-dist/index.html
+ng-dist/3rdpartylicenses.txt
+autoclaim.json
diff --git a/build-liberland.js b/build-liberland.js
new file mode 100644
index 00000000..d6bbd998
--- /dev/null
+++ b/build-liberland.js
@@ -0,0 +1,16 @@
+const fs = require('fs');
+const conf = require('./package.json');
+
+conf.compilerVersion = "LIBERLAND TESTNET";
+conf.name = 'liberland-wallet';
+conf.appId = "io.eosrio.liberland-wallet";
+conf.productName = 'Liberland Wallet';
+conf.description = 'Liberland Blockchain Wallet';
+conf.build.appId = 'liberland-wallet';
+conf.build.win.icon = "src/assets/liberland_256_LdC_icon.ico";
+conf.build.dmg.icon = "src/assets/icons/liberland256x256.icns";
+conf.build.mac.icon = "liberland518x518.png";
+conf.build.linux.icon = "liberland256x256.png";
+
+fs.writeFileSync('./package.json', JSON.stringify(conf, null, "\t"));
+
diff --git a/build-simpleos.js b/build-simpleos.js
new file mode 100644
index 00000000..9160d494
--- /dev/null
+++ b/build-simpleos.js
@@ -0,0 +1,17 @@
+const fs = require('fs');
+
+const conf = require('./package.json');
+
+conf.compilerVersion = "EOS MAINNET";
+conf.name = 'simpleos';
+conf.appId = "io.eosrio.simpleos";
+conf.productName = 'simpleos';
+conf.description = 'EOSIO Blockchain Interface & Wallet';
+conf.build.appId = 'simpleos';
+conf.build.win.icon = "src/favicon.ico";
+conf.build.mac.icon = "icon.png";
+conf.build.dmg.icon = "src/assets/icons/256x256.icns";
+conf.build.linux.icon = "256x256.png";
+
+fs.writeFileSync('./package.json', JSON.stringify(conf, null, "\t"));
+
diff --git a/index.js b/index.js
index 465ff843..b5ef3611 100644
--- a/index.js
+++ b/index.js
@@ -1,201 +1,508 @@
-const {app, BrowserWindow, Menu, protocol, ipcMain} = require('electron');
+const {app, BrowserWindow, Menu, protocol, ipcMain, Notification, Tray, shell} = require('electron');
 const path = require('path');
 const url = require('url');
-const {version} = require('./package.json');
+const {version, productName, name} = require('./package.json');
 app.getVersion = () => version;
 const PROTOCOL_PREFIX = 'simpleos';
 const args = process.argv.slice(1);
+
+const portfinder = require('portfinder');
+portfinder['basePort'] = 47888;
+portfinder['highestPort'] = 47900;
+
+const schedule = require('node-schedule');
+
+const keytar = require('keytar');
+const fs = require('fs');
+
+const {Api, JsonRpc, RpcError} = require('eosjs');
+const {TextEncoder, TextDecoder} = require('util');
+const fetch = require('isomorphic-fetch');
+const {JsSignatureProvider} = require('eosjs/dist/eosjs-jssig');
+const TextEnc = new TextEncoder();
+const TextDec = new TextDecoder();
+
 const cors = require('cors');
 const bodyParser = require('body-parser');
 const express = require('express')();
 const PORT = 47888;
 const http = require('http').Server(express);
 
-let win, devtools, serve;
+let win, devtools, serve, isAutoLaunch;
+let appIcon = null;
 let deepLink = null;
+let job = null;
 devtools = args.some(val => val === '--devtools');
 serve = args.some(val => val === '--serve');
+isAutoLaunch = args.some(val => val === '--autostart');
 
 const contextMenu = require('electron-context-menu');
 contextMenu();
 
-express.use(cors());
-
-express.get('/ping', (req, res) => {
-    res.end('OK');
-});
-
-express.get('/accounts', (req, res) => {
-    win.webContents.send('request', 'accounts');
-    ipcMain.once('accountsResponse', (event, data) => {
-        console.log(data);
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(data));
-    });
-});
-
-express.get('/getPublicKeys', (req, res) => {
-    win.webContents.send('request', {
-        message: 'publicKeys'
-    });
-    ipcMain.once('publicKeyResponse', (event, data) => {
-        console.log(data);
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(data));
-    });
-});
-
-express.post('/sign', bodyParser.json(), (req, res) => {
-    win.webContents.send('request', {
-        message: 'sign',
-        content: req.body
-    });
-    ipcMain.once('signResponse', (event, data) => {
-        console.log(data);
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(data));
-    });
-});
-
-express.get('/connect', (req, res) => {
-    console.log('CONNECT REQUEST');
-    win.webContents.send('request', {
-        message: 'connect',
-        content: {
-            appName: req.query['appName'],
-            chainId: req.query['chainId']
-        }
-    });
-    ipcMain.once('connectResponse', (event, data) => {
-        console.log(data);
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(data));
-    });
-});
-
-express.get('/login', (req, res) => {
-    console.log('LOGIN REQUEST');
-    win.webContents.send('request', {
-        message: 'login',
-        content: {
-            account: req.query.account
-        }
-    });
-    ipcMain.once('loginResponse', (event, data) => {
-        console.log(data);
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(data));
-    });
-});
-
-express.get('/logout', (req, res) => {
-    console.log('LOGOUT REQUEST');
-    win.webContents.send('request', {
-        message: 'logout',
-        content: {
-            account: req.query.account
-        }
-    });
-    ipcMain.once('logoutResponse', (event, data) => {
-        console.log(data);
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(data));
-    });
-});
-
-express.get('/disconnect', (req, res) => {
-    console.log('DISCONNECT REQUEST');
-    win.webContents.send('request', {
-        message: 'disconnect'
-    });
-    ipcMain.once('disconnectResponse', (event, data) => {
-        console.log(data);
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify(data));
-    });
-});
+function setupExpress() {
+	express.use(cors());
+
+	express.get('/ping', (req, res) => {
+		res.end('OK');
+	});
+
+	express.get('/accounts', (req, res) => {
+		win.webContents.send('request', 'accounts');
+		ipcMain.once('accountsResponse', (event, data) => {
+			console.log(data);
+			res.setHeader('Content-Type', 'application/json');
+			res.end(JSON.stringify(data));
+		});
+	});
+
+	express.get('/getPublicKeys', (req, res) => {
+		win.webContents.send('request', {
+			message: 'publicKeys'
+		});
+		ipcMain.once('publicKeyResponse', (event, data) => {
+			console.log(data);
+			res.setHeader('Content-Type', 'application/json');
+			res.end(JSON.stringify(data));
+		});
+	});
+
+	express.post('/sign', bodyParser.json(), (req, res) => {
+		win.webContents.send('request', {
+			message: 'sign',
+			content: req.body
+		});
+		getFocus();
+		ipcMain.once('signResponse', (event, data) => {
+			console.log(data);
+			res.setHeader('Content-Type', 'application/json');
+			if (data.status !== 'CANCELLED') {
+				unfocus();
+			}
+			res.end(JSON.stringify(data));
+		});
+	});
+
+	express.get('/connect', (req, res) => {
+		console.log('CONNECT REQUEST');
+		win.webContents.send('request', {
+			message: 'connect',
+			content: {
+				appName: req.query['appName'],
+				chainId: req.query['chainId']
+			}
+		});
+		if (req.query['appName'].length < 32 && req.query['chainId'].length === 64) {
+			ipcMain.once('connectResponse', (event, data) => {
+				console.log(data);
+				res.setHeader('Content-Type', 'application/json');
+				res.end(JSON.stringify(data));
+			});
+		}
+	});
+
+	express.get('/login', (req, res) => {
+		win.webContents.send('request', {
+			message: 'login',
+			content: {
+				account: req.query.account
+			}
+		});
+		getFocus();
+		if (req.query.account) {
+			if (req.query.account.length > 13) {
+				res.end('ERROR');
+				return false;
+			}
+		}
+		ipcMain.once('loginResponse', (event, data) => {
+			console.log(data);
+			if (data.status !== 'CANCELLED') {
+				unfocus();
+			}
+			res.setHeader('Content-Type', 'application/json');
+			res.end(JSON.stringify(data));
+		});
+	});
+
+	express.get('/logout', (req, res) => {
+		console.log('LOGOUT REQUEST');
+		win.webContents.send('request', {
+			message: 'logout',
+			content: {
+				account: req.query.account
+			}
+		});
+		if (req.query.account) {
+			if (req.query.account.length > 13) {
+				res.end('ERROR');
+				return false;
+			}
+		}
+		ipcMain.once('logoutResponse', (event, data) => {
+			console.log(data);
+			res.setHeader('Content-Type', 'application/json');
+			res.end(JSON.stringify(data));
+		});
+	});
+
+	express.get('/disconnect', (req, res) => {
+		console.log('DISCONNECT REQUEST');
+		win.webContents.send('request', {
+			message: 'disconnect'
+		});
+		ipcMain.once('disconnectResponse', (event, data) => {
+			console.log(data);
+			res.setHeader('Content-Type', 'application/json');
+			res.end(JSON.stringify(data));
+		});
+	});
+}
+
+function getFocus() {
+
+	if (win) {
+		if (win.isMinimized()) {
+			win.restore();
+		}
+		win.focus();
+		win.show();
+	}
+
+	if (process.platform === 'darwin') {
+		app.dock.hide();
+		win.setAlwaysOnTop(false);
+		win.setVisibleOnAllWorkspaces(true);
+		win.setFullScreenable(false);
+		app.dock.show();
+	}
+}
+
+function unfocus() {
+	switch (process.platform) {
+		case "win32": {
+			win.minimize();
+			break;
+		}
+		case "linux": {
+			win.hide();
+			break;
+		}
+		case "darwin": {
+			Menu.sendActionToFirstResponder('hide:');
+			break;
+		}
+	}
+}
+
+function regURI() {
+	app.setAsDefaultProtocolClient(PROTOCOL_PREFIX);
+	protocol.registerHttpProtocol(PROTOCOL_PREFIX, (req, callback) => {
+		if (req.url < 128) {
+			deepLink = req;
+			alert(deepLink);
+			setTimeout(() => {
+				win.webContents.send('request', {
+					message: 'launch',
+					content: deepLink.url
+				});
+			}, 5000);
+		}
+		callback();
+	});
+}
 
 async function createWindow() {
-    app.setAsDefaultProtocolClient(PROTOCOL_PREFIX);
-    protocol.registerHttpProtocol(PROTOCOL_PREFIX, (req, callback) => {
-        deepLink = req;
-        alert(deepLink);
-        setTimeout(() => {
-            win.webContents.send('request', {
-                message: 'launch',
-                content: deepLink.url
-            });
-        }, 5000);
-        callback();
-    });
-    win = new BrowserWindow({
-        title: 'simplEOS',
-        webPreferences: {
-            nodeIntegration: true,
-            webSecurity: !serve,
-            devTools: true
-        },
-        darkTheme: true,
-        width: 1440,
-        height: 920,
-        minWidth: 800,
-        minHeight: 600,
-        backgroundColor: '#222222',
-        frame: false,
-        icon: path.join(__dirname, 'src/assets/icons/ico/simpleos.ico')
-    });
-    // win.removeMenu();
-    if (serve) {
-        require('electron-reload')(__dirname, {
-            electron: path.join(__dirname, 'node_modules', '.bin', 'electron'),
-            hardResetMethod: 'exit'
-        });
-        await win.loadURL('http://localhost:7777');
-    } else {
-        await win.loadURL(url.format({
-            pathname: path.join(__dirname, 'ng-dist/index.html'),
-            protocol: 'file:',
-            slashes: true
-        }));
-    }
-
-    if (devtools) {
-        win.webContents.openDevTools();
-    }
-
-    win.on('closed', () => {
-        win = null;
-    });
+	regURI();
+	let _icon = path.join(__dirname, 'src/assets/icons/ico/simpleos.ico');
+	let _bgColor = '#222222';
+	if (name === 'liberland-wallet') {
+		_icon = path.join(__dirname, 'src/assets/icons/ico/ll.ico');
+		_bgColor = '#084577';
+	}
+	win = new BrowserWindow({
+		title: productName,
+		webPreferences: {
+			nodeIntegration: true,
+			webSecurity: !serve,
+			devTools: false
+		},
+		darkTheme: true,
+		width: 1440,
+		height: 920,
+		minWidth: 800,
+		minHeight: 600,
+		backgroundColor: _bgColor,
+		frame: false,
+		icon: _icon
+	});
+	win.removeMenu();
+	if (serve) {
+		require('electron-reload')(__dirname, {
+			electron: path.join(__dirname, 'node_modules', '.bin', 'electron'),
+			hardResetMethod: 'exit'
+		});
+		await win.loadURL('http://localhost:7777');
+	} else {
+		await win.loadURL(url.format({
+			pathname: path.join(__dirname, 'ng-dist/index.html'),
+			protocol: 'file:',
+			slashes: true
+		}));
+	}
+
+	if (devtools) {
+		win.webContents.openDevTools();
+	}
+
+	win.webContents.on('did-finish-load', () => {
+		win.setTitle(productName);
+	});
+
+	win.on('closed', () => {
+		win = null;
+	});
+}
+
+function notify(title, body, autoClose) {
+	const notification = new Notification({
+		title: title,
+		body: body
+	});
+	notification.show();
+	notification.on('click', () => {
+		if (win) {
+			getFocus();
+		} else {
+			launchApp();
+			createWindow();
+		}
+	});
+	if (autoClose > 0) {
+		setTimeout(() => {
+			notification.close();
+		}, autoClose);
+	}
+}
+
+function notifyTrx(title, body, autoClose, trx_id) {
+	const notification = new Notification({
+		title: title,
+		body: body
+	});
+	notification.show();
+
+	notification.on('click', () => {
+		shell.openExternal('https://wax.bloks.io/transaction/' + trx_id);
+	});
+
+	if (autoClose > 0) {
+		setTimeout(() => {
+			notification.close();
+		}, autoClose);
+	}
+}
+
+function launchApp() {
+	const gotTheLock = app.requestSingleInstanceLock();
+	if (!gotTheLock) {
+		app.quit()
+	} else {
+		portfinder.getPortPromise().then((port) => {
+			http.listen(port, "127.0.0.1", () => {
+				console.log('listening on 127.0.0.1:' + port);
+			});
+		}).catch((err) => {
+			alert(err);
+		});
+
+		app.on('second-instance', () => {
+			console.log('launching second instance...');
+			if (win) {
+				if (win.isMinimized()) {
+					win.restore();
+				}
+				win.focus();
+			}
+		});
+
+		app.on('ready', () => {
+			console.log('creating window...');
+			createWindow();
+		});
+
+		app.on('window-all-closed', () => {
+			app.quit();
+		});
+
+		app.on('activate', async () => {
+			if (win === null) {
+				await createWindow();
+			}
+		});
+	}
+}
+
+async function claimGBM(account_name, api_url, private_key, permission) {
+	const rpc = new JsonRpc(api_url, {fetch});
+	const signatureProvider = new JsSignatureProvider([private_key]);
+	const api = new Api({rpc, signatureProvider, textDecoder: TextDec, textEncoder: TextEnc});
+
+	// check current votes
+	const accountData = await rpc.get_account(account_name);
+	let _producers = [];
+	let _proxy = '';
+	if (accountData['voter_info']) {
+		if (accountData['voter_info']['proxy'] !== '') {
+			// voting on proxy
+			_proxy = accountData['voter_info']['proxy'];
+		} else {
+			// voting on producers
+			_producers = accountData['voter_info']['producers'];
+		}
+	}
+
+	const _actions = [];
+
+	_actions.push({
+		account: 'eosio',
+		name: 'voteproducer',
+		authorization: [{
+			actor: account_name,
+			permission: permission,
+		}],
+		data: {
+			voter: account_name,
+			proxy: _proxy,
+			producers: _producers
+		},
+	});
+
+	_actions.push({
+		account: 'eosio',
+		name: 'claimgenesis',
+		authorization: [{
+			actor: account_name,
+			permission: 'claim',
+		}],
+		data: {
+			claimer: account_name
+		},
+	});
+
+	_actions.push({
+		account: 'eosio',
+		name: 'claimgbmvote',
+		authorization: [{
+			actor: account_name,
+			permission: 'claim',
+		}],
+		data: {
+			owner: account_name
+		},
+	});
+
+	try {
+		const result = await api.transact({
+			actions: _actions
+		}, {
+			blocksBehind: 3,
+			expireSeconds: 30,
+			broadcast: true
+		});
+		console.log(result);
+		const logFile = 'autoclaim-trx-log_' + (Date.now()) + '.txt';
+		fs.writeFileSync(logFile, JSON.stringify(result));
+		notifyTrx('Auto-claim executed', 'Account: ' + account_name, 0, result.transaction_id);
+	} catch (e) {
+		console.log('\nCaught exception: ' + e);
+		if (e instanceof RpcError)
+			console.log(JSON.stringify(e.json, null, 2));
+	}
 }
 
-const gotTheLock = app.requestSingleInstanceLock();
+function addTrayIcon() {
+	const trayIcon = path.join(__dirname, 'src/assets/icons/ico/simpleos-multi.ico');
+	console.log(trayIcon);
+	appIcon = new Tray(trayIcon);
+	const trayMenu = Menu.buildFromTemplate([
+		{
+			label: 'Quit SimplEOS Agent', click: () => {
+				appIcon.destroy();
+				app.quit();
+			}
+		}
+	]);
+	appIcon.setToolTip('simplEOS Agent');
+	appIcon.setContextMenu(trayMenu);
+	console.log('Adding tray icon');
+}
+
+function storeConfig(autoClaimConfig) {
+	try {
+		const data = JSON.stringify(autoClaimConfig, null, '\t');
+		fs.writeFileSync('autoclaim.json', data);
+	} catch (e) {
+		const logFile = 'autoclaim-error_' + (Date.now()) + '.txt';
+		fs.writeFileSync(logFile, e);
+		shell.openItem(logFile);
+		console.log(e);
+	}
+}
+
+// Main startup logic
+
+function runAutoClaim() {
+	const cPath = 'autoclaim.json';
+	if (fs.existsSync('autoclaim.json')) {
+		console.log('Loading configuration file...');
+		fs.readFile(cPath, (err, data) => {
+			if (err) throw err;
+			let autoclaimConf = JSON.parse(data);
+			(async () => {
+				if (autoclaimConf['WAX-GBM']) {
+					for (const job of autoclaimConf['WAX-GBM']['jobs']) {
+						if (Date.now() - job['last_claim'] > (24 * 60 * 60 * 1000)) {
+							console.log(`${job.account} is ready to claim!`);
+							try {
+								await claimGBM(job.account, autoclaimConf['WAX-GBM']['apis'][0], (await keytar.getPassword('simpleos', job['public_key'])), job['permission']);
+								job['last_claim'] = Date.now();
+								// const next_claim = (Date.now() + (24 * 60 * 60 * 1000));
+								const next_claim = (Date.now() + (60 * 1000));
+								console.log('Scheduling next claim to: ' + next_claim);
+								job['next_claim_time'] = next_claim;
+								schedule.scheduleJob(new Date(next_claim), () => {
+									runAutoClaim();
+								});
+							} catch (e) {
+								const logFile = 'autoclaim-error_' + (Date.now()) + '.txt';
+								fs.writeFileSync(logFile, e);
+								shell.openItem(logFile);
+								console.log(e);
+							}
+						} else {
+							console.log(`${job.account} claims again at ${(new Date(job['last_claim'] + (24 * 60 * 60 * 1000)))}`);
+						}
+					}
+					storeConfig(autoclaimConf);
+				}
+			})();
+		});
+
+	} else {
+		console.log('Configuration file not present, quitting');
+		app.quit();
+	}
+}
 
-if (!gotTheLock) {
-    app.quit()
+if (isAutoLaunch) {
+	app.on('ready', () => {
+		console.log('READY!');
+		addTrayIcon();
+	});
+	runAutoClaim();
 } else {
-    http.listen(PORT, "127.0.0.1", () => {
-        console.log('listening on lcoalhost:' + PORT);
-    });
-    app.on('second-instance', () => {
-        if (win) {
-            if (win.isMinimized()) {
-                win.restore();
-            }
-            win.focus();
-        }
-    });
-
-    app.on('ready', createWindow);
-
-    app.on('window-all-closed', () => {
-        app.quit();
-    });
-
-    app.on('activate', async () => {
-        if (win === null) {
-            await createWindow();
-        }
-    });
+	setupExpress();
+	launchApp();
 }
 
 
diff --git a/liberland256x256.png b/liberland256x256.png
new file mode 100644
index 00000000..482172e0
Binary files /dev/null and b/liberland256x256.png differ
diff --git a/liberland518x518.png b/liberland518x518.png
new file mode 100644
index 00000000..955c8003
Binary files /dev/null and b/liberland518x518.png differ
diff --git a/package-lock.json b/package-lock.json
index 00e04f11..516bbe67 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "simpleos",
-	"version": "0.8.1",
+	"version": "0.8.1-rc3",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -1528,6 +1528,11 @@
 			"integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==",
 			"dev": true
 		},
+		"applescript": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/applescript/-/applescript-1.0.0.tgz",
+			"integrity": "sha1-u4evVoytA0pOSMS9r2Bno6JwExc="
+		},
 		"aproba": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
@@ -1737,6 +1742,18 @@
 			"integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
 			"dev": true
 		},
+		"auto-launch": {
+			"version": "5.0.5",
+			"resolved": "https://registry.npmjs.org/auto-launch/-/auto-launch-5.0.5.tgz",
+			"integrity": "sha512-ppdF4mihhYzMYLuCcx9H/c5TUOCev8uM7en53zWVQhyYAJrurd2bFZx3qQVeJKF2jrc7rsPRNN5cD+i23l6PdA==",
+			"requires": {
+				"applescript": "^1.0.0",
+				"mkdirp": "^0.5.1",
+				"path-is-absolute": "^1.0.0",
+				"untildify": "^3.0.2",
+				"winreg": "1.2.4"
+			}
+		},
 		"autoprefixer": {
 			"version": "9.6.0",
 			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.0.tgz",
@@ -2030,6 +2047,15 @@
 			"resolved": "https://registry.npmjs.org/bip32-path/-/bip32-path-0.4.2.tgz",
 			"integrity": "sha1-XbBBataCJxLwd4NuJVe4aXwMfJk="
 		},
+		"bl": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
+			"integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
+			"requires": {
+				"readable-stream": "^2.3.5",
+				"safe-buffer": "^5.1.1"
+			}
+		},
 		"blob": {
 			"version": "0.0.5",
 			"resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
@@ -2403,7 +2429,6 @@
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
 			"integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
-			"dev": true,
 			"requires": {
 				"buffer-alloc-unsafe": "^1.1.0",
 				"buffer-fill": "^1.0.0"
@@ -2412,14 +2437,12 @@
 		"buffer-alloc-unsafe": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-			"integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
-			"dev": true
+			"integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
 		},
 		"buffer-fill": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
-			"integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
-			"dev": true
+			"integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw="
 		},
 		"buffer-from": {
 			"version": "1.1.1",
@@ -3385,6 +3408,15 @@
 				"sha.js": "^2.4.8"
 			}
 		},
+		"cron-parser": {
+			"version": "2.12.0",
+			"resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-2.12.0.tgz",
+			"integrity": "sha512-1GU6CQJ6gT9XDEGeTuzfhZgFMf82BSs3ihFA3i2wr4qGKJLhO1kOvaIF9biIo39CaPgzZ17U8FgYxRv/+UR50A==",
+			"requires": {
+				"is-nan": "^1.2.1",
+				"moment-timezone": "^0.5.25"
+			}
+		},
 		"cross-spawn": {
 			"version": "6.0.5",
 			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -3520,7 +3552,6 @@
 			"version": "3.3.0",
 			"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
 			"integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
-			"dev": true,
 			"requires": {
 				"mimic-response": "^1.0.0"
 			}
@@ -3555,7 +3586,6 @@
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
 			"integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-			"dev": true,
 			"requires": {
 				"object-keys": "^1.0.12"
 			},
@@ -3563,8 +3593,7 @@
 				"object-keys": {
 					"version": "1.1.1",
 					"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-					"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-					"dev": true
+					"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
 				}
 			}
 		},
@@ -4273,7 +4302,6 @@
 			"version": "0.1.12",
 			"resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
 			"integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
-			"dev": true,
 			"requires": {
 				"iconv-lite": "~0.4.13"
 			}
@@ -4282,7 +4310,6 @@
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
 			"integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-			"dev": true,
 			"requires": {
 				"once": "^1.4.0"
 			}
@@ -4602,6 +4629,11 @@
 				}
 			}
 		},
+		"expand-template": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
+			"integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="
+		},
 		"express": {
 			"version": "4.17.1",
 			"resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
@@ -5051,6 +5083,11 @@
 				"readable-stream": "^2.0.0"
 			}
 		},
+		"fs-constants": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+			"integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+		},
 		"fs-extra": {
 			"version": "4.0.3",
 			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
@@ -5745,6 +5782,11 @@
 				"assert-plus": "^1.0.0"
 			}
 		},
+		"github-from-package": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
+			"integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4="
+		},
 		"glob": {
 			"version": "7.1.3",
 			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
@@ -6653,6 +6695,14 @@
 				"is-path-inside": "^1.0.0"
 			}
 		},
+		"is-nan": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.2.1.tgz",
+			"integrity": "sha1-n69ltvttskt/XAYoR16nH5iEAeI=",
+			"requires": {
+				"define-properties": "^1.1.1"
+			}
+		},
 		"is-npm": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/is-npm/-/is-npm-3.0.0.tgz",
@@ -6741,8 +6791,7 @@
 		"is-stream": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-			"dev": true
+			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
 		},
 		"is-symbol": {
 			"version": "1.0.2",
@@ -6814,6 +6863,26 @@
 			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
 			"dev": true
 		},
+		"isomorphic-fetch": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
+			"integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
+			"requires": {
+				"node-fetch": "^1.0.1",
+				"whatwg-fetch": ">=0.10.0"
+			},
+			"dependencies": {
+				"node-fetch": {
+					"version": "1.7.3",
+					"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
+					"integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
+					"requires": {
+						"encoding": "^0.1.11",
+						"is-stream": "^1.0.1"
+					}
+				}
+			}
+		},
 		"isstream": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
@@ -7068,6 +7137,22 @@
 			"resolved": "https://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz",
 			"integrity": "sha1-HoBFQlABjbrUw/6USX1uZ7YmnHc="
 		},
+		"keytar": {
+			"version": "4.11.0",
+			"resolved": "https://registry.npmjs.org/keytar/-/keytar-4.11.0.tgz",
+			"integrity": "sha512-cGn2xd4NY0yCBrU5zQ/lwIagP1UBOhUEemi6iSJU2gshN1RHkxHekSdLUji9IWNo5B1Va/iwXXWzGD2p8ziqfQ==",
+			"requires": {
+				"nan": "2.14.0",
+				"prebuild-install": "5.3.0"
+			},
+			"dependencies": {
+				"nan": {
+					"version": "2.14.0",
+					"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+					"integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
+				}
+			}
+		},
 		"keyv": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
@@ -7286,6 +7371,11 @@
 			"resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz",
 			"integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s="
 		},
+		"long-timeout": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/long-timeout/-/long-timeout-0.1.1.tgz",
+			"integrity": "sha1-lyHXiLR+C8taJMLivuGg2lXatRQ="
+		},
 		"loose-envify": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -7565,8 +7655,7 @@
 		"mimic-response": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-			"integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-			"dev": true
+			"integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
 		},
 		"mini-css-extract-plugin": {
 			"version": "0.7.0",
@@ -7709,6 +7798,14 @@
 			"resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
 			"integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
 		},
+		"moment-timezone": {
+			"version": "0.5.25",
+			"resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.25.tgz",
+			"integrity": "sha512-DgEaTyN/z0HFaVcVbSyVCUU6HeFdnNC3vE4c9cgu2dgMTvjBUBdBzWfasTBmAW45u5OIMeCJtU8yNjM22DHucw==",
+			"requires": {
+				"moment": ">= 2.9.0"
+			}
+		},
 		"move-concurrently": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
@@ -7776,6 +7873,11 @@
 				"to-regex": "^3.0.1"
 			}
 		},
+		"napi-build-utils": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.1.tgz",
+			"integrity": "sha512-boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA=="
+		},
 		"needle": {
 			"version": "2.3.1",
 			"resolved": "https://registry.npmjs.org/needle/-/needle-2.3.1.tgz",
@@ -7875,6 +7977,19 @@
 			"integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
 			"dev": true
 		},
+		"node-abi": {
+			"version": "2.9.0",
+			"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.9.0.tgz",
+			"integrity": "sha512-jmEOvv0eanWjhX8dX1pmjb7oJl1U1oR4FOh0b2GnvALwSYoOdU7sj+kLDSAyjo4pfC9aj/IxkloxdLJQhSSQBA==",
+			"requires": {
+				"semver": "^5.4.1"
+			}
+		},
+		"node-fetch": {
+			"version": "2.6.0",
+			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
+			"integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
+		},
 		"node-fetch-npm": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz",
@@ -7957,6 +8072,21 @@
 				"semver": "^5.3.0"
 			}
 		},
+		"node-schedule": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/node-schedule/-/node-schedule-1.3.2.tgz",
+			"integrity": "sha512-GIND2pHMHiReSZSvS6dpZcDH7pGPGFfWBIEud6S00Q8zEIzAs9ommdyRK1ZbQt8y1LyZsJYZgPnyi7gpU2lcdw==",
+			"requires": {
+				"cron-parser": "^2.7.3",
+				"long-timeout": "0.1.1",
+				"sorted-array-functions": "^1.0.0"
+			}
+		},
+		"noop-logger": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz",
+			"integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI="
+		},
 		"nopt": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
@@ -8909,6 +9039,36 @@
 			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
 			"dev": true
 		},
+		"prebuild-install": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.0.tgz",
+			"integrity": "sha512-aaLVANlj4HgZweKttFNUVNRxDukytuIuxeK2boIMHjagNJCiVKWFsKF4tCE3ql3GbrD2tExPQ7/pwtEJcHNZeg==",
+			"requires": {
+				"detect-libc": "^1.0.3",
+				"expand-template": "^2.0.3",
+				"github-from-package": "0.0.0",
+				"minimist": "^1.2.0",
+				"mkdirp": "^0.5.1",
+				"napi-build-utils": "^1.0.1",
+				"node-abi": "^2.7.0",
+				"noop-logger": "^0.1.1",
+				"npmlog": "^4.0.1",
+				"os-homedir": "^1.0.1",
+				"pump": "^2.0.1",
+				"rc": "^1.2.7",
+				"simple-get": "^2.7.0",
+				"tar-fs": "^1.13.0",
+				"tunnel-agent": "^0.6.0",
+				"which-pm-runs": "^1.0.0"
+			},
+			"dependencies": {
+				"minimist": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+				}
+			}
+		},
 		"prepend-http": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
@@ -9193,7 +9353,6 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
 			"integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-			"dev": true,
 			"requires": {
 				"end-of-stream": "^1.1.0",
 				"once": "^1.3.1"
@@ -10229,6 +10388,21 @@
 			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
 			"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
 		},
+		"simple-concat": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz",
+			"integrity": "sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY="
+		},
+		"simple-get": {
+			"version": "2.8.1",
+			"resolved": "https://registry.npmjs.org/simple-get/-/simple-get-2.8.1.tgz",
+			"integrity": "sha512-lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw==",
+			"requires": {
+				"decompress-response": "^3.3.0",
+				"once": "^1.3.1",
+				"simple-concat": "^1.0.0"
+			}
+		},
 		"single-line-log": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz",
@@ -10538,6 +10712,11 @@
 				"sort-keys": "^1.0.0"
 			}
 		},
+		"sorted-array-functions": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.2.0.tgz",
+			"integrity": "sha512-sWpjPhIZJtqO77GN+LD8dDsDKcWZ9GCOJNqKzi1tvtjGIzwfoyuRH8S0psunmc6Z5P+qfDqztSbwYR5X/e1UTg=="
+		},
 		"source-list-map": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -11045,6 +11224,42 @@
 				"yallist": "^3.0.3"
 			}
 		},
+		"tar-fs": {
+			"version": "1.16.3",
+			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.3.tgz",
+			"integrity": "sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==",
+			"requires": {
+				"chownr": "^1.0.1",
+				"mkdirp": "^0.5.1",
+				"pump": "^1.0.0",
+				"tar-stream": "^1.1.2"
+			},
+			"dependencies": {
+				"pump": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz",
+					"integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==",
+					"requires": {
+						"end-of-stream": "^1.1.0",
+						"once": "^1.3.1"
+					}
+				}
+			}
+		},
+		"tar-stream": {
+			"version": "1.6.2",
+			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
+			"integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
+			"requires": {
+				"bl": "^1.0.0",
+				"buffer-alloc": "^1.2.0",
+				"end-of-stream": "^1.0.0",
+				"fs-constants": "^1.0.0",
+				"readable-stream": "^2.3.0",
+				"to-buffer": "^1.1.1",
+				"xtend": "^4.0.0"
+			}
+		},
 		"temp-file": {
 			"version": "3.3.3",
 			"resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.3.3.tgz",
@@ -11398,6 +11613,11 @@
 			"integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
 			"dev": true
 		},
+		"to-buffer": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
+			"integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="
+		},
 		"to-fast-properties": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
@@ -11619,7 +11839,6 @@
 			"version": "0.6.0",
 			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
 			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-			"dev": true,
 			"requires": {
 				"safe-buffer": "^5.0.1"
 			}
@@ -11798,6 +12017,11 @@
 				}
 			}
 		},
+		"untildify": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz",
+			"integrity": "sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA=="
+		},
 		"unused-filename": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/unused-filename/-/unused-filename-1.0.0.tgz",
@@ -12827,6 +13051,11 @@
 			"integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
 			"dev": true
 		},
+		"whatwg-fetch": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz",
+			"integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="
+		},
 		"when": {
 			"version": "3.6.4",
 			"resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz",
@@ -12848,6 +13077,11 @@
 			"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
 			"dev": true
 		},
+		"which-pm-runs": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz",
+			"integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs="
+		},
 		"wide-align": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
@@ -12898,6 +13132,11 @@
 				}
 			}
 		},
+		"winreg": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/winreg/-/winreg-1.2.4.tgz",
+			"integrity": "sha1-ugZWKbepJRMOFXeRCM9UCZDpjRs="
+		},
 		"wordwrap": {
 			"version": "0.0.3",
 			"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
@@ -12992,8 +13231,7 @@
 		"xtend": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-			"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-			"dev": true
+			"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
 		},
 		"y18n": {
 			"version": "3.2.1",
diff --git a/package.json b/package.json
index c56aed1f..55ec8454 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,8 @@
 {
 	"name": "simpleos",
-	"version": "0.8.1",
+	"version": "0.8.1-rc5",
 	"productName": "simpleos",
+	"appId": "io.eosrio.simpleos",
 	"compilerVersion": "EOS MAINNET",
 	"description": "EOSIO Blockchain Interface & Wallet",
 	"author": {
@@ -17,18 +18,19 @@
 		"electron:start": "npm run postinstall:electron && npm-run-all -p ng:serve electron:serve",
 		"build": "ng build",
 		"build:prod": "ng build --prod",
+		"config:default": "node build-simpleos.js",
+		"config:liberland": "node build-liberland.js",
 		"build:mac": "electron-builder build --mac",
 		"build:win": "electron-builder build --win",
+		"build:linux": "electron-builder build --linux",
 		"pack": "electron-builder --dir",
 		"dist": "electron-builder",
-		"release": "npm run build:prod && electron-builder",
-		"electron:serve-tsc": "tsc -p tsconfig-serve.json",
+		"release:default": "node build-simpleos.js && npm run build:prod && electron-builder",
+		"release:liberland": "node build-liberland.js && npm run build:prod && electron-builder",
 		"electron:serve": "wait-on http-get://localhost:7777/ && electron index.js --serve --devtools",
 		"start:electron-dev": "electron index.js --devtools",
 		"start:electron-prod": "electron index.js",
-		"publish:win": "electron-builder build --win --ia32 --x64",
-		"publish:linux": "electron-builder build --linux -p always",
-		"publish:mac": "electron-builder build --mac -p always",
+		"start:electron-prod-automode": "electron index.js --autostart",
 		"test": "ng test",
 		"lint": "ng lint",
 		"e2e": "ng e2e",
@@ -184,6 +186,7 @@
 		"angular7-json-schema-form": "^1.0.4",
 		"animate.css": "^3.7.0",
 		"asn1-ber": "^1.0.9",
+		"auto-launch": "^5.0.5",
 		"bip32-path": "^0.4.2",
 		"body-parser": "^1.19.0",
 		"chart.js": "^2.8.0",
@@ -193,10 +196,15 @@
 		"eosjs": "^20.0.0",
 		"express": "^4.17.1",
 		"fcbuffer": "^2.2.1",
+		"isomorphic-fetch": "^2.2.1",
+		"keytar": "^4.11.0",
 		"loaderjs": "^1.0.0",
 		"menu": "^0.2.5",
+		"node-fetch": "^2.6.0",
 		"node-pre-gyp": "^0.13.0",
+		"node-schedule": "^1.3.2",
 		"open": "^6.3.0",
+		"portfinder": "latest",
 		"primeicons": "^1.0.0",
 		"quill": "^1.3.6",
 		"socket.io": "^2.2.0",
@@ -204,4 +212,4 @@
 		"tar": "^4.4.10",
 		"tslib": "^1.9.3"
 	}
-}
+}
\ No newline at end of file
diff --git a/package.json.bak b/package.json.bak
new file mode 100644
index 00000000..8d154060
--- /dev/null
+++ b/package.json.bak
@@ -0,0 +1,208 @@
+{
+	"name": "simpleos",
+	"version": "0.8.1-rc2",
+	"productName": "simpleos",
+	"compilerVersion": "EOS MAINNET",
+	"description": "EOSIO Blockchain Interface & Wallet",
+	"author": {
+		"name": "EOSRio",
+		"email": "contact@eosrio.io"
+	},
+	"repository": "https://github.com/eosrio/simpleos",
+	"license": "MIT",
+	"scripts": {
+		"ng": "ng",
+		"ng:serve": "ng serve --port 7777",
+		"start": "npm run postinstall:web && ng serve --port 7777",
+		"electron:start": "npm run postinstall:electron && npm-run-all -p ng:serve electron:serve",
+		"build": "ng build",
+		"build:prod": "ng build --prod",
+		"build:mac": "electron-builder build --mac",
+		"build:win": "electron-builder build --win",
+		"build:linux": "electron-builder build --linux",
+		"pack": "electron-builder --dir",
+		"dist": "electron-builder",
+		"release": "npm run build:prod && electron-builder",
+		"electron:serve-tsc": "tsc -p tsconfig-serve.json",
+		"electron:serve": "wait-on http-get://localhost:7777/ && electron index.js --serve --devtools",
+		"start:electron-dev": "electron index.js --devtools",
+		"start:electron-prod": "electron index.js",
+		"publish:win": "electron-builder build --win --ia32 --x64",
+		"publish:linux": "electron-builder build --linux -p always",
+		"publish:mac": "electron-builder build --mac -p always",
+		"test": "ng test",
+		"lint": "ng lint",
+		"e2e": "ng e2e",
+		"build-watch": "ng build --prod --watch",
+		"postinstall2": "node patch.js && electron-builder install-app-deps",
+		"postinstall": "electron-builder install-app-deps",
+		"postinstall:web": "node postinstall-web",
+		"postinstall:electron": "node postinstall"
+	},
+	"private": true,
+	"main": "index.js",
+	"build": {
+		"appId": "simpleos",
+		"files": [
+			"ng-dist",
+			"index.js",
+			"native.js",
+			"node_modules/opn/index.js",
+			"node_modules/asn1-ber/index.js",
+			"node_modules/fcbuffer/lib/index.js",
+			"node_modules/@ledgerhq/hw-transport-node-hid/lib/TransportNodeHid.js"
+		],
+		"mac": {
+			"category": "public.app-category.finance",
+			"target": [
+				"dmg",
+				"zip"
+			],
+			"icon": "icon.png"
+		},
+		"dmg": {
+			"icon": "src/assets/icons/256x256.icns",
+			"format": "UDZO"
+		},
+		"linux": {
+			"target": [
+				"appImage",
+				"deb"
+			],
+			"icon": "256x256.png",
+			"category": "Network"
+		},
+		"win": {
+			"target": [
+				"nsis"
+			],
+			"publish": [
+				{
+					"provider": "github",
+					"owner": "eosrio",
+					"repo": "simpleos"
+				}
+			],
+			"icon": "src/favicon.ico"
+		},
+		"nsis": {
+			"oneClick": true,
+			"createDesktopShortcut": true
+		},
+		"protocols": [
+			{
+				"name": "simpleos",
+				"role": "Viewer",
+				"schemes": [
+					"simpleos"
+				]
+			}
+		]
+	},
+	"files": [
+		"*.js",
+		"build",
+		"Ng-dist",
+		"node_modules"
+	],
+	"devDependencies": {
+		"@angular-devkit/build-angular": "^0.801.0",
+		"@angular/cli": "^8.1.0",
+		"@angular/compiler": "^8.1.0",
+		"@angular/compiler-cli": "^8.1.0",
+		"@angular/language-service": "^8.1.0",
+		"@types/echarts": "^4.1.8",
+		"@types/jasmine": "~2.8.6",
+		"@types/jasminewd2": "~2.0.3",
+		"@types/node": "^12.0.2",
+		"@webcomponents/custom-elements": "^1.2.2",
+		"ajv": "^6.10.0",
+		"angular2-text-mask": "^9.0.0",
+		"angular2-toaster": "^7.0.0",
+		"bootstrap": "^4.3.1",
+		"codelyzer": "~4.5.0",
+		"core-js": "^2.5.4",
+		"echarts": "^4.2.1",
+		"electron": "^5.0.6",
+		"electron-builder": "^20.44.4",
+		"electron-reload": "^1.4.0",
+		"fuse.js": "^3.4.5",
+		"hammerjs": "^2.0.8",
+		"jquery": "^3.4.0",
+		"lodash-es": "^4.17.11",
+		"lodash.get": "^4.4.2",
+		"lodash.set": "^4.3.2",
+		"moment": "^2.24.0",
+		"ng-lottie": "^0.3.2",
+		"ngx-echarts": "^4.2.1",
+		"ngx-electron": "^2.1.1",
+		"ngx-json-viewer": "^2.4.0",
+		"ngx-markdown": "^8.0.2",
+		"ngx-order-pipe": "^2.0.2",
+		"ngx-pagination": "^4.0.0",
+		"npm-run-all": "^4.1.5",
+		"popper.js": "^1.14.7",
+		"primeng": "^8.0.0",
+		"protractor": "^5.4.2",
+		"rxjs": "^6.5.1",
+		"rxjs-compat": "^6.5.1",
+		"text-encoding-shim": "latest",
+		"text-mask-addons": "^3.7.2",
+		"ts-node": "^7.0.1",
+		"tslint": "^5.12.0",
+		"typescript": "3.4.5",
+		"wait-on": "^3.0.1",
+		"webpack": "^4.12.0",
+		"webpack-dev-server": "^3.3.1",
+		"zone.js": "^0.9.0"
+	},
+	"dependencies": {
+		"@angular/animations": "^8.1.0",
+		"@angular/cdk": "^8.0.2",
+		"@angular/common": "^8.1.0",
+		"@angular/core": "^8.1.0",
+		"@angular/flex-layout": "^8.0.0-beta.26",
+		"@angular/forms": "^8.1.0",
+		"@angular/http": "^8.0.0-beta.10",
+		"@angular/material": "^8.0.2",
+		"@angular/material-moment-adapter": "^8.0.2",
+		"@angular/platform-browser": "^8.1.0",
+		"@angular/platform-browser-dynamic": "^8.1.0",
+		"@angular/router": "^8.1.0",
+		"@clr/angular": "^2.0.1",
+		"@clr/icons": "^2.0.1",
+		"@clr/ui": "^2.0.1",
+		"@fortawesome/angular-fontawesome": "^0.4.0",
+		"@fortawesome/fontawesome-svg-core": "^1.2.19",
+		"@fortawesome/free-brands-svg-icons": "^5.9.0",
+		"@fortawesome/free-regular-svg-icons": "^5.9.0",
+		"@fortawesome/free-solid-svg-icons": "^5.9.0",
+		"@fortawesome/pro-light-svg-icons": "^5.9.0",
+		"@fortawesome/pro-regular-svg-icons": "^5.9.0",
+		"@fortawesome/pro-solid-svg-icons": "^5.9.0",
+		"@ledgerhq/hw-transport": "latest",
+		"@types/crypto-js": "^3.1.43",
+		"angular7-json-schema-form": "^1.0.4",
+		"animate.css": "^3.7.0",
+		"asn1-ber": "^1.0.9",
+		"bip32-path": "^0.4.2",
+		"body-parser": "^1.19.0",
+		"chart.js": "^2.8.0",
+		"cors": "^2.8.5",
+		"crypto-js": "^3.1.9-1",
+		"electron-context-menu": "^0.12.1",
+		"eosjs": "^20.0.0",
+		"express": "^4.17.1",
+		"fcbuffer": "^2.2.1",
+		"loaderjs": "^1.0.0",
+		"menu": "^0.2.5",
+		"node-pre-gyp": "^0.13.0",
+		"open": "^6.3.0",
+		"primeicons": "^1.0.0",
+		"quill": "^1.3.6",
+		"socket.io": "^2.2.0",
+		"socket.io-client": "^2.2.0",
+		"tar": "^4.4.10",
+		"tslib": "^1.9.3"
+	}
+}
diff --git a/package2.json b/package2.json
new file mode 100644
index 00000000..a64ac05a
--- /dev/null
+++ b/package2.json
@@ -0,0 +1,208 @@
+{
+	"name": "simpleos",
+	"version": "0.8.1-rc2",
+	"productName": "simpleos",
+	"compilerVersion": "EOS MAINNET",
+	"description": "EOSIO Blockchain Interface & Wallet",
+	"author": {
+		"name": "EOSRio",
+		"email": "contact@eosrio.io"
+	},
+	"repository": "https://github.com/eosrio/simpleos",
+	"license": "MIT",
+	"scripts": {
+		"ng": "ng",
+		"ng:serve": "ng serve --port 7777",
+		"start": "npm run postinstall:web && ng serve --port 7777",
+		"electron:start": "npm run postinstall:electron && npm-run-all -p ng:serve electron:serve",
+		"build": "ng build",
+		"build:prod": "ng build --prod",
+		"build:mac": "electron-builder build --mac",
+		"build:win": "electron-builder build --win",
+		"build:linux": "electron-builder build --linux",
+		"pack": "electron-builder --dir",
+		"dist": "electron-builder",
+		"release": "npm run build:prod && electron-builder",
+		"electron:serve-tsc": "tsc -p tsconfig-serve.json",
+		"electron:serve": "wait-on http-get://localhost:7777/ && electron index.js --serve --devtools",
+		"start:electron-dev": "electron index.js --devtools",
+		"start:electron-prod": "electron index.js",
+		"publish:win": "electron-builder build --win --ia32 --x64",
+		"publish:linux": "electron-builder build --linux -p always",
+		"publish:mac": "electron-builder build --mac -p always",
+		"test": "ng test",
+		"lint": "ng lint",
+		"e2e": "ng e2e",
+		"build-watch": "ng build --prod --watch",
+		"postinstall2": "node patch.js && electron-builder install-app-deps",
+		"postinstall": "electron-builder install-app-deps",
+		"postinstall:web": "node postinstall-web",
+		"postinstall:electron": "node postinstall"
+	},
+	"private": true,
+	"main": "index.js",
+	"build": {
+		"appId": "simpleos",
+		"files": [
+			"ng-dist",
+			"index.js",
+			"native.js",
+			"node_modules/opn/index.js",
+			"node_modules/asn1-ber/index.js",
+			"node_modules/fcbuffer/lib/index.js",
+			"node_modules/@ledgerhq/hw-transport-node-hid/lib/TransportNodeHid.js"
+		],
+		"mac": {
+			"category": "public.app-category.finance",
+			"target": [
+				"dmg",
+				"zip"
+			],
+			"icon": "icon.png"
+		},
+		"dmg": {
+			"icon": "src/assets/icons/256x256.icns",
+			"format": "UDZO"
+		},
+		"linux": {
+			"target": [
+				"appImage",
+				"deb"
+			],
+			"icon": "256x256.png",
+			"category": "Network"
+		},
+		"win": {
+			"target": [
+				"nsis"
+			],
+			"publish": [
+				{
+					"provider": "github",
+					"owner": "eosrio",
+					"repo": "simpleos"
+				}
+			],
+			"icon": "src/favicon.ico"
+		},
+		"nsis": {
+			"oneClick": true,
+			"createDesktopShortcut": true
+		},
+		"protocols": [
+			{
+				"name": "simpleos",
+				"role": "Viewer",
+				"schemes": [
+					"simpleos"
+				]
+			}
+		]
+	},
+	"files": [
+		"*.js",
+		"build",
+		"Ng-dist",
+		"node_modules"
+	],
+	"devDependencies": {
+		"@angular-devkit/build-angular": "^0.801.0",
+		"@angular/cli": "^8.1.0",
+		"@angular/compiler": "^8.1.0",
+		"@angular/compiler-cli": "^8.1.0",
+		"@angular/language-service": "^8.1.0",
+		"@types/echarts": "^4.1.8",
+		"@types/jasmine": "~2.8.6",
+		"@types/jasminewd2": "~2.0.3",
+		"@types/node": "^12.0.2",
+		"@webcomponents/custom-elements": "^1.2.2",
+		"ajv": "^6.10.0",
+		"angular2-text-mask": "^9.0.0",
+		"angular2-toaster": "^7.0.0",
+		"bootstrap": "^4.3.1",
+		"codelyzer": "~4.5.0",
+		"core-js": "^2.5.4",
+		"echarts": "^4.2.1",
+		"electron": "^5.0.6",
+		"electron-builder": "^20.44.4",
+		"electron-reload": "^1.4.0",
+		"fuse.js": "^3.4.5",
+		"hammerjs": "^2.0.8",
+		"jquery": "^3.4.0",
+		"lodash-es": "^4.17.11",
+		"lodash.get": "^4.4.2",
+		"lodash.set": "^4.3.2",
+		"moment": "^2.24.0",
+		"ng-lottie": "^0.3.2",
+		"ngx-echarts": "^4.2.1",
+		"ngx-electron": "^2.1.1",
+		"ngx-json-viewer": "^2.4.0",
+		"ngx-markdown": "^8.0.2",
+		"ngx-order-pipe": "^2.0.2",
+		"ngx-pagination": "^4.0.0",
+		"npm-run-all": "^4.1.5",
+		"popper.js": "^1.14.7",
+		"primeng": "^8.0.0",
+		"protractor": "^5.4.2",
+		"rxjs": "^6.5.1",
+		"rxjs-compat": "^6.5.1",
+		"text-encoding-shim": "latest",
+		"text-mask-addons": "^3.7.2",
+		"ts-node": "^7.0.1",
+		"tslint": "^5.12.0",
+		"typescript": "3.4.5",
+		"wait-on": "^3.0.1",
+		"webpack": "^4.12.0",
+		"webpack-dev-server": "^3.3.1",
+		"zone.js": "^0.9.0"
+	},
+	"dependencies": {
+		"@angular/animations": "^8.1.0",
+		"@angular/cdk": "^8.0.2",
+		"@angular/common": "^8.1.0",
+		"@angular/core": "^8.1.0",
+		"@angular/flex-layout": "^8.0.0-beta.26",
+		"@angular/forms": "^8.1.0",
+		"@angular/http": "^8.0.0-beta.10",
+		"@angular/material": "^8.0.2",
+		"@angular/material-moment-adapter": "^8.0.2",
+		"@angular/platform-browser": "^8.1.0",
+		"@angular/platform-browser-dynamic": "^8.1.0",
+		"@angular/router": "^8.1.0",
+		"@clr/angular": "^2.0.1",
+		"@clr/icons": "^2.0.1",
+		"@clr/ui": "^2.0.1",
+		"@fortawesome/angular-fontawesome": "^0.4.0",
+		"@fortawesome/fontawesome-svg-core": "^1.2.19",
+		"@fortawesome/free-brands-svg-icons": "^5.9.0",
+		"@fortawesome/free-regular-svg-icons": "^5.9.0",
+		"@fortawesome/free-solid-svg-icons": "^5.9.0",
+		"@fortawesome/pro-light-svg-icons": "^5.9.0",
+		"@fortawesome/pro-regular-svg-icons": "^5.9.0",
+		"@fortawesome/pro-solid-svg-icons": "^5.9.0",
+		"@ledgerhq/hw-transport": "latest",
+		"@types/crypto-js": "^3.1.43",
+		"angular7-json-schema-form": "^1.0.4",
+		"animate.css": "^3.7.0",
+		"asn1-ber": "^1.0.9",
+		"bip32-path": "^0.4.2",
+		"body-parser": "^1.19.0",
+		"chart.js": "^2.8.0",
+		"cors": "^2.8.5",
+		"crypto-js": "^3.1.9-1",
+		"electron-context-menu": "^0.12.1",
+		"eosjs": "^20.0.0",
+		"express": "^4.17.1",
+		"fcbuffer": "^2.2.1",
+		"loaderjs": "^1.0.0",
+		"menu": "^0.2.5",
+		"node-pre-gyp": "^0.13.0",
+		"open": "^6.3.0",
+		"primeicons": "^1.0.0",
+		"quill": "^1.3.6",
+		"socket.io": "^2.2.0",
+		"socket.io-client": "^2.2.0",
+		"tar": "^4.4.10",
+		"tslib": "^1.9.3"
+	}
+}
\ No newline at end of file
diff --git a/src/app/app.component.css b/src/app/app.component.css
index 09749001..12ab0abf 100644
--- a/src/app/app.component.css
+++ b/src/app/app.component.css
@@ -55,7 +55,6 @@
 	background-color: transparent;
 	border: 1px solid #565656;
 	box-shadow: none;
-	color: #adadad;
 }
 
 .chain-section {
@@ -67,7 +66,7 @@
 }
 
 .chain-section:not(.selected):hover {
-	background-color: #2b2b2b;
+	background-color: var(--main-background);
 	cursor: pointer;
 }
 
@@ -223,3 +222,17 @@
 /*.alert-text {*/
 /*margin-left: 21px;*/
 /*}*/
+
+/*JSON formatter*/
+/deep/ .segment-key {
+	color: var(--text-white-color) !important;
+}
+
+/deep/ .transit-json .ngx-json-viewer {
+	font-family: 'open sans' !important;
+}
+
+/deep/ .transit-json .ngx-json-viewer .segment-type-string > .segment-main > .segment-value {
+	color: #f34d4d !important;
+}
+/*JSON formatter end*/
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 0d898d76..04ee43de 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -17,30 +17,38 @@
 			</div>
 
 			<a class="nav-link">
-				<span *ngIf="compilerVersion=='EOS MAINNET'" class="title-header" style="color: #9a9a9a; font-size: 13px;">SimplEOS Wallet {{version}}</span>
-				<span *ngIf="compilerVersion!=='EOS MAINNET'" class="title-header" style="color: #9a9a9a; font-size: 13px;">LIBERLAND Wallet {{version}}</span>
+				<span *ngIf="compilerVersion=='EOS MAINNET'" class="title-header"
+					  style="color: #9a9a9a; font-size: 13px;">SimplEOS Wallet {{version}}</span>
+				<span *ngIf="compilerVersion!=='EOS MAINNET'" class="title-header"
+					  style="color: #9a9a9a; font-size: 13px;">LIBERLAND Wallet {{version}}</span>
 			</a>
 
 		</div>
-		<div style="width:100%;height: 2.05rem;">
+		<div style="width:100%;height: 2.05rem;" *ngIf="compilerVersion=='EOS MAINNET' && (theme.currentTheme !== 'wax' && theme.currentTheme !== 'liberland')">
 			<a class="nav-link nav-icon other-icon">
-				<clr-icon shape="moon" *ngIf="dnSet" (click)="see()" class="theme-icon" style="height: 28px;width: 23px;margin:10px 10px;-webkit-app-region: no-drag;float:right;"></clr-icon>
-				<clr-icon shape="sun" *ngIf="!dnSet" (click)="see()" class="theme-icon" style="height: 28px;width: 23px;margin:10px 10px;-webkit-app-region: no-drag;float:right;"></clr-icon>
+				<clr-icon shape="moon" *ngIf="dnSet" (click)="see()" class="theme-icon"
+						  style="height: 28px;width: 23px;margin:10px 10px;-webkit-app-region: no-drag;float:right;"></clr-icon>
+				<clr-icon shape="sun" *ngIf="!dnSet" (click)="see()" class="theme-icon"
+						  style="height: 28px;width: 23px;margin:10px 10px;-webkit-app-region: no-drag;float:right;"></clr-icon>
 			</a>
 		</div>
 
 
 		<div class="header-actions" *ngIf="!isMac">
-			<a (click)="minimizeWindow()" style="-webkit-app-region: no-drag;" class="nav-link nav-icon other-icon icon-header">
+			<a (click)="minimizeWindow()" style="-webkit-app-region: no-drag;"
+			   class="nav-link nav-icon other-icon icon-header">
 				<clr-icon size="18" shape="window-min"></clr-icon>
 			</a>
-			<a *ngIf="maximized" (click)="maximizeWindow()" style="-webkit-app-region: no-drag;" class="nav-link nav-icon other-icon icon-header">
+			<a *ngIf="maximized" (click)="maximizeWindow()" style="-webkit-app-region: no-drag;"
+			   class="nav-link nav-icon other-icon icon-header">
 				<clr-icon size="18" shape="window-restore"></clr-icon>
 			</a>
-			<a *ngIf="!maximized" (click)="maximizeWindow()" style="-webkit-app-region: no-drag;" class="nav-link nav-icon other-icon icon-header">
+			<a *ngIf="!maximized" (click)="maximizeWindow()" style="-webkit-app-region: no-drag;"
+			   class="nav-link nav-icon other-icon icon-header">
 				<clr-icon size="18" shape="window-max"></clr-icon>
 			</a>
-			<a (click)="closeWindow()" style="-webkit-app-region: no-drag;" class="nav-link nav-icon close-icon icon-header">
+			<a (click)="closeWindow()" style="-webkit-app-region: no-drag;"
+			   class="nav-link nav-icon close-icon icon-header">
 				<clr-icon size="18" shape="window-close"></clr-icon>
 			</a>
 		</div>
@@ -49,7 +57,7 @@
 		<router-outlet></router-outlet>
 	</div>
 </div>
-<clr-modal [(clrModalOpen)]="transitconnect" [clrModalSize]="'sm'">
+<clr-modal [(clrModalOpen)]="transitconnect" [clrModalSize]="'sm'" (clrModalOpenChange)="onModalClose($event)">
 	<h3 class="modal-title text-white">
 		<!--<fa-icon [icon]="['far', 'link']"></fa-icon>&nbsp;&nbsp;-->
 		Connect to
@@ -66,8 +74,8 @@ <h3 class="modal-title text-white">
 	<!--		</div>-->
 	<!--	</ng-container>-->
 	<div class="modal-body" *ngIf="aService.accounts.length > 0">
-		<p style="margin-bottom: 20px; color: #d4d4d4;">Choose the account you want to connect:</p>
-		<div class="card chains-card">
+		<p style="margin-bottom: 20px;" class="black-white">Choose the account you want to connect:</p>
+		<div class="card chains-card black-white">
 			<ng-container *ngFor="let acc of aService.accounts; let i = index">
 				<div class="card-block chain-section" (click)="selectAccount(acc)">
 					{{acc.name}}
@@ -76,23 +84,32 @@ <h3 class="modal-title text-white">
 				</div>
 			</ng-container>
 		</div>
-		<div style="margin: 10px 0; color: #adadad">*This doesn't let the dapp do actions on your behalf</div>
+		<div style="margin: 10px 0;" class="black-white">*This doesn't let the dapp do actions on your behalf</div>
 	</div>
 	<div class="modal-body" *ngIf="aService.accounts.length === 0">
-		<p style="margin-bottom: 20px; color: #adadad"><strong>No account found.</strong> Please, close this window and
+		<p style="margin-bottom: 20px;" class="black-white"><strong>No account found.</strong> Please, close this window
+			and
 			import your account to continue.</p>
 	</div>
 </clr-modal>
 
+<clr-modal [(clrModalOpen)]="loadingTRX" [clrModalSize]="'md'">
+	<h3 class="modal-title">
+		<span class="blue">Loading transaction...</span>
+	</h3>
+	<div class="modal-body">
+
+	</div>
+</clr-modal>
 
-<clr-modal [(clrModalOpen)]="transitAction" [clrModalSize]="'md'">
+<clr-modal [(clrModalOpen)]="transitAction" [clrModalSize]="'md'" (clrModalOpenChange)="onModalClose($event)">
 	<h3 class="modal-title">
 		<!--<fa-icon [icon]="['far', 'link']"></fa-icon>&nbsp;&nbsp;-->
 		<span class="blue">Confirm transaction</span>
 	</h3>
 	<div class="modal-body">
 		<h5 class="gray mt-0">Account: {{transit_signer}}</h5>
-		<h4 class="text-white">Are you sure you want to perform the following actions ?</h4>
+		<h5 class="text-white">Are you sure you want to perform the following actions ?</h5>
 		<div *ngIf="updateauthWarning" class="alert alert-danger" role="alert"
 			 style="margin-top: 10px; font-size: 15px">
 			<div class="alert-items">
@@ -113,7 +130,7 @@ <h4 class="text-white">Are you sure you want to perform the following actions ?<
 		<p-accordion>
 			<p-accordionTab *ngFor="let act of action_json; let i = index" header="{{act.name}} on {{act.account}}"
 							[selected]="i === 0">
-				<ngx-json-viewer width="300" [json]="act.data" [expanded]="true"></ngx-json-viewer>
+				<ngx-json-viewer width="300" [json]="act.data" [expanded]="true" class="transit-json"></ngx-json-viewer>
 			</p-accordionTab>
 		</p-accordion>
 	</div>
@@ -208,10 +225,12 @@ <h4 class="text-white">Are you sure you want to perform the following actions ?<
 
 <!--LEDGER MODAL-->
 
-<div id="update-box" class="update-box-class" style="float:right;" [ngClass]="update ? 'show' : ''" *ngIf="compilerVersion=='EOS MAINNET'">
+<div id="update-box" class="update-box-class" style="float:right;" [ngClass]="update ? 'show' : ''"
+	 *ngIf="compilerVersion=='EOS MAINNET'">
 	<div style="position:relative;float:right; right:-1px;margin:5px;cursor:pointer;" (click)="update=false;">X</div>
 	<div>There is a new version available!<br/> Want to update?</div>
 	<div></div>
-	<button class="btn-white btn btn-info-outline btn-sm" style="margin-right: 5px;" (click)="performUpdate()">Yes</button>
-	<a class="btn btn-link btn-sm" (click)="openGithub()">View on Github</a>
+	<button class="btn-white btn btn-info-outline btn-sm" style="margin-right: 5px;" (click)="performUpdate()">Yes
+	</button>
+	<a class="btn btn-link2 btn-sm" (click)="openGithub()">View on Github</a>
 </div>
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 4bb17df9..aa559035 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -14,6 +14,7 @@ import {Eosjs2Service} from './services/eosjs2.service';
 import {TransactionFactoryService} from './services/transaction-factory.service';
 import {ElectronService} from 'ngx-electron';
 import {ThemeService} from './services/theme.service';
+import {Title} from '@angular/platform-browser';
 
 export interface LedgerSlot {
 	publicKey: string;
@@ -61,10 +62,15 @@ export class AppComponent implements OnInit, AfterViewInit {
 	public isMac: boolean;
 	private _maximized: boolean;
 
+	public transitEventHandler: any;
+	private eventFired: boolean;
+	public loadingTRX: boolean;
+
 	constructor(private fb: FormBuilder,
 				public network: NetworkService,
 				// public ledger: LedgerHWService,
 				public aService: AccountsService,
+				private titleService: Title,
 				public eos: EOSJSService,
 				private eosjs: Eosjs2Service,
 				private crypto: CryptoService,
@@ -75,17 +81,19 @@ export class AppComponent implements OnInit, AfterViewInit {
 				private zone: NgZone,
 				private cdr: ChangeDetectorRef,
 				private _electronService: ElectronService,
-				private theme: ThemeService
+				public theme: ThemeService
 	) {
 		if (this.compilerVersion === 'LIBERLAND TESTNET') {
+			this.titleService.setTitle('Liberland Wallet v' + this.version);
 			this.theme.liberlandTheme();
+			this.activeChain = this.network.defaultChains.find((chain) => chain.name === this.compilerVersion);
+			localStorage.setItem('simplEOS.activeChainID', this.activeChain.id);
+			this.network.changeChain(this.activeChain.id);
 		} else {
 			this.theme.defaultTheme();
+			this.titleService.setTitle('SimplEOS Wallet v' + this.version);
 		}
 
-		this.activeChain = this.network.defaultChains.find((chain) => chain.name === this.compilerVersion);
-		this.network.changeChain(this.activeChain.id);
-
 		this.isMac = this._electronService.isMacOS;
 
 		this.confirmForm = this.fb.group({
@@ -103,6 +111,7 @@ export class AppComponent implements OnInit, AfterViewInit {
 		this.aService.versionSys = this.version;
 
 		this.ledgerOpen = false;
+		this.loadingTRX = false;
 
 		// this.ledger.ledgerStatus.asObservable().subscribe((status) => {
 		//   if (this.aService.hasAnyLedgerAccount === false) {
@@ -120,6 +129,7 @@ export class AppComponent implements OnInit, AfterViewInit {
 		if (this.connect.ipc) {
 			this.connect.ipc.on('request', (event, payload) => {
 				console.log(payload);
+				this.transitEventHandler = event;
 				switch (payload.message) {
 					case 'launch': {
 						console.log(payload);
@@ -161,8 +171,14 @@ export class AppComponent implements OnInit, AfterViewInit {
 
 						this.zone.run(() => {
 							this.transitconnect = true;
+							this.eventFired = false;
 						});
 
+						if (!this.aService.accounts) {
+							console.log('No account found!');
+							event.sender.send('loginResponse', {});
+						}
+
 						if (this.aService.accounts.length > 0) {
 							this.accountChange = this.selectedAccount.subscribe((data) => {
 								if (data) {
@@ -197,6 +213,7 @@ export class AppComponent implements OnInit, AfterViewInit {
 						break;
 					}
 					case 'sign': {
+						this.loadingTRX = true;
 						this.eosjs.localSigProvider.processTrx(payload.content.hex_data).then((data) => {
 							console.log(data);
 							this.fullTrxData = data;
@@ -218,22 +235,15 @@ export class AppComponent implements OnInit, AfterViewInit {
 							this.transit_signer = signer;
 							this.action_json = data.actions;
 							this.zone.run(() => {
+								this.loadingTRX = false;
 								this.transitAction = true;
+								this.eventFired = false;
 							});
 							this.replyEvent = event;
 						}).catch((e) => {
 							console.log(e);
+							this.loadingTRX = false;
 						});
-
-						// this.eosjs.deserializeTRX(payload.content.trx).then((results) => {
-						// 	console.log(results);
-						// 	event.sender.send('signResponse', {
-						// 		sigs: []
-						// 	});
-						// }).catch((error) => {
-						// 	console.log(error);
-						// });
-
 						break;
 					}
 					default: {
@@ -245,6 +255,13 @@ export class AppComponent implements OnInit, AfterViewInit {
 
 	}
 
+	onModalClose(ev) {
+		if (this.transitEventHandler && ev === false && this.eventFired === false) {
+			this.eventFired = true;
+			this.transitEventHandler.sender.send('loginResponse', {status: 'CANCELLED'});
+		}
+	}
+
 	see() {
 		this.dnSet = !this.dnSet;
 		console.log();
@@ -353,17 +370,34 @@ export class AppComponent implements OnInit, AfterViewInit {
 	}
 
 	selectAccount(account_data) {
-		const activePerm = account_data.details.permissions.find(p => p.perm_name === 'active');
-		const responseData = {
-			accountName: account_data.name,
-			permission: 'active',
-			publicKey: activePerm.required_auth.keys[0].key
-		};
-		this.selectedAccount.next(responseData);
-		this.transitconnect = false;
+		const store = localStorage.getItem('eos_keys.' + this.aService.activeChain.id);
+		let key = '';
+		let _perm = '';
+		if (store) {
+			const keys = Object.keys(JSON.parse(store));
+			account_data.details.permissions.forEach((p) => {
+				if (p.required_auth.keys.length > 0) {
+					const _k = p.required_auth.keys[0].key;
+					if (keys.indexOf(_k) !== -1) {
+						key = _k;
+						_perm = p.perm_name;
+					}
+				}
+			});
+		}
+		if (key !== '') {
+			const responseData = {
+				accountName: account_data.name,
+				permission: _perm,
+				publicKey: key
+			};
+			this.selectedAccount.next(responseData);
+			this.transitconnect = false;
+		}
 	}
 
 	async signTransitAction() {
+		this.wrongpass = '';
 		this.busy = true;
 		const account = this.aService.accounts.find(a => a.name === this.transit_signer);
 		this.aService.selected.next(account);
@@ -372,6 +406,7 @@ export class AppComponent implements OnInit, AfterViewInit {
 			await this.crypto.authenticate(this.confirmForm.get('pass').value, publicKey);
 		} catch (e) {
 			this.wrongpass = 'wrong password';
+			this.busy = false;
 		}
 		try {
 			const result = await this.eosjs.signTrx(this.fullTrxData);
@@ -385,7 +420,9 @@ export class AppComponent implements OnInit, AfterViewInit {
 				this.cdr.detectChanges();
 			}
 		} catch (e) {
+			this.wrongpass = e;
 			console.log(e);
+			this.busy = false;
 		}
 	}
 }
diff --git a/src/app/chains.ts b/src/app/chains.ts
index a87a50df..b8fd249c 100644
--- a/src/app/chains.ts
+++ b/src/app/chains.ts
@@ -2,6 +2,8 @@ export const defaultChainsJSON = [
 	{
 		id: 'aca376f206b8fc25a6ed44dbdc66547c36c6c33e3a119ffbeaef943642f0e906',
 		symbol: 'EOS',
+		icon: 'eos.png',
+		precision: 4,
 		name: 'EOS MAINNET',
 		firstApi: 'https://hapi.eosrio.io',
 		historyApi: 'https://eos.hyperion.eosrio.io/v2',
@@ -10,6 +12,7 @@ export const defaultChainsJSON = [
 		proxyRegistry: 'regproxyinfo',
 		lastNode: '',
 		logoSrc: '',
+		backdrop: '',
 		features: {
 			history: true,
 			send: true,
@@ -109,9 +112,56 @@ export const defaultChainsJSON = [
 			}
 		}
 	},
+	{
+		id: '1064487b3cd1a897ce03ae5b6a865651747e2e152090f99c1d19d44e01aea5a4',
+		symbol: 'WAX',
+		icon: 'wax.png',
+		precision: 8,
+		name: 'WAX MAINNET',
+		firstApi: 'https://wax.eosrio.io',
+		historyApi: 'https://wax.eosio.se/v2',
+		forumTally: '',
+		eosrioBP: 'eosriobrazil',
+		proxyRegistry: '',
+		lastNode: '',
+		logoSrc: '',
+		backdrop: '',
+		features: {
+			history: true,
+			send: true,
+			resource: true,
+			vote: true,
+			staking: true,
+			dapps: true,
+			addAcc: true,
+			newAcc: true,
+			forum: false,
+			rex: false,
+		},
+		system: [
+			'eosio',
+			'eosio.token',
+			'eosio.msig'
+		],
+		endpoints: [
+			{url: 'https://wax.eosrio.io', owner: 'EOS Rio - Wax', latency: 0, version: 'native'},
+			{url: 'https://wax.blockmatrix.network', owner: 'Blockmatrix', latency: 0, version: 'native'},
+			{url: 'https://api.waxsweden.org', owner: 'EOS Sweden - WAX', latency: 0}
+
+		],
+		explorers: [
+			{
+				name: 'Bloks.io',
+				account_url: 'https://wax.bloks.io/account/',
+				tx_url: 'https://wax.bloks.io/transaction/'
+			}
+		]
+	},
 	{
 		id: 'd5a3d18fbb3c084e3b1f3fa98c21014b5f3db536cc15d08f9f6479517c6a3d86',
 		symbol: 'BOS',
+		icon: 'bos.png',
+		precision: 4,
 		name: 'BOS MAINNET',
 		firstApi: 'https://api.bos.eosrio.io',
 		historyApi: 'https://bos.hyperion.eosrio.io/v2',
@@ -120,6 +170,7 @@ export const defaultChainsJSON = [
 		proxyRegistry: 'regproxyinfo',
 		lastNode: '',
 		logoSrc: '',
+		backdrop: '',
 		features: {
 			history: true,
 			send: true,
@@ -155,13 +206,15 @@ export const defaultChainsJSON = [
 			{
 				name: 'Bloks.io',
 				account_url: 'https://bos.bloks.io/account/',
-				tx_url: 'https://bos.bloks.io/tx/'
+				tx_url: 'https://bos.bloks.io/transaction/'
 			}
 		]
 	},
 	{
 		id: 'cfe6486a83bad4962f232d48003b1824ab5665c36778141034d75e57b956e422',
 		symbol: 'MEETONE',
+		precision: 4,
+		icon: 'meetone.png',
 		name: 'MEET.ONE MAINNET',
 		firstApi: 'https://fullnode.meet.one',
 		historyApi: 'https://meetone.hyperion.eosrio.io/v2',
@@ -170,6 +223,7 @@ export const defaultChainsJSON = [
 		proxyRegistry: 'proxies.m',
 		lastNode: '',
 		logoSrc: '',
+		backdrop: '',
 		features: {
 			history: true,
 			send: true,
@@ -208,6 +262,8 @@ export const defaultChainsJSON = [
 	{
 		id: '4667b205c6838ef70ff7988f6e8257e8be0e1284a2f59699054a018f743b1d11',
 		symbol: 'TLOS',
+		icon: 'telos.png',
+		precision: 4,
 		name: 'TELOS MAINNET',
 		firstApi: 'https://api.tlos.goodblock.io',
 		historyApi: '',
@@ -215,6 +271,7 @@ export const defaultChainsJSON = [
 		proxyRegistry: '',
 		lastNode: '',
 		logoSrc: '',
+		backdrop: '',
 		features: {
 			history: true,
 			send: true,
@@ -248,6 +305,8 @@ export const defaultChainsJSON = [
 	{
 		id: '73647cde120091e0a4b85bced2f3cfdb3041e266cbbe95cee59b73235a1b3b6f',
 		symbol: 'WBI',
+		icon: 'worbli.png',
+		precision: 4,
 		name: 'WORBLI MAINNET',
 		firstApi: 'https://api.worbli.eosrio.io',
 		historyApi: '',
@@ -256,6 +315,7 @@ export const defaultChainsJSON = [
 		proxyRegistry: '',
 		lastNode: '',
 		logoSrc: '',
+		backdrop: '',
 		features: {
 			history: true,
 			send: true,
@@ -287,13 +347,15 @@ export const defaultChainsJSON = [
 			{
 				name: 'Bloks.io',
 				account_url: 'https://worbli.bloks.io/account/',
-				tx_url: 'https://worbli.bloks.io/tx/'
+				tx_url: 'https://worbli.bloks.io/transaction/'
 			}
 		]
 	},
 	{
 		id: 'e70aaab8997e1dfce58fbfac80cbbb8fecec7b99cf982a9444273cbc64c41473',
 		symbol: 'EOS',
+		icon: 'jungle.png',
+		precision: 4,
 		name: 'EOS JUNGLE TESTNET',
 		firstApi: 'https://jungle2.cryptolions.io:443',
 		historyApi: 'https://jungle.hyperion.eosrio.io/v2',
@@ -302,6 +364,7 @@ export const defaultChainsJSON = [
 		proxyRegistry: '',
 		lastNode: '',
 		logoSrc: '',
+		backdrop: '',
 		features: {
 			history: true,
 			send: true,
@@ -334,6 +397,8 @@ export const defaultChainsJSON = [
 	{
 		id: '33cc2426f1b258ef8c798c34c0360b31732ea27a2d7e35a65797850a86d1ba85',
 		symbol: 'BOS',
+		icon: 'bos.png',
+		precision: 4,
 		name: 'BOS TESTNET',
 		firstApi: 'https://boscore.eosrio.io',
 		historyApi: '',
@@ -342,6 +407,7 @@ export const defaultChainsJSON = [
 		proxyRegistry: '',
 		lastNode: '',
 		logoSrc: '',
+		backdrop: '',
 		features: {
 			history: true,
 			send: true,
@@ -374,6 +440,8 @@ export const defaultChainsJSON = [
 	{
 		id: '5fff1dae8dc8e2fc4d5b23b2c7665c97f9e9d8edf2b6485a86ba311c25639191',
 		symbol: 'EOS',
+		icon: 'kylin.png',
+		precision: 4,
 		name: 'EOS KYLIN TESTNET',
 		firstApi: 'https://api-kylin.eoslaomao.com',
 		historyApi: '',
@@ -382,6 +450,7 @@ export const defaultChainsJSON = [
 		proxyRegistry: '',
 		lastNode: '',
 		logoSrc: '',
+		backdrop: '',
 		features: {
 			history: true,
 			send: true,
@@ -412,21 +481,24 @@ export const defaultChainsJSON = [
 			{
 				name: 'Bloks.io',
 				account_url: 'https://kylin.bloks.io/account/',
-				tx_url: 'https://kylin.bloks.io/tx/'
+				tx_url: 'https://kylin.bloks.io/transaction/'
 			}
 		]
 	},
 	{
-		id: '246cbad5405bf2d8e8888adab0a9bd2ea49693edbd69ee4cd0316c64a9f68d60',
+		id: '7f3f5ae1a73d7c14a72f65f257d41397b966ffcd95c588c50d5081eaa354984c',
 		symbol: 'LLC',
+		icon: 'liberland.png',
+		precision: 8,
 		name: 'LIBERLAND TESTNET',
 		firstApi: 'https://liberland.eossweden.org',
-		historyApi: 'https://liberland.hyperion.eosrio.io/v2',
+		historyApi: 'https://liberland.eosio.se/v2',
 		forumTally: '',
 		eosrioBP: '',
 		proxyRegistry: '',
 		lastNode: '',
 		logoSrc: '',
+		backdrop: '',
 		features: {
 			history: true,
 			send: true,
@@ -453,6 +525,8 @@ export const defaultChainsJSON = [
 	{
 		id: '7136e3e32a458bb99cf6973ab5055869d25830607b9e78593769e1be52fb6f20',
 		symbol: 'MEETONE',
+		icon: 'meetone.png',
+		precision: 4,
 		name: 'MEET.ONE TESTNET',
 		firstApi: 'https://sidechain-test-history.meet.one',
 		historyApi: 'https://meetone.hyperion.eosrio.io/v2',
@@ -461,6 +535,7 @@ export const defaultChainsJSON = [
 		proxyRegistry: 'proxies.m',
 		lastNode: '',
 		logoSrc: '',
+		backdrop: '',
 		features: {
 			history: true,
 			send: true,
diff --git a/src/app/confirm-modal/confirm-modal.component.ts b/src/app/confirm-modal/confirm-modal.component.ts
index bd589f37..d5228e80 100644
--- a/src/app/confirm-modal/confirm-modal.component.ts
+++ b/src/app/confirm-modal/confirm-modal.component.ts
@@ -75,6 +75,15 @@ export class ConfirmModalComponent {
 			this.showToast('error', 'Authentication fail', `Wrong password`, {});
 		}
 		// Sign and push transaction
+		console.log(this.modalData.transactionPayload);
+		if (this.modalData.transactionPayload.actions.length === 0) {
+			this.trxFactory.status.emit('done');
+			this.confirmationForm.reset();
+			this.busy = false;
+			this.visibility = false;
+			this.cdr.detectChanges();
+			return true;
+		}
 		const trxResult = await this.processTransaction(this.modalData.transactionPayload);
 		if (trxResult) {
 			const trxId = trxResult.transaction_id;
@@ -89,13 +98,13 @@ export class ConfirmModalComponent {
 				this.visibility = false;
 				this.cdr.detectChanges();
 			}, 1500);
-			this.showToast('success', 'Tramsaction broadcasted', ` TRX ID: ${trxId} <br> Check your history for confirmation.`, {
+			this.showToast('success', 'Transaction broadcasted', ` TRX ID: ${trxId} <br> Check your history for confirmation.`, {
 				id: trxId
 			});
 		} else {
 			this.busy = false;
 			this.confirmationForm.reset();
-			this.showToast('error', 'Tramsaction failed', `${this.errormsg}`, {});
+			this.showToast('error', 'Transaction failed', `${this.errormsg}`, {});
 		}
 	}
 
diff --git a/src/app/dashboard/about/about.component.html b/src/app/dashboard/about/about.component.html
index 67900580..b63f9422 100644
--- a/src/app/dashboard/about/about.component.html
+++ b/src/app/dashboard/about/about.component.html
@@ -18,23 +18,66 @@ <h5 *ngIf="aService.activeChain.features.vote&&aService.activeChain.eosrioBP!=='
       <p>
 		<p class="paragraph"><strong class="text-white">Go to SimplEOS FAQ for any <span class="blue" style="cursor:pointer" (click)="extOpen('https://eosrio.io/faq_home/')">HELP</span>. <br> Our beloved Telegram BOT can also help you: <span class="blue" style="cursor:pointer" (click)="extOpen('https://t.me/simpleos_bot')">@simpleos_bot</span>. </strong> </p>
       <p>
-        <a (click)="extOpen('https://steemit.com/@eosrio')" class="social-icon">
-          <img src="assets/steemit.png" class="steemit">
+        <a (click)="extOpen('https://steemit.com/@eosrio')" class="social-icon" pTooltip="steemit.com/@eosrio">
+          <img [src]="theme.currentTheme === 'dark' ? 'assets/steemit.png' : 'assets/steemit3.png'" class="steemit">
         </a>
-        <a (click)="extOpen('https://t.me/eosrio')" class="social-icon" style="margin-left: 10px">
+        <a (click)="extOpen('https://t.me/eosrio')" class="social-icon" style="margin-left: 10px" pTooltip="t.me/eosrio">
           <fa-icon [icon]="['fab', 'telegram-plane']" size="2x"></fa-icon>
         </a>
-        <a (click)="extOpen('https://github.com/eosrio')" class="social-icon" style="margin-left: 12px">
-          <fa-icon [icon]="['fab', 'github']" size="2x"></fa-icon>
+        <a (click)="extOpen('https://github.com/eosrio')" class="social-icon" style="margin-left: 12px" >
+          <fa-icon [icon]="['fab', 'github']" size="2x" pTooltip="github.com/eosrio/simpleos" tooltipPosition="top"></fa-icon>
         </a>
-        <a (click)="extOpen('https://twitter.com/eosriobrazil')" class="social-icon" style="margin-left: 12px">
+        <a (click)="extOpen('https://twitter.com/eosriobrazil')" class="social-icon" style="margin-left: 12px" pTooltip="twitter.com/eosriobrazil">
           <fa-icon [icon]="['fab', 'twitter']" size="2x"></fa-icon>
         </a>
       </p>
     </div>
     <div class="clr-col-lg-6">
-      <img src="assets/about_eosrio2.png" style="border-radius: 5px; width: 100%;">
+      <img src="./assets/about_eosrio2.png" style="border-radius: 5px; width: 100%;">
     </div>
   </div>
 	</ng-container>
+	<ng-container *ngIf="app.compilerVersion!=='EOS MAINNET'">
+		<div class="clr-row animate" style="padding-top: 15px;">
+			<div class="clr-col-lg-7">
+				<h1><span class="white">About </span><span class="blue">Liberland</span></h1>
+				<p class="paragraph">Free Republic of Liberland is a sovereign state located between Croatia and Serbia. It is a 7km2 land referred to as “Gornja Siga.”</p>
+				<p class="paragraph">Liberland is a constitutional republic with elements of direct democracy. The language is English.</p>
+				<p class="paragraph">The Liberland Merit is the currency of Liberland. The country's motto is: To live and let live.</p>
+				<p class="paragraph">For more information, visit <a (click)="extOpen('https://liberland.org/en/')"
+																	class="website blue" style="cursor: pointer">liberland.org</a></p>
+				<p class="paragraph"><strong class="text-white">
+					For any doubts on Liberland features, please join their telegram <span class="blue" style="cursor:pointer" (click)="extOpen('https://t.me/liberlanders')">t.me/liberlanders</span>.</strong>
+				</p>
+				<p>
+					<a (click)="extOpen('https://t.me/liberlanders')" class="social-icon" style="margin-left: 10px" pTooltip="t.me/liberlanders" tooltipPosition="top">
+						<fa-icon [icon]="['fab', 'telegram-plane']" size="2x"></fa-icon>
+					</a>
+					<a (click)="extOpen('https://twitter.com/liberland_org')" class="social-icon" style="margin-left: 12px" pTooltip="twitter.com/liberland_org" tooltipPosition="top">
+						<fa-icon [icon]="['fab', 'twitter']" size="2x"></fa-icon>
+					</a>
+				</p>
+
+				<h1><span class="white">About </span><span class="blue">SimplEOS</span></h1>
+				<p class="paragraph">Liberland wallet is powered by SimplEOS, an open source wallet developed by EOS Rio. </p>
+				<p class="paragraph">EOS Rio is a block producer dedicated to eosio chains and member of the Ghostbusters tech colletive.</p>
+				<p class="paragraph"><strong class="text-white">Go to SimplEOS FAQ for any <span class="blue" style="cursor:pointer" (click)="extOpen('https://eosrio.io/faq_home/')">HELP</span>.</strong></p>
+				<p class="paragraph"><strong class="text-white">Our beloved Telegram BOT can also help you: <span class="blue" style="cursor:pointer" (click)="extOpen('https://t.me/simpleos_bot')">@simpleos_bot</span>. </strong> </p>
+				<p>
+					<a (click)="extOpen('https://t.me/eosrio')" class="social-icon" style="margin-left: 10px" pTooltip="t.me/eosrio">
+						<fa-icon [icon]="['fab', 'telegram-plane']" size="2x"></fa-icon>
+					</a>
+					<a (click)="extOpen('https://github.com/eosrio/simpleos')" class="social-icon" style="margin-left: 12px" pTooltip="github.com/eosrio/simpleos" tooltipPosition="right">
+						<fa-icon [icon]="['fab', 'github']" size="2x"></fa-icon>
+					</a>
+					<a (click)="extOpen('https://twitter.com/eosriobrazil')" class="social-icon" style="margin-left: 12px" pTooltip="twitter.com/eosriobrazil">
+						<fa-icon [icon]="['fab', 'twitter']" size="2x"></fa-icon>
+					</a>
+				</p>
+			</div>
+			<div class="clr-col-lg-5">
+				<img src="./assets/liberland-map.png" style="border-radius: 5px; width: 100%;">
+			</div>
+		</div>
+	</ng-container>
 </div>
diff --git a/src/app/dashboard/about/about.component.ts b/src/app/dashboard/about/about.component.ts
index 5ca7711f..5ef83510 100644
--- a/src/app/dashboard/about/about.component.ts
+++ b/src/app/dashboard/about/about.component.ts
@@ -1,6 +1,7 @@
 import {Component, OnInit} from '@angular/core';
 import {AccountsService} from '../../services/accounts.service';
 import {AppComponent} from '../../app.component';
+import {ThemeService} from '../../services/theme.service';
 
 @Component({
 	selector: 'app-about',
@@ -9,7 +10,7 @@ import {AppComponent} from '../../app.component';
 })
 export class AboutComponent implements OnInit {
 
-	constructor(public aService: AccountsService, public app: AppComponent) {
+	constructor(public aService: AccountsService, public app: AppComponent, public theme: ThemeService) {
 	}
 
 	ngOnInit() {
diff --git a/src/app/dashboard/acc_resources/resources.component.html b/src/app/dashboard/acc_resources/resources.component.html
index fe844f64..d25acbb8 100644
--- a/src/app/dashboard/acc_resources/resources.component.html
+++ b/src/app/dashboard/acc_resources/resources.component.html
@@ -137,7 +137,7 @@
 						<progress [value]="net_limit['used']" [max]="net_limit.max"></progress>
 					</div>
 					<span class="title">NET Bandwidth</span>
-					<span class="resource" style="float:right; font-size: 14px;">{{net_weight}}</span>
+					<span class="resource" style="float:right; font-size: 14px;">{{net_weight_n | number: '1.0-2'}} {{aService.activeChain['symbol']}}</span>
 					<div class="resource"><span class="blue">Used {{net_limit['used'] / (1024) | number: '1.2-2'}}
 						KB </span><span style="color: #8d8d8d">/ {{net_limit.max / (1024)
 						| number: '1.2-2'}} KB</span>
@@ -156,7 +156,7 @@
               	<span class="tooltip-content">Used in every transaction <br>you make. Regenerates over <br> time.</span>
 			  </a>
 		  </span>
-					<span class="resource" style="float:right; font-size: 14px;">{{cpu_weight}}</span>
+					<span class="resource" style="float:right; font-size: 14px;">{{cpu_weight_n | number: '1.0-2'}} {{aService.activeChain['symbol']}}</span>
 					<div class="blue resource"><span class="blue">Used {{cpu_limit['used'] / (1024) | number: '1.2-2'}}
 						ms </span><span style="color: #8d8d8d">/ {{cpu_limit.max / (1024)
 						| number: '1.2-2'}} ms</span>
diff --git a/src/app/dashboard/acc_resources/resources.component.ts b/src/app/dashboard/acc_resources/resources.component.ts
index 3e1cebaa..143f6fc4 100644
--- a/src/app/dashboard/acc_resources/resources.component.ts
+++ b/src/app/dashboard/acc_resources/resources.component.ts
@@ -67,8 +67,10 @@ export class ResourcesComponent implements OnInit {
 	ram_usage = 0;
 	cpu_limit: any;
 	cpu_weight = '';
+	cpu_weight_n = 0;
 	net_limit: any;
 	net_weight = '';
+	net_weight_n = 0;
 
 	delegations = [];
 	delegated_net = 0;
@@ -136,6 +138,14 @@ export class ResourcesComponent implements OnInit {
 		this.errormsgD2 = '';
 		this.errormsgD3 = '';
 
+		this.net_limit = {
+			used: 0
+		};
+
+		this.cpu_limit = {
+			used: 0
+		};
+
 		this.ramMarketFormBuy = this.fb.group({
 			buyBytes: [0, Validators.required],
 			buyEos: [0],
@@ -302,16 +312,19 @@ export class ResourcesComponent implements OnInit {
 
 	ngOnInit() {
 		this.loadHistory();
-
+		this.ramService.reload();
 		this.aService.selected.asObservable().subscribe((selected: any) => {
 			if (selected.details) {
+				this.ramPriceEOS = this.ramService.ramPriceEOS;
 				const d = selected.details;
 				this.ram_quota = d.ram_quota;
 				this.ram_usage = d.ram_usage;
 				this.cpu_limit = d.cpu_limit;
 				this.net_limit = d.net_limit;
 				this.cpu_weight = d.total_resources.cpu_weight;
+				this.cpu_weight_n = parseFloat(this.cpu_weight.split(' ')[0]);
 				this.net_weight = d.total_resources.net_weight;
+				this.net_weight_n = parseFloat(this.net_weight.split(' ')[0]);
 				this.listbw(selected.name);
 			}
 		});
@@ -526,7 +539,6 @@ export class ResourcesComponent implements OnInit {
 
 	checkSellBytes() {
 		if (this.ramMarketFormSell.value.sellBytes > 0) {
-			console.log(this.ram_quota);
 			if ((this.ram_quota - this.ram_usage) > (this.ramMarketFormSell.get('sellBytes').value) * 1024) {
 				this.ramMarketFormSell.controls['sellBytes'].setErrors(null);
 				this.ramMarketFormSell.controls['sellEos'].setErrors(null);
@@ -560,13 +572,14 @@ export class ResourcesComponent implements OnInit {
 		const account = this.aService.selected.getValue();
 		const namesel = this.aService.selected.getValue().name;
 		const password = this.passRefundForm.get('pass').value;
-		const pubkey = account.details['permissions'][0]['required_auth'].keys[0].key;
-
+		const [pubkey, permission] = this.aService.getStoredKey(account);
 		this.crypto.authenticate(password, pubkey).then((data) => {
 			if (data === true) {
-				this.eos.requestRefund(namesel).then((e) => {
+				this.eos.requestRefund(namesel, permission).then((e) => {
 					this.requestRefundModal = false;
 					this.showToast('success', 'Transation broadcasted', 'Check your history for confirmation.');
+					this.aService.refreshFromChain();
+					this.busy = false;
 				}).catch((error) => {
 					this.wrongpassrefund = JSON.stringify(JSON.parse(error).error.details[0].message);
 					this.busy = false;
@@ -581,17 +594,17 @@ export class ResourcesComponent implements OnInit {
 
 	sell() {
 		this.busy = true;
-		console.log(this.busy);
 		this.wrongpasssell = '';
 		const account = this.aService.selected.getValue();
 		const password = this.passSellForm.get('pass').value;
-		const pubkey = account.details['permissions'][0]['required_auth'].keys[0].key;
-
+		const [pubkey, permission] = this.aService.getStoredKey(account);
 		this.crypto.authenticate(password, pubkey).then((data) => {
 			if (data === true) {
-				this.eos.ramSellBytes(this.seller, this.bytessell).then((e) => {
+				this.eos.ramSellBytes(this.seller, this.bytessell, permission).then((e) => {
 					this.passSellModal = false;
 					this.showToast('success', 'Transation broadcasted', 'Check your history for confirmation.');
+					this.aService.refreshFromChain();
+					this.busy = false;
 				}).catch((error) => {
 					this.wrongpasssell = JSON.stringify(JSON.parse(error).error.details[0].message);
 					this.busy = false;
@@ -623,12 +636,14 @@ export class ResourcesComponent implements OnInit {
 		this.wrongpassbuy = '';
 		const account = this.aService.selected.getValue();
 		const password = this.passBuyForm.get('pass').value;
-		const pubkey = account.details['permissions'][0]['required_auth'].keys[0].key;
+		const [pubkey, permission] = this.aService.getStoredKey(account);
 		this.crypto.authenticate(password, pubkey).then((data) => {
 			if (data === true) {
-				this.eos.ramBuyBytes(this.payer, this.receiver, this.bytesbuy).then((e) => {
+				this.eos.ramBuyBytes(this.payer, this.receiver, this.bytesbuy, permission).then((e) => {
 					this.passBuyModal = false;
 					this.showToast('success', 'Transation broadcasted', 'Check your history for confirmation.');
+					this.aService.refreshFromChain();
+					this.busy = false;
 				}).catch((error) => {
 					this.wrongpassbuy = JSON.stringify(JSON.parse(error).error.details[0].message);
 					this.busy = false;
@@ -652,10 +667,10 @@ export class ResourcesComponent implements OnInit {
 		this.busy = true;
 		const account = this.aService.selected.getValue();
 		const password = this.passUnDelegateForm.get('pass').value;
-		const pubkey = account.details['permissions'][0]['required_auth'].keys[0].key;
+		const [pubkey, permission] = this.aService.getStoredKey(account);
 		this.crypto.authenticate(password, pubkey).then((data) => {
 			if (data === true) {
-				this.eos.unDelegate(this.accNow, this.fromUD, this.netUD, this.cpuUD, this.aService.activeChain['symbol']).then((e) => {
+				this.eos.unDelegate(this.accNow, this.fromUD, this.netUD, this.cpuUD, this.aService.activeChain['symbol'], permission).then((e) => {
 					this.fromUD = '';
 					this.netUD = '';
 					this.cpuUD = '';
@@ -677,7 +692,7 @@ export class ResourcesComponent implements OnInit {
 	checkEos(eosVal, val) {
 		if (eosVal > 0) {
 			const sel = this.aService.selected.getValue();
-			if(sel) {
+			if (sel) {
 				if (val === 'net') {
 					this.unstaked = sel.full_balance - sel.staked - sel.unstaking - this.delegateForm.get('cpuEos').value;
 				} else {
@@ -699,8 +714,8 @@ export class ResourcesComponent implements OnInit {
 
 	fillDelegateRequest() {
 		this.accTo = this.delegateForm.get('receiverAcc').value;
-		this.netD = parseFloat(this.delegateForm.get('netEos').value).toFixed(4);
-		this.cpuD = parseFloat(this.delegateForm.get('cpuEos').value).toFixed(4);
+		this.netD = parseFloat(this.delegateForm.get('netEos').value).toFixed(this.aService.activeChain['precision']);
+		this.cpuD = parseFloat(this.delegateForm.get('cpuEos').value).toFixed(this.aService.activeChain['precision']);
 		this.accNow = this.aService.selected.getValue().name;
 
 	}
@@ -710,14 +725,15 @@ export class ResourcesComponent implements OnInit {
 		this.busy = true;
 		const account = this.aService.selected.getValue();
 		const password = this.passDelegateForm.get('pass').value;
-		const pubkey = account.details['permissions'][0]['required_auth'].keys[0].key;
+		const [pubkey, permission] = this.aService.getStoredKey(account);
 		this.crypto.authenticate(password, pubkey).then((data) => {
 			if (data === true) {
-				this.eos.delegateBW(this.accNow, this.accTo, this.netD, this.cpuD, this.aService.activeChain['symbol']).then((e) => {
+				this.eos.delegateBW(this.accNow, this.accTo, this.netD, this.cpuD, this.aService.activeChain['symbol'], permission).then((e) => {
 					this.accTo = '';
 					this.netD = '';
 					this.cpuD = '';
 					this.accNow = '';
+					this.busy = false;
 					this.passDelegateModal = false;
 					this.showToast('success', 'Transation broadcasted', 'Check your history for confirmation.');
 				}).catch((error) => {
diff --git a/src/app/dashboard/dapp/dapp.component.ts b/src/app/dashboard/dapp/dapp.component.ts
index effbc80c..a2d7b4ed 100644
--- a/src/app/dashboard/dapp/dapp.component.ts
+++ b/src/app/dashboard/dapp/dapp.component.ts
@@ -320,9 +320,9 @@ export class DappComponent implements OnInit, AfterViewInit {
 			if (this.abiSmartContractStructs.find(act => act.name === field_type)) {
 				const children = JSON.stringify(this.schemaJson(field_type));
 				if (arr) {
-					out[field.name] = JSON.parse('{"title": "' + field.name.charAt(0).toUpperCase()  + field.name.slice(1) + '", "type": "array", "items": {"type": "object", "properties": ' + children + '}}');
+					out[field.name] = JSON.parse('{"title": "' + field.name.charAt(0).toUpperCase() + field.name.slice(1) + '", "type": "array", "items": {"type": "object", "properties": ' + children + '}}');
 				} else {
-					out[field.name] = JSON.parse('{"title": "' + field.name.charAt(0).toUpperCase()  + field.name.slice(1) + '", "type": "object", "properties": ' + children + '}');
+					out[field.name] = JSON.parse('{"title": "' + field.name.charAt(0).toUpperCase() + field.name.slice(1) + '", "type": "object", "properties": ' + children + '}');
 				}
 			} else {
 				const intArr = ['uint8', 'uint8_t', 'uint16', 'uint16_t', 'uint32', 'uint32_t', 'uint64', 'uint64_t', 'uint128', 'uint128_t', 'int8', 'int16', 'int32', 'int64', 'int128', 'bool'];
@@ -332,15 +332,15 @@ export class DappComponent implements OnInit, AfterViewInit {
 					typeABI = '"type": "number", "widget": "text",  "value":0';
 				} else if (arr) {
 					if (intArr.includes(field.type)) {
-						typeArr = '"type": "number", "widget": "text", "value":0 ,"title": "' + field.name.charAt(0).toUpperCase()  + field.name.slice(1) + '"';
+						typeArr = '"type": "number", "widget": "text", "value":0 ,"title": "' + field.name.charAt(0).toUpperCase() + field.name.slice(1) + '"';
 					} else {
-						typeArr = '"type": "string", "widget": "text", "value": "", "title": "' + field.name.charAt(0).toUpperCase()  + field.name.slice(1) + '"';
+						typeArr = '"type": "string", "widget": "text", "value": "", "title": "' + field.name.charAt(0).toUpperCase() + field.name.slice(1) + '"';
 					}
 					typeABI = '"type": "array", "items": { "widget": "text", "type":"string", ' + typeArr + ' } ';
 				} else {
 					typeABI = '"type": "string", "widget": "text", "value": ""';
 				}
-				const jsonTxt = '{ "title": "' + field.name.charAt(0).toUpperCase()  + field.name.slice(1) + '", ' + typeABI + ' }';
+				const jsonTxt = '{ "title": "' + field.name.charAt(0).toUpperCase() + field.name.slice(1) + '", ' + typeABI + ' }';
 
 				out[field.name] = JSON.parse(jsonTxt);
 			}
@@ -349,7 +349,7 @@ export class DappComponent implements OnInit, AfterViewInit {
 	}
 
 	modelJson(type: string) {
-		let out = {};
+		const out = {};
 		this.abiSmartContractStructs.find(action => action.name === type).fields.forEach(field => {
 			const arr = (field.type.indexOf('[]') > 0);
 			const field_type = field.type.replace('[]', '');
@@ -375,15 +375,15 @@ export class DappComponent implements OnInit, AfterViewInit {
 		return out;
 	}
 
-	formJson(type: string, name?:string) {
-		let out = [];
+	formJson(type: string, name?: string) {
+		const out = [];
 		this.abiSmartContractStructs.find(action => action.name === type).fields.forEach(field => {
 			const arr = (field.type.indexOf('[]') > 0);
 			const field_type = field.type.replace('[]', '');
 
 			if (this.abiSmartContractStructs.find(act => act.name === field_type)) {
-				const children = JSON.stringify(this.formJson(field_type,field.name));
-				if (name!==''&&name!==undefined) {
+				const children = JSON.stringify(this.formJson(field_type, field.name));
+				if (name !== '' && name !== undefined) {
 					out.push(JSON.parse('{"key": "' + name + '[].' + field.name + '","add": "New","style": {"add": "btn-success"},"type":"array","items":' + children + '}'));
 				} else {
 					out.push(JSON.parse('{"key": "' + field.name + '","add": "New","style": {"add": "btn-success"},"type":"object","items":' + children + '}'));
@@ -402,7 +402,7 @@ export class DappComponent implements OnInit, AfterViewInit {
 					// typeABI = "string";
 					typeABI = '"widget": "text", "type": "text","htmlClass":"mat-my-class"';
 				}
-				if (name!==''&&name!==undefined) {
+				if (name !== '' && name !== undefined) {
 					out.push(JSON.parse('{"title": "' + field.name + '","key": "' + name + '[].' + field.name + '",' + typeABI + '}'));
 				} else {
 					out.push(JSON.parse('{"title": "' + field.name + '","key": "' + field.name + '",' + typeABI + '}'));
@@ -417,11 +417,11 @@ export class DappComponent implements OnInit, AfterViewInit {
 		if (ev) {
 			this.busy = false;
 			this.wrongpass = '';
-			this.sendModal=true;
-			const fullForm = Object.assign ( this.modelJson(this.action) , ev[ 'schema' ] );
-			for (let idx in fullForm) {
-				if (DappComponent.isArray ( fullForm[ idx ] )) {
-					fullForm[ idx ].sort ();
+			this.sendModal = true;
+			const fullForm = Object.assign(this.modelJson(this.action), ev['schema']);
+			for (const idx in fullForm) {
+				if (DappComponent.isArray(fullForm[idx])) {
+					fullForm[idx].sort();
 				}
 			}
 			this.formVal = fullForm;
@@ -438,12 +438,12 @@ export class DappComponent implements OnInit, AfterViewInit {
 		const account = this.aService.selected.getValue();
 		const accountName = this.aService.selected.getValue().name;
 		const password = this.confirmForm.get('pass').value;
-		const pubkey = account.details['permissions'][0]['required_auth'].keys[0].key;
+		const [pubkey, permission] = this.aService.getStoredKey(account);
 
 		this.crypto.authenticate(password, pubkey).then((data) => {
 			if (data === true) {
 				console.log(this.formVal);
-				const val = this.eos.pushActionContract(this.contract, this.action, this.formVal, accountName).then((info) => {
+				const val = this.eos.pushActionContract(this.contract, this.action, this.formVal, accountName, permission).then((info) => {
 					this.tokenModal = false;
 					this.busy2 = false;
 					this.sendModal = false;
@@ -455,7 +455,6 @@ export class DappComponent implements OnInit, AfterViewInit {
 					this.wrongpass = JSON.stringify(JSON.parse(error).error.details[0].message);
 				});
 				console.log(val['__zone_symbol__state']);
-				//this.busy = false;
 			}
 		}).catch(error2 => {
 			console.log(error2);
diff --git a/src/app/dashboard/dashboard.component.css b/src/app/dashboard/dashboard.component.css
index b4421771..de8e73eb 100644
--- a/src/app/dashboard/dashboard.component.css
+++ b/src/app/dashboard/dashboard.component.css
@@ -109,7 +109,7 @@
 .navbar-btn {
     background-color: var(--sidenav-background);
     height: 4.5rem;
-    color: var(--sidenav-option-color);
+    color: var(--sidenav-color);
     -webkit-transition-property: color, background-color;
     transition-property: color, background-color;
 }
diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html
index 48f1dce6..85b5a69d 100644
--- a/src/app/dashboard/dashboard.component.html
+++ b/src/app/dashboard/dashboard.component.html
@@ -7,7 +7,8 @@
 
 				<div class="clr-col-10" style="padding-right: 0">
 					<div class="clr-row" style="margin-right: 0;">
-						<div class="clr-col clr-col-md {{(!network.activeChain.features['addAcc']||!network.activeChain.features['newAcc'])?'max-width2':'max-width'}}"
+						<div
+							class="clr-col clr-col-md {{(!network.activeChain.features['addAcc']||!network.activeChain.features['newAcc'])?'max-width2':'max-width'}}"
 							style="padding-right: 0; ">
 							<mat-tab-group id="header-tabs" (selectedIndexChange)="selectAccount($event)"
 										   [selectedIndex]="selectedTab">
@@ -20,7 +21,8 @@
 											(click)="openRemoveAccModal(i,account)"></fa-icon>
 										</div>
 										<div style="font-size: 17px;">{{account.name}}</div>
-										<div class="value special-font-regular">{{account.full_balance}} {{network.activeChain['symbol']}}</div>
+										<div
+											class="value">{{account.full_balance}} {{network.activeChain['symbol']}}</div>
 									</ng-template>
 								</mat-tab>
 							</mat-tab-group>
@@ -82,17 +84,25 @@
 		</div>
 		<nav class="sidenav">
 			<section class="sidenav-header">
+				<img [src]="'./assets/chain-icons/' + network.activeChain.icon" width="40" height="40"
+					 class="chain-icon" style="position: absolute; top: 60px; left: 15px"/>
 				<ng-container *ngIf="app.compilerVersion==='EOS MAINNET'">
 					<lottie-animation-view
 						[options]="lottieConfig" [width]="'auto'" [height]="'auto'"
-						(animCreated)="handleAnimation($event)">
+						(animCreated)="handleAnimation($event)" class="display-animation">
 					</lottie-animation-view>
+					<img src="./assets/simpleos-logo-clara-dashboard.svg" class="display-img" atl="Logo SimplEOS"
+						 height="128" style="margin: 12px auto 12px auto;"/>
 				</ng-container>
-				<ng-container  *ngIf="app.compilerVersion!=='EOS MAINNET'">
-					<img src="../../assets/logos/liberland_logo.PNG" atl="Logo Liberland" height="128" style="margin: 50px auto;"/>
+				<ng-container *ngIf="app.compilerVersion!=='EOS MAINNET'">
+					<img src="./assets/logos/liberland_logo.PNG" atl="Logo Liberland" height="128"
+						 style="margin: 50px auto;"/>
 				</ng-container>
 
-				<div style="margin-right: 4px;">connected to <span style="color: var(--text-destaque-color);">{{network.activeChain['name']}}</span></div>
+				<div style="margin-right: 4px;">
+					connected to
+					<span style="color: var(--text-destaque-color);">{{network.activeChain['name']}}</span>
+				</div>
 			</section>
 			<section #sidenavContent class="sidenav-content">
 				<a *ngIf="network.activeChain.features['history']" class="nav-link" routerLinkActive="active"
@@ -139,7 +149,7 @@
 				<div class="version">v{{aService.versionSys}}</div>
 			</section>
 			<section class="placeholder border-r" *ngIf="app.compilerVersion!=='EOS MAINNET'">
-				<div class="credits">Powered by SimplEOS</div>
+				<div class="credits">Powered by <a class="link-eosrio" [routerLink]="['about']">SimplEOS</a></div>
 				<div class="version">v{{aService.versionSys}}</div>
 			</section>
 		</nav>
@@ -363,7 +373,7 @@ <h5>Define your password for this account. This will be used to transactions con
 					 [clrWizardPagePreventDefault]="true"
 					 (clrWizardPageOnCancel)="doCancel()">
 		<ng-template clrPageTitle>Step 1</ng-template>
-		<h5 style="color: #a7a7a7;">Insert your other existing <strong>ACTIVE</strong> private key below</h5>
+		<h5 class="black-white">Insert your other existing <strong>ACTIVE</strong> private key below</h5>
 		<form [formGroup]="pvtform">
 			<mat-form-field class="mt-1" style="width: 100%;">
 				<input #pkField matInput type="password" formControlName="private_key"
@@ -435,10 +445,13 @@ <h3 class="modal-title text-white">
 	<div class="modal-body" *ngIf="selectedAccRem">
 		<p style="margin-bottom: 20px; color: #b1b1b1;">Are you sure you want do remove the account <span
 			class="blue">{{selectedAccRem.name}}</span>
-			from SimplEOS?</p>
+			from <span *ngIf="app.compilerVersion=='EOS MAINNET'">SimplEOS</span><span
+				*ngIf="app.compilerVersion!=='EOS MAINNET'">Liberland wallet</span>?</p>
 		<p style="margin-bottom: 20px;">*This will NOT delete your account from the blockchain, it will just remove it
 			from
-			SimplEOS. Should you want to import it again, just click on the "ADD ACCOUNT" button.</p>
+			<span *ngIf="app.compilerVersion=='EOS MAINNET'">SimplEOS</span><span
+				*ngIf="app.compilerVersion!=='EOS MAINNET'">the wallet</span>. Should you want to import it again, just
+			click on the "ADD ACCOUNT" button.</p>
 	</div>
 	<div class="modal-footer">
 		<button class="btn btn-danger-outline" (click)="deleteAccModal = false">Cancel</button>
diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts
index e78b61d6..45b85155 100644
--- a/src/app/dashboard/dashboard.component.ts
+++ b/src/app/dashboard/dashboard.component.ts
@@ -13,6 +13,7 @@ import {createNumberMask} from 'text-mask-addons/dist/textMaskAddons';
 import {EOSAccount} from '../interfaces/account';
 import {NetworkService} from '../services/network.service';
 import {AppComponent} from '../app.component';
+import {ThemeService} from '../services/theme.service';
 
 @Component({
 	selector: 'app-dashboard',
@@ -108,6 +109,7 @@ export class DashboardComponent implements OnInit {
 		public network: NetworkService,
 		public ram: RamService,
 		private zone: NgZone,
+		private theme: ThemeService,
 		public app: AppComponent
 	) {
 		this.newAccountModal = false;
@@ -115,6 +117,14 @@ export class DashboardComponent implements OnInit {
 		this.deleteAccModal = false;
 		this.appVersion = window['appversion'];
 
+		if (this.aService.activeChain.name === 'WAX MAINNET') {
+			this.theme.defaultTheme();
+		}
+
+		if (this.aService.activeChain.name === 'LIBERLAND TESTNET') {
+			this.theme.defaultTheme();
+		}
+
 		this.passform = this.fb.group({
 			matchingPassword: this.fb.group({
 				pass1: ['', [Validators.required, Validators.minLength(10)]],
@@ -174,12 +184,15 @@ export class DashboardComponent implements OnInit {
 				this.importedAccounts = [];
 				this.importedAccounts = [...results.foundAccounts];
 				this.importedAccounts.forEach((item) => {
+					item['permission'] = item.permissions.find(p => {
+						return p.required_auth.keys[0].key === results.publicKey;
+					})['perm_name'];
 					if (item['refund_request']) {
 						const tempDate = item['refund_request']['request_time'] + '.000Z';
 						const refundTime = new Date(tempDate).getTime() + (72 * 60 * 60 * 1000);
 						const now = new Date().getTime();
 						if (now > refundTime) {
-							this.eos.claimRefunds(item.account_name, input).then((tx) => {
+							this.eos.claimRefunds(item.account_name, input, item['permission']).then((tx) => {
 								console.log(tx);
 							});
 						} else {
@@ -270,13 +283,15 @@ export class DashboardComponent implements OnInit {
 
 		const account = this.aService.selected.getValue();
 		this.final_creator = account.name;
-		const publicKey = account.details['permissions'][0]['required_auth'].keys[0].key;
+
+		const [publicKey, permission] = this.aService.getStoredKey(account);
+
 		this.crypto.authenticate(this.submitTXForm.get('pass').value, publicKey).then((data) => {
 			if (data === true) {
 				this.eos.createAccount(
 					this.final_creator, this.final_name, this.final_owner,
 					this.final_active, delegate_amount, ram_amount,
-					delegate_transfer, gift_amount, 'created with simpleos', this.aService.activeChain['symbol']).then((txdata) => {
+					delegate_transfer, gift_amount, 'created with simpleos', this.aService.activeChain['symbol'], this.aService.activeChain['precision'], permission).then((txdata) => {
 					console.log(txdata);
 					if (this.newAccOptions === 'newpk') {
 						setTimeout(() => {
diff --git a/src/app/dashboard/referendum/referendum.component.ts b/src/app/dashboard/referendum/referendum.component.ts
index 32ba0fac..f9bf0541 100644
--- a/src/app/dashboard/referendum/referendum.component.ts
+++ b/src/app/dashboard/referendum/referendum.component.ts
@@ -85,10 +85,10 @@ export class ReferendumComponent implements OnInit {
 		});
 
 		this.createProposalForm = this.fb.group({
-			id: ['', [Validators.required,Validators.pattern('^(([a-z]|[1-5]|\\.){0,12})$')]],
+			id: ['', [Validators.required, Validators.pattern('^(([a-z]|[1-5]|\\.){0,12})$')]],
 			title: ['', [Validators.required]],
 			content: ['', [Validators.required]],
-			expiry: ['', [Validators.required,Validators.min(1),Validators.max(180)]],
+			expiry: ['', [Validators.required, Validators.min(1), Validators.max(180)]],
 			options: this.fb.array([]),
 			type: ['', [Validators.required]],
 		});
@@ -221,7 +221,7 @@ export class ReferendumComponent implements OnInit {
 			let temp_json = null;
 			try {
 				const pp_json = data[prop].proposal.proposal_json.replace(/[\n\r]/g, '');
-				temp_json = data[prop].proposal.proposal_json!==''?JSON.parse(pp_json):null;
+				temp_json = data[prop].proposal.proposal_json !== '' ? JSON.parse(pp_json) : null;
 			} catch (e) {
 				console.log(e);
 				console.log(data[prop].proposal.proposal_json);
@@ -448,12 +448,12 @@ export class ReferendumComponent implements OnInit {
 		const account = this.aService.selected.getValue();
 		const accountName = this.aService.selected.getValue().name;
 		const password = this.confirmvoteForm.get('pass').value;
-		const pubkey = account.details['permissions'][0]['required_auth'].keys[0].key;
+		const [pubkey, permission] = this.aService.getStoredKey(account);
 		this.wrongpass = '';
 		this.crypto.authenticate(password, pubkey).then((data) => {
 			if (data === true) {
 				const form = {voter: accountName, proposal_name: this.selProposal.proposal.proposal_name, vote: this.vtProposal, vote_json: ''};
-				this.eos.pushActionContract('eosio.forum', 'vote', form, accountName).then((info) => {
+				this.eos.pushActionContract('eosio.forum', 'vote', form, accountName, permission).then((info) => {
 					this.voteModal = false;
 					if (this.seeMore) {
 						this.seeMore = !this.seeMore;
@@ -483,12 +483,12 @@ export class ReferendumComponent implements OnInit {
 		const account = this.aService.selected.getValue();
 		const accountName = this.aService.selected.getValue().name;
 		const password = this.confirmunvoteForm.get('pass').value;
-		const pubkey = account.details['permissions'][0]['required_auth'].keys[0].key;
+		const [pubkey, permission] = this.aService.getStoredKey(account);
 		this.wrongpass = '';
 		this.crypto.authenticate(password, pubkey).then((data) => {
 			if (data === true) {
 				const form = {voter: accountName, proposal_name: this.selProposal.proposal.proposal_name};
-				this.eos.pushActionContract('eosio.forum', 'unvote', form, accountName).then((info) => {
+				this.eos.pushActionContract('eosio.forum', 'unvote', form, accountName, permission).then((info) => {
 					this.unvoteModal = false;
 					this.busy = false;
 					if (this.seeMore) {
@@ -516,30 +516,30 @@ export class ReferendumComponent implements OnInit {
 
 	}
 
-	showOptionsField(val){
-		if (val==='options-v1'||val==='multi-select-v1'){
-			this.showOptions='inline';
+	showOptionsField(val) {
+		if (val === 'options-v1' || val === 'multi-select-v1') {
+			this.showOptions = 'inline';
 			this.options.controls = [];
 			this.options.setValue([]);
 			this.addOptiont();
-		}else{
-			this.showOptions='none';
+		} else {
+			this.showOptions = 'none';
 			this.options.controls = [];
 			this.options.setValue([]);
 		}
 	}
 
-	addOptiont(){
+	addOptiont() {
 		this.options.push(this.fb.control(''));
-		console.log( moment().utc().add(this.createProposalForm.get('expiry').value, 'days').format(),this.createProposalForm.get('expiry').value);
+		console.log(moment().utc().add(this.createProposalForm.get('expiry').value, 'days').format(), this.createProposalForm.get('expiry').value);
 		this.cdr.detectChanges();
 	}
 
-	removeOption(){
+	removeOption() {
 		const options: FormArray = this.createProposalForm.get('options') as FormArray;
 		// Validators is optional
-		if(options.length-1 > 0){
-			options.removeAt((options.length-1));
+		if (options.length - 1 > 0) {
+			options.removeAt((options.length - 1));
 		}
 		this.cdr.detectChanges();
 	}
@@ -555,35 +555,35 @@ export class ReferendumComponent implements OnInit {
 	}
 
 	getExpiretimeProposal() {
-		return  (moment().utc().add(this.createProposalForm.get('expiry').value, 'days').fromNow())
+		return (moment().utc().add(this.createProposalForm.get('expiry').value, 'days').fromNow());
 	}
 
-	pushProposal(){
+	pushProposal() {
 		const contract = 'eosio.forum';
 		const action = 'propose';
 		const account = this.aService.selected.getValue();
 		this.busy = true;
 
-		let formVal = {
-			"proposer":account.name,
-			"proposal_name":this.createProposalForm.getRawValue().id,
-			"title":this.createProposalForm.getRawValue().title,
-			"proposal_json":"{ \"content\":\""+this.createProposalForm.getRawValue().content+"\", \"type\":\""+this.createProposalForm.getRawValue().type+"\"}",
-			"expires_at": moment().utc().add(this.createProposalForm.get('expiry').value, 'days').format()
+		const formVal = {
+			'proposer': account.name,
+			'proposal_name': this.createProposalForm.getRawValue().id,
+			'title': this.createProposalForm.getRawValue().title,
+			'proposal_json': '{ "content":"' + this.createProposalForm.getRawValue().content + '", "type":"' + this.createProposalForm.getRawValue().type + '"}',
+			'expires_at': moment().utc().add(this.createProposalForm.get('expiry').value, 'days').format()
 		};
 
-		if(this.createProposalForm.getRawValue().options.length>0){
-			formVal['proposal_json'] = "{ \"content\":\""+this.createProposalForm.getRawValue().content+"\", \"type\":\""+this.createProposalForm.getRawValue().type+", \"options\":\""+this.createProposalForm.getRawValue().options+"\"}";
+		if (this.createProposalForm.getRawValue().options.length > 0) {
+			formVal['proposal_json'] = '{ "content":"' + this.createProposalForm.getRawValue().content + '", "type":"' + this.createProposalForm.getRawValue().type + ', "options":"' + this.createProposalForm.getRawValue().options + '"}';
 		}
 
 		const accountName = this.aService.selected.getValue().name;
 		const password = this.confirmProposalForm.get('pass').value;
-		const pubkey = account.details['permissions'][0]['required_auth'].keys[0].key;
+		const [pubkey, permission] = this.aService.getStoredKey(account);
 
 		this.crypto.authenticate(password, pubkey).then((data) => {
 			if (data === true) {
 				console.log(formVal);
-				const val = this.eos.pushActionContract(contract, action, formVal, accountName).then((info) => {
+				const val = this.eos.pushActionContract(contract, action, formVal, accountName, permission).then((info) => {
 					console.log(info);
 					this.busy = false;
 					this.showToast('success', 'Transation broadcasted', 'Check your history for confirmation.');
@@ -593,7 +593,6 @@ export class ReferendumComponent implements OnInit {
 					this.wrongpass = JSON.stringify(JSON.parse(error).error.details[0].message);
 				});
 				console.log(val);
-				//this.busy = false;
 			}
 		}).catch(error2 => {
 			console.log(error2);
diff --git a/src/app/dashboard/rex/rex.component.css b/src/app/dashboard/rex/rex.component.css
index c3487073..e4a608cf 100644
--- a/src/app/dashboard/rex/rex.component.css
+++ b/src/app/dashboard/rex/rex.component.css
@@ -23,7 +23,7 @@
 
 .req {
 	color: white;
-	background-color: var(--sidenav-background);
+	background-color: var(--tr-resource-even-backgorund);
 	margin-top: 4px;
 	padding: 10px 0 8px 12px;
 	border-bottom: 1px solid var(--sidenav-active-border-color1);
@@ -39,7 +39,6 @@
 
 .explain {
 	margin-top: 10px;
-	color: #b0b0b7;
 	margin-left: 24px;
 }
 
diff --git a/src/app/dashboard/rex/rex.component.html b/src/app/dashboard/rex/rex.component.html
index bb54e2aa..a2c8978b 100644
--- a/src/app/dashboard/rex/rex.component.html
+++ b/src/app/dashboard/rex/rex.component.html
@@ -48,7 +48,7 @@
 												<span
 													class="gray-rex">&nbsp;&nbsp;your REX fund:</span> {{rexFund | number:'1.0-2'}} {{aService.activeChain['symbol']}}
 												<div>
-													<button [disabled]="rexFund === 0" type="button" class="btn btn-info-outline btn-sm"
+													<button [disabled]="rexFund === 0" type="button" class="btn-rex btn btn-info-outline btn-sm"
 															style="margin: 6px 0; color: var(--rex-btn-color) !important;" (click)="withdraw()">
 														withdraw to my account
 													</button>
@@ -131,7 +131,7 @@
 
 
 												<div class="clr-col-lg-11 white" *ngIf="!canbuyREX">
-													<div class="req-title">Requirements for buying REX</div>
+													<div class="req-title gray">Requirements for buying REX</div>
 													<div class="req white">
 														<fa-icon [icon]="['far', 'times-circle']" class="error"
 																 size="lg"></fa-icon>&nbsp;
@@ -143,7 +143,7 @@
 															VOTE EOSCOREPROXY
 														</button>
 														<div style="margin-top: 12px;">
-										<span class="explain">You're currently voting for <span
+										<span class="explain black-white">You're currently voting for <span
 											class="blue-rex">{{nVoters}}/21</span> producers.</span>
 															<button type="button" class="btn btn-info-outline btn-sm"
 																	style="float: right; margin-right: 5px; color: var(--rex-btn-color) !important;"
@@ -603,7 +603,7 @@
 												<span
 													class="gray-rex">&nbsp;&nbsp;your REX fund:</span> {{rexFund | number:'1.0-2'}} {{aService.activeChain['symbol']}}
 												<div>
-													<button [disabled]="rexFund === 0" type="button" class="btn btn-info-outline btn-sm"
+													<button [disabled]="rexFund === 0" type="button" class="btn-rex btn btn-info-outline btn-sm"
 															style="margin: 6px 0; color: var(--rex-btn-color) !important;" (click)="withdraw()">
 														withdraw to my account
 													</button>
diff --git a/src/app/dashboard/rex/rex.component.ts b/src/app/dashboard/rex/rex.component.ts
index 519a9e60..0ccd08f8 100644
--- a/src/app/dashboard/rex/rex.component.ts
+++ b/src/app/dashboard/rex/rex.component.ts
@@ -369,7 +369,7 @@ export class RexComponent implements OnDestroy {
 			title: {
 				left: 'center',
 				subtext: 'borrowing cost',
-				subtextStyle: {color: '#ffffff', fontWeight: 'bold'},
+				subtextStyle: {color: color, fontWeight: 'bold'},
 				top: '20'
 			},
 			grid: {height: '80%', width: '75%', right: '30', top: '11'},
diff --git a/src/app/dashboard/send/send.component.css b/src/app/dashboard/send/send.component.css
index 00020ca3..3ab7da3a 100644
--- a/src/app/dashboard/send/send.component.css
+++ b/src/app/dashboard/send/send.component.css
@@ -62,7 +62,7 @@ li {
 }
 
 li:hover {
-    background-color: var(--sidenav-active-background);
+    background-color: var(--tr-hover);
     color: var(--sidenav-active-color);
     -webkit-transition-duration: 0.3s;
     transition-duration: 0.3s;
@@ -79,7 +79,7 @@ li:hover .contact-hover {
 }
 
 .contacts-panel {
-    background-color: var(--sidenav-background);
+    background-color: var(--tokens-panel-background);
     display: flex;
     flex-direction: column;
     padding-left: 0;
@@ -99,7 +99,7 @@ li:hover .contact-hover {
 }
 
 .newContactBtn {
-    background-color: #00000059;
+    background-color: #21212126;
     border-bottom: 0;
     border-left: 0;
     border-right: 0;
@@ -168,9 +168,9 @@ mat-option:not(.last) {
 }
 
 /deep/ .token-title-color .mat-form-field.mat-focused .mat-form-field-label {
-	color: var(--text-destaque-color);
+	color: var(--destaque-color-token);
 }
 
 /deep/ .token-title-color .mat-form-field.mat-focused .mat-form-field-ripple {
-	background-color: var(--text-destaque-color);
+	background-color: var(--destaque-color-token);
 }
diff --git a/src/app/dashboard/send/send.component.html b/src/app/dashboard/send/send.component.html
index b700d038..413fe23a 100644
--- a/src/app/dashboard/send/send.component.html
+++ b/src/app/dashboard/send/send.component.html
@@ -15,18 +15,18 @@
 					</div>
 					<ng-container
 						*ngIf="sendForm.value.token !== aService.activeChain['symbol'] && selectedToken['price'] !== null">
-						${{token_balance * selectedToken['price'] | number :'1.2-2'}}
+						${{token_balance * selectedToken['price'] | number :'1.2-' + aService.activeChain['precision']}}
 					</ng-container>
 				</div>
 				<ng-container *ngIf="sendForm.value.token === aService.activeChain['symbol']">
-					<div class="eos">{{unstaked | number : '1.2-4'}} {{aService.activeChain['symbol']}}</div>
+					<div class="eos">{{unstaked | number : '1.2-' + aService.activeChain['precision']}} {{aService.activeChain['symbol']}}</div>
 					<div *ngIf="unstaking > 0" style="color: white">
 						<fa-icon [icon]="['far', 'lock']"></fa-icon>&nbsp;Will be {{(unstaked + unstaking) | number :
 						'1.2-4'}} {{aService.activeChain['symbol']}} {{unstakeTime}}
 					</div>
 				</ng-container>
 				<ng-container *ngIf="sendForm.value.token !== aService.activeChain['symbol']">
-					<div class="eos">{{token_balance | number : '1.2-4'}} {{sendForm.value.token}}</div>
+					<div class="eos">{{token_balance | number : '1.2-' + aService.activeChain['precision']}} {{sendForm.value.token}}</div>
 				</ng-container>
 				<form [formGroup]="sendForm">
 					<div>
@@ -121,7 +121,7 @@ <h1 class="token-title-color mt-0">My Contacts</h1>
 							<div class="clr-row justify-content-between">
 								<div class="clr-col-lg-8 clr-col-sm-6 clr-col-md-7">
 									<h5 class="token-title-color contact-hover mt-0">{{contact.name}}</h5>
-									<div>{{contact.account}}</div>
+									<div class="black-white">{{contact.account}}</div>
 								</div>
 								<div class="clr-col-lg-4 clr-col-sm-6 clr-col-md-5" style="text-align: right">
 									<button class="btn btn-info-outline editBtn"
@@ -150,7 +150,7 @@ <h5 class="token-title-color contact-hover mt-0">{{contact.name}}</h5>
 
 <clr-modal [(clrModalOpen)]="sendModal" (clrModalOpenChange)="confirmForm.reset();">
 	<h3 class="modal-title text-white"><span class="blue">{{ fromAccount }}</span> sends <span
-		class="blue">{{ sendForm.value.amount | number : '1.2-4' }} {{sendForm.value.token}}</span>
+		class="blue">{{ sendForm.value.amount | number : '1.2-' + aService.activeChain['precision'] }} {{sendForm.value.token}}</span>
 		to
 	</h3>
 	<div class="modal-body">
diff --git a/src/app/dashboard/send/send.component.ts b/src/app/dashboard/send/send.component.ts
index 0d112983..e23cb877 100644
--- a/src/app/dashboard/send/send.component.ts
+++ b/src/app/dashboard/send/send.component.ts
@@ -67,7 +67,7 @@ export class SendComponent implements OnInit {
 		'bitfinexdep1', 'krakenkraken', 'chainceoneos',
 		'huobideposit', 'zbeoscharge1', 'okbtothemoon',
 		'gateiowallet', 'eosusrwallet', 'binancecleos',
-		'novadaxstore','floweosaccnt','coinwwallet1' ];
+		'novadaxstore', 'floweosaccnt', 'coinwwallet1'];
 	memoMsg = 'optional';
 
 	constructor(private fb: FormBuilder,
@@ -89,6 +89,14 @@ export class SendComponent implements OnInit {
 			add: [false],
 			alias: [''],
 		});
+
+		this.numberMask = createNumberMask({
+			prefix: '',
+			allowDecimal: true,
+			includeThousandsSeparator: false,
+			decimalLimit: this.aService.activeChain.precision,
+		});
+
 		this.contactForm = this.fb.group({
 			account: ['', Validators.required],
 			name: ['', Validators.required],
@@ -133,7 +141,6 @@ export class SendComponent implements OnInit {
 	}
 
 
-
 	checkExchangeAccount() {
 		const memo = this.sendForm.get('memo');
 		const acc = this.sendForm.get('to').value;
@@ -418,7 +425,9 @@ export class SendComponent implements OnInit {
 		const to = this.sendForm.get('to').value.toLowerCase();
 		const amount = parseFloat(this.sendForm.get('amount').value);
 		const memo = this.sendForm.get('memo').value;
-		const publicKey = selAcc.details['permissions'][0]['required_auth'].keys[0].key;
+
+		const [publicKey, permission] = this.aService.getStoredKey(selAcc);
+
 		if (amount > 0 && this.sendForm.valid) {
 			this.crypto.authenticate(this.confirmForm.get('pass').value, publicKey).then((res) => {
 				// console.log(res);
@@ -427,7 +436,7 @@ export class SendComponent implements OnInit {
 					const tk_name = this.sendForm.get('token').value;
 					// console.log(tk_name);
 					// console.log(this.aService.tokens);
-					let precision = 4;
+					let precision = this.aService.activeChain['precision'];
 					// if (tk_name !== 'EOS') { // CSTAM
 					if (tk_name !== this.aService.activeChain['symbol']) { // CSTAM
 						const idx = this.aService.tokens.findIndex((val) => {
@@ -438,7 +447,7 @@ export class SendComponent implements OnInit {
 					}
 					console.log(precision);
 					console.log(contract, from, to, amount.toFixed(precision) + ' ' + tk_name, memo);
-					this.eos.transfer(contract, from, to, amount.toFixed(precision) + ' ' + tk_name, memo).then((result) => {
+					this.eos.transfer(contract, from, to, amount.toFixed(precision) + ' ' + tk_name, memo, permission).then((result) => {
 						if (result === true) {
 							this.wrongpass = '';
 							this.sendModal = false;
diff --git a/src/app/dashboard/settings/config.component.html b/src/app/dashboard/settings/config.component.html
index 98bbbe01..e5de082d 100644
--- a/src/app/dashboard/settings/config.component.html
+++ b/src/app/dashboard/settings/config.component.html
@@ -12,6 +12,8 @@
 							<!--<fa-icon matSuffix [icon]="['fas', 'caret-down']"></fa-icon>-->
 							<mat-option *ngFor="let chain of network.defaultChains" class="chain-option"
 										[value]="chain.id">
+								<img [src]="'./assets/chain-icons/' + chain.icon" width="28" height="28"
+									 class="chain-icon"/>
 								{{ chain.name }}
 							</mat-option>
 						</mat-select>
@@ -37,11 +39,14 @@
 					</div>
 					<div class="clr-row" style="margin-left: 0;">
 						<div class="clr-col-auto">
-							<button class="btn btn-info-outline mt-1 special-font" (click)="endpointModal = true" style="font-weight: 700">Other</button>
+							<button class="btn btn-info-outline mt-1 special-font" (click)="endpointModal = true"
+									style="font-weight: 700">Other
+							</button>
 						</div>
 						<div class="clr-col-auto">
 							<button class="btn btn-info-outline mt-1 special-font" (click)="network.connect(true)"
-									pTooltip="Automatically connects on the fastest endpoint for you" style="font-weight: 700">Auto
+									pTooltip="Automatically connects on the fastest endpoint for you"
+									style="font-weight: 700">Auto
 							</button>
 						</div>
 						<div class="clr-col-auto" *ngIf="!network.networkingReady.getValue()">
@@ -64,7 +69,8 @@
 					Logout Options
 				</div>
 				<div class="card-block">
-					<button class="btn btn-info-outline special-font" (click)="logoutModal = true"  style="font-weight: 700">Clear local data and logout
+					<button class="btn btn-info-outline special-font" (click)="logoutModal = true"
+							style="font-weight: 700">Clear local data and logout
 					</button>
 					<div class="info">*Your data will be cleared from this PC. Should you want to login again, you will
 						have to
@@ -82,8 +88,12 @@
 					</a>
 				</div>
 				<div class="card-block">
-					<button class="btn btn-info-outline special-font" (click)="pinModal = true" style="font-weight: 700">SET PIN</button>
-					<button class="btn btn-danger-outline special-font" (click)="clearPinModal = true"  style="font-weight: 700">REMOVE lOCKSCREEN</button>
+					<button class="btn btn-info-outline special-font" (click)="pinModal = true"
+							style="font-weight: 700">SET PIN
+					</button>
+					<button class="btn btn-danger-outline special-font" (click)="clearPinModal = true"
+							style="font-weight: 700">REMOVE lOCKSCREEN
+					</button>
 				</div>
 			</div>
 			<div class="card info-card">
@@ -95,7 +105,9 @@
 					</a>
 				</div>
 				<div class="card-block">
-					<button class="btn btn-info-outline special-font" (click)="changePassModal = true" style="font-weight: 700">CHANGE</button>
+					<button class="btn btn-info-outline special-font" (click)="changePassModal = true"
+							style="font-weight: 700">CHANGE
+					</button>
 				</div>
 			</div>
 			<div class="card info-card">
@@ -118,10 +130,15 @@
 						</a>
 						<div class="info" *ngIf="lastBackupTime !== ''">* Last backup on {{lastBackupTime}}</div>
 					</div>
-					<button class="btn btn-info-outline special-font" (click)="exportBKModal = true" style="font-weight: 700">EXPORT</button>
-					<button class="btn btn-info-outline special-font" (click)="importBKModal = true" style="font-weight: 700">IMPORT</button>
+					<button class="btn btn-info-outline special-font" (click)="exportBKModal = true"
+							style="font-weight: 700">EXPORT
+					</button>
+					<button class="btn btn-info-outline special-font" (click)="importBKModal = true"
+							style="font-weight: 700">IMPORT
+					</button>
 					<div style="margin-top: 20px;">
-						<button class="btn btn-info-outline special-font" (click)="openPKModal()" style="font-weight: 700">VIEW PRIVATE KEY
+						<button class="btn btn-info-outline special-font" (click)="openPKModal()"
+								style="font-weight: 700">VIEW PRIVATE KEY
 							<fa-icon [icon]="['fas', 'skull-crossbones']" size="lg"></fa-icon>
 						</button>
 					</div>
@@ -329,7 +346,7 @@ <h3 class="modal-title text-white">
 			{{choosedDir}}
 			<input style="visibility:hidden;" type="file" placeholder="Backup Directory"
 				   (change)="exportCheckBK($event)" formControlName="customExportBK" webkitdirectory directory
-				   #customExportBK>
+                   #customExportBK>
 
 		</form>
 
@@ -349,7 +366,15 @@ <h3 class="modal-title" style="color: #e12200;">
 		<fa-icon [icon]="['fas', 'exclamation-triangle']"></fa-icon>
 	</h3>
 	<div class="modal-body">
-		<div *ngIf="!showpk">
+		<div *ngIf="claimKey">
+			Saved claim private key
+			<mat-form-field style="width: 470px; margin-top: 25px;">
+				<input matInput placeholder="Claim private key"
+					   [value]="claimPrivateKey" readonly>
+				<fa-icon matSuffix [icon]="['far', 'clone']" size="lg" class="copy" (click)="cc(claimPrivateKey)"></fa-icon>
+			</mat-form-field>
+		</div>
+		<div *ngIf="!showpk && !claimKey">
 			<h4 class="text-white">Are you <span class="blue">sure</span> you want to see the active private key of the
 				account <span class="blue">{{selectedAccount}}</span>?</h4>
 			<div style="color: #9A9A9A;">*Your private key is the only access to your account, so it should always be
@@ -365,7 +390,7 @@ <h4 class="text-white">Are you <span class="blue">sure</span> you want to see th
 				</button>
 			</form>
 		</div>
-		<div *ngIf="showpk">
+		<div *ngIf="showpk && !claimKey">
 			<h4 class="text-white">Please, save the active key on a safe place and <span class="blue">never share your private key with
 				anyone.</span></h4>
 			<mat-form-field style="width: 470px; margin-top: 25px;">
diff --git a/src/app/dashboard/settings/config.component.ts b/src/app/dashboard/settings/config.component.ts
index 028316d9..d9d773dd 100644
--- a/src/app/dashboard/settings/config.component.ts
+++ b/src/app/dashboard/settings/config.component.ts
@@ -10,6 +10,8 @@ import {BodyOutputType, Toast, ToasterConfig, ToasterService} from 'angular2-toa
 import {ClrModal, ClrWizard} from '@clr/angular';
 import {BackupService} from '../../services/backup.service';
 import {AppComponent} from '../../app.component';
+import {ElectronService} from 'ngx-electron';
+import {Eosjs2Service} from '../../services/eosjs2.service';
 
 @Component({
 	selector: 'app-config',
@@ -63,6 +65,10 @@ export class ConfigComponent implements OnInit {
 	lastBackupTime: string;
 	selectedAccount = '';
 
+	claimKey = false;
+	private keytar: any;
+	claimPrivateKey = '';
+
 	static resetApp() {
 		window['remote']['app']['relaunch']();
 		window['remote']['app'].exit(0);
@@ -77,9 +83,13 @@ export class ConfigComponent implements OnInit {
 				public aService: AccountsService,
 				private toaster: ToasterService,
 				private backup: BackupService,
-				public app: AppComponent
+				public app: AppComponent,
+				private _electronService: ElectronService,
+				public eosjs: Eosjs2Service
 	) {
 
+		this.keytar = this._electronService.remote.require('keytar');
+
 		this.timetoclose = this.pkExposureTime;
 		this.endpointModal = false;
 		this.logoutModal = false;
@@ -403,7 +413,27 @@ export class ConfigComponent implements OnInit {
 
 	openPKModal() {
 		this.selectedAccount = this.aService.selected.getValue().name;
-		this.viewPKModal = true;
+		const [publicKey, permission] = this.aService.getStoredKey(this.aService.selected.getValue());
+		console.log(publicKey, permission);
+		if (permission === 'claim' || publicKey === '') {
+			this.eosjs.rpc.get_account(this.selectedAccount).then((accData) => {
+				const claim_key = accData.permissions.find(p => {
+					return p.perm_name === 'claim';
+				});
+				this.keytar.getPassword('simpleos', claim_key.required_auth.keys[0].key).then((result) => {
+					console.log(result);
+					if (result !== '') {
+						this.claimPrivateKey = result;
+						this.claimKey = true;
+						this.viewPKModal = true;
+					}
+				});
+			});
+		} else {
+			this.claimKey = false;
+			this.claimPrivateKey = '';
+			this.viewPKModal = true;
+		}
 	}
 
 	closePkModal() {
@@ -423,7 +453,7 @@ export class ConfigComponent implements OnInit {
 	viewPK() {
 		if (this.showpkForm.get('pass').value !== '') {
 			const selAcc = this.aService.selected.getValue();
-			const publicKey = selAcc.details['permissions'][0]['required_auth'].keys[0].key;
+			const [publicKey, permission] = this.aService.getStoredKey(selAcc);
 			this.crypto.authenticate(this.showpkForm.get('pass').value, publicKey).then((result) => {
 				if (result) {
 					this.showpk = true;
diff --git a/src/app/dashboard/vote/vote.component.css b/src/app/dashboard/vote/vote.component.css
index 20bbad84..99f5c4c5 100644
--- a/src/app/dashboard/vote/vote.component.css
+++ b/src/app/dashboard/vote/vote.component.css
@@ -133,7 +133,7 @@
 
 .tr-canexpand:hover {
     cursor: pointer;
-    background-color: #272727 !important;
+    background-color: var(--expand-background) !important;
     -webkit-transition-duration: 0.3s;
     transition-duration: 0.3s;
     -webkit-transition-property: background-color;
@@ -145,7 +145,7 @@
 }
 
 .tr-expanded > td {
-    background: #272727;
+    background: var(--expand-background);
     padding: 0.8em .5em;
 }
 
@@ -155,12 +155,17 @@
 }
 
 .title {
-    color: #d4d4d4;
+    color: var(--text-gray-color);
     font-weight: 500;
     margin-left: 10px;
     display: inline-flex;
 }
 
+.gbm-title {
+	color: var(--text-white-color);
+	font-size: 16px;
+}
+
 .subtitle {
     display: inline-flex;
     margin-left: 10px;
@@ -202,7 +207,7 @@ a:visited {
 }
 
 .social-icon fa-icon:hover {
-    color: white;
+    color: var(--text-white-color);
     cursor: pointer;
 }
 
@@ -218,6 +223,7 @@ a:visited {
 
 /deep/ .bp-map > div {
   margin: auto !important;
+	overflow: hidden;
 }
 
 /deep/ .map .ui-widget-content {
@@ -296,3 +302,19 @@ mat-option:not(.last) {
 	margin-right: auto;
 	max-width: 1104px;
 }
+
+.rex-balances-top {
+	background-color: var(--tr-resource-even-backgorund);
+	padding: 5px 0 5px 12px;
+	border-bottom: 1px solid var(--sidenav-active-border-color1);
+	border-top: 1px solid var(--sidenav-active-border-color1);
+	margin-top: 10px;
+	color:var(--tr-resource-odd-color);
+}
+
+.rex-balances {
+	background-color: var(--tr-resource-even-backgorund);
+	padding: 5px 0 5px 12px;
+	border-bottom: 1px solid var(--sidenav-active-border-color1);
+	color:var(--tr-resource-odd-color);
+}
diff --git a/src/app/dashboard/vote/vote.component.html b/src/app/dashboard/vote/vote.component.html
index 5a99f275..792c90ba 100644
--- a/src/app/dashboard/vote/vote.component.html
+++ b/src/app/dashboard/vote/vote.component.html
@@ -10,7 +10,7 @@
 						</ng-container>
 					</div>
 					<div class="blue eos special-font">{{(totalBalance > 10000) ? ((totalBalance / 1000) |
-						number: '1.2-4') + "K" : ((totalBalance) | number: '1.2-4') }} {{aService.activeChain['symbol']}}
+                        number: '1.2-4') + "K" : ((totalBalance) | number: '1.2-4') }} {{aService.activeChain['symbol']}}
 					</div>
 				</div>
 			</div>
@@ -22,22 +22,22 @@
 						</ng-container>
 					</div>
 					<div class="blue eos special-font">{{(stakedBalance > 10000) ? ((stakedBalance / 1000) |
-						number: '1.2-4') + "K" : ((stakedBalance) | number: '1.2-4') }} {{aService.activeChain['symbol']}}
+                        number: '1.2-4') + "K" : ((stakedBalance) | number: '1.2-4') }} {{aService.activeChain['symbol']}}
 					</div>
 					<div *ngIf="aService.activeChain.features['rex']&&!hasRex" style="color: #b0b0b7;font-size: 16px;">
 						STAKED + REX: <span class="blue">{{(totalStaked) | number :
-						'1.2-4'}} {{aService.activeChain['symbol']}} </span>
+                        '1.2-4'}} {{aService.activeChain['symbol']}} </span>
 						<a role="tooltip" aria-haspopup="true" class="tooltip tooltip-lg tooltip-right">
 							<fa-icon [icon]="['far','question-circle']" class="blue"></fa-icon>
 							<span class="tooltip-content">This amount represents your total voting power which includes staked EOS and the amount allocated to REX.</span>
 						</a>
 					</div>
-					<div *ngIf="aService.activeChain.features['vote']&&hasVote"style="color: #b0b0b7;font-size: 16px;">
+					<div *ngIf="aService.activeChain.features['vote']&&hasVote" style="color: #b0b0b7;font-size: 16px;">
 						VOTE DECAY: <span [ngStyle]="{color:(votedDecay > 0.0000  ? '#e12200' : '#b0b0b7')}">
-							{{(votedEOSDecay) | number : '1.2-4'}} EOS
+							{{(votedEOSDecay) | number : '1.2-4'}} {{aService.activeChain['symbol']}}
 
-							<fa-icon *ngIf="votedDecay > 0" [icon]="['far','long-arrow-alt-down']" ></fa-icon>
-							{{(votedDecay) | number : '1.2-4'}} %
+						<fa-icon *ngIf="votedDecay > 0" [icon]="['far','long-arrow-alt-down']"></fa-icon>
+						{{(votedDecay) | number : '1.2-4'}} %
 						</span>
 					</div>
 				</div>
@@ -46,7 +46,7 @@
 		</div>
 		<div class="clr-col-lg-6">
 			<div class="card info-card">
-				<div class="card-block">
+				<div class="card-block" style="min-height: 270px">
 					<div class="instruction expandable special-font">Stake your {{aService.activeChain['symbol']}}
 						<a role="tooltip" aria-haspopup="true" class="tooltip tooltip-lg tooltip-right">
 							<fa-icon [icon]="['far','question-circle']" class="blue" style="font-size: 16px;"></fa-icon>
@@ -145,10 +145,12 @@
 						<div class="clr-col-lg-7 text-right" style="align-self: flex-end; color: #b0b0b7">
 
 							<span class="text-white" style="font-weight: 600">CPU: </span>
-							<span class=" special-font" *ngIf="valuetoStake !== ''">{{cpu_weight}} </span>
+							<span class=" special-font"
+								  *ngIf="valuetoStake !== ''">{{cpu_weight_n | number: '1.0-4'}} {{aService.activeChain['symbol']}}</span>
 							<span *ngIf="valuetoStake === ''">50% </span> /
 							<span class="text-white" style="font-weight: 600">NET: </span>
-							<span class=" special-font" *ngIf="valuetoStake !== ''">{{ net_weight }} </span>
+							<span class=" special-font"
+								  *ngIf="valuetoStake !== ''">{{ net_weight_n | number: '1.0-4'}} {{aService.activeChain['symbol']}}</span>
 							<span *ngIf="valuetoStake === ''">50%</span>
 						</div>
 					</div>
@@ -157,6 +159,77 @@
 		</div>
 	</div>
 
+	<div class="clr-row votepage-row animate" *ngIf="aService.activeChain['name'] == 'WAX MAINNET' && gbmBalance > 0">
+		<div class="clr-col-lg-12">
+			<div class="card info-card">
+				<div class="card-block">
+					<div class="gbm-title ">WAX GBM Rewards
+						<a role="tooltip" aria-haspopup="true" class="tooltip tooltip-md tooltip-right">
+							<fa-icon [icon]="['far','question-circle']" class="blue"></fa-icon>
+							<span
+								class="tooltip-content">Genesis block member Rewards. For memebers that claimed their WAX tokens on the period of June 30 to August 30, 2019.
+							</span>
+						</a>
+						<button class="btn btn-outline btn-info-outline" (click)="claimGBMrewards()"
+								style="margin-left: 10px; font-weight: 700;">Claim rewards
+						</button>
+						<div class="error" *ngIf="this.claimError !== ''">{{this.claimError}}</div>
+					</div>
+					<div class="rex-balances-top white-rex"
+						 style="background-color:  var(--tr-resource-odd-backgorund);"><span
+						class="gray-rex">Balance: {{gbmBalance}} WAX</span>
+					</div>
+					<div class="rex-balances white">
+						<span
+							class="gray">Estimated rewards per day: {{(gbmEstimatedDaily + voteRewardsDaily).toFixed(2)}}
+							WAX </span>
+						<a role="tooltip" aria-haspopup="true" class="tooltip tooltip-md tooltip-right">
+							<fa-icon [icon]="['far','exclamation-circle']" class="error"></fa-icon>
+							<span
+								class="tooltip-content">Tip: win more rewards by voting for at least 16 block producers or a proxy below.
+							</span>
+						</a>
+						<span class="gray"> (GBM: {{gbmEstimatedDaily}} WAX</span>
+						<span class="gray"> - Voter: {{voteRewardsDaily}} WAX)</span>
+					</div>
+					<div class="rex-balances white-rex"
+						 style="background-color:  var(--tr-resource-odd-backgorund);"><span
+						class="gray-rex">Last claim: {{gbmLastClaim}}</span>
+					</div>
+					<div class="rex-balances white" *ngIf="!claimReady"><span
+						class="gray-rex">Next claim ready {{gbmNextClaim}}</span>
+					</div>
+					<div class="rex-balances white" *ngIf="claimReady"><span
+						class="gray">You can claim now</span>
+					</div>
+					<div *ngIf="!autoClaimStatus && claimSetupWarning === ''" class="black-white"
+						 style="margin-top: 6px">
+						Do you want to set a custom permission to automatically claim your rewards?
+						<button class="btn btn-outline btn-info-outline" (click)="createClaimPermission()"
+								style="margin-left: 10px; font-weight: 700;">Set auto-claim
+						</button>
+					</div>
+					<div *ngIf="autoClaimStatus" class="black-white" style="margin-top: 6px">
+						Auto-claim setup verified. All good.
+						<button class="btn btn-outline btn-info-outline" (click)="createClaimPermission()"
+								style="margin-left: 10px; font-weight: 700;">Renew claim key
+						</button>
+						<button class="btn btn-outline btn-info-outline" (click)="claimDirect(true)"
+								style="margin-left: 10px; font-weight: 700;">Force vote recast
+						</button>
+					</div>
+					<div *ngIf="!autoClaimStatus && claimSetupWarning !== ''" class="black-white"
+						 style="margin-top: 6px">
+						{{claimSetupWarning}}
+						<button class="btn btn-outline btn-info-outline" (click)="createClaimPermission()"
+								style="margin-left: 10px; font-weight: 700;">Renew claim key
+						</button>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
 	<div class="clr-row votepage-row animate" *ngIf="app.compilerVersion !== 'LIBERLAND TESTNET'">
 		<div class="clr-col-lg-12">
 			<div class="card info-card">
@@ -275,7 +348,7 @@ <h5 class="subtitle mt-0">Choose a proxy that will vote in the block producers f
 							<p-sortIcon [field]="'total_votes'"></p-sortIcon>
 						</th>
 						<th style="width: 100px;">
-							{{voteService.voteType === 1 ? nVotesProxy+'/1' : nVotes+'/30'}}
+							{{voteService.voteType === 1 ? nVotesProxy + '/1' : nVotes + '/30'}}
 						</th>
 					</tr>
 					<tr class="tr-canexpand" *ngIf="busyList && voteService.hasList">
@@ -322,7 +395,9 @@ <h5 class="subtitle mt-0">Choose a proxy that will vote in the block producers f
 								</li>
 								<li class="social-icon" *ngIf="item.social['steemit']">
 									<a (click)="extOpen('https://steemit.com/@' + item.social['steemit'])">
-										<img src="assets/steemit.png" class="steemit" style="">
+										<img
+											[src]="theme.currentTheme === 'dark' ? 'assets/steemit.png' : 'assets/steemit2.png'"
+											class="steemit" style="">
 									</a>
 								</li>
 								<li class="social-icon" *ngIf="item.social['telegram']">
@@ -342,13 +417,14 @@ <h5 class="subtitle mt-0">Choose a proxy that will vote in the block producers f
 								{{item.total_votes}}
 							</span>
 							<span *ngIf="!voteService.voteType">
-								<a role="tooltip" aria-haspopup="true" class="tooltip tooltip-lg tooltip-left mat-checkbox-label" style="text-decoration:none;">
+								<a role="tooltip" aria-haspopup="true"
+								   class="tooltip tooltip-lg tooltip-left mat-checkbox-label"
+								   style="text-decoration:none;">
 									{{item.total_votes}}
 									<span class="tooltip-content " style="width:3rem!important;">
 										{{item.total_votes_eos}}
 									</span>
 								</a>
-
 							</span>
 						</td>
 						<td>
@@ -365,7 +441,7 @@ <h5 class="subtitle mt-0">Choose a proxy that will vote in the block producers f
 				</ng-template>
 				<ng-template pTemplate="rowexpansion" let-item>
 					<tr class="tr-expanded" *ngIf="voteService.hasList">
-						<td colspan="7">
+						<td colspan="8">
 							<div class="clr-row row-expanded flex-items-xs-between">
 								<div class="clr-col-auto">
 									<div>
@@ -418,7 +494,9 @@ <h3 class="blue">Background:</h3>
 										<ul>
 											<li class="social-icon" *ngIf="item.social['steemit']">
 												<a (click)="extOpen('https://steemit.com/@' + item.social['steemit'])">
-													<img src="assets/steemit.png" class="steemit" style="">
+													<img
+														[src]="theme.currentTheme === 'dark' ? 'assets/steemit.png' : 'assets/steemit2.png'"
+														class="steemit" style="">
 												</a>
 											</li>
 											<li class="social-icon" *ngIf="item.social['telegram']">
@@ -530,7 +608,7 @@ <h5 class="mt-0">{{selectedVotes.join(', ')}}</h5>
 				producer candidates {{!voteService.voteType ? selectedVotes.join(', ') : listProxyVote.join(', ')}} with
 				a voting weight equal to all tokens currently owned
 				by {{
-				fromAccount }} and staked for CPU or bandwidth.
+                fromAccount }} and staked for CPU or bandwidth.
 				<br><br>
 				If I am not the beneficial owner of these shares I stipulate I have proof that I’ve been authorized to
 				vote
diff --git a/src/app/dashboard/vote/vote.component.ts b/src/app/dashboard/vote/vote.component.ts
index ae86d6e4..681f2254 100644
--- a/src/app/dashboard/vote/vote.component.ts
+++ b/src/app/dashboard/vote/vote.component.ts
@@ -14,6 +14,11 @@ import {Subscription} from 'rxjs';
 import {Eosjs2Service} from '../../services/eosjs2.service';
 import {RexComponent} from '../rex/rex.component';
 import {AppComponent} from '../../app.component';
+import {ThemeService} from '../../services/theme.service';
+import {TransactionFactoryService} from '../../services/transaction-factory.service';
+import {ElectronService} from 'ngx-electron';
+import {Api, RpcError} from 'eosjs/dist';
+import {JsSignatureProvider} from 'eosjs/dist/eosjs-jssig';
 
 @Component({
 	selector: 'app-vote',
@@ -87,6 +92,8 @@ export class VoteComponent implements OnInit, AfterViewInit, OnDestroy {
 
 	net_weight = '';
 	cpu_weight = '';
+	cpu_weight_n = 0;
+	net_weight_n = 0;
 
 	stakingRatio = 75;
 
@@ -95,8 +102,27 @@ export class VoteComponent implements OnInit, AfterViewInit, OnDestroy {
 	subscriptions: Subscription[] = [];
 	private selectedProxy = '';
 
+	private ecc: any;
+	private keytar: any;
+	private fs: any;
+
+	autoClaimStatus: boolean;
+	claimPublicKey = '';
+	private claimError: string;
+	public gbmBalance = 0;
+	public gbmLastClaim: string;
+	public gbmNextClaim: string;
+	public claimReady: boolean;
+	public gbmEstimatedDaily = 0;
+	public voteRewardsDaily = 0;
+	private autoClaimConfig = {};
+	private selectedAccountName = '';
+	private last_claim_time: number;
+	public claimSetupWarning = '';
+
 	constructor(public voteService: VotingService,
 				private http: HttpClient,
+				private trxFactory: TransactionFactoryService,
 				public aService: AccountsService,
 				public eos: EOSJSService,
 				public eosjs: Eosjs2Service,
@@ -104,9 +130,16 @@ export class VoteComponent implements OnInit, AfterViewInit, OnDestroy {
 				private fb: FormBuilder,
 				private toaster: ToasterService,
 				private cdr: ChangeDetectorRef,
-				public app: AppComponent
+				public app: AppComponent,
+				public theme: ThemeService,
+				private _electronService: ElectronService
 				// private ledger: LedgerHWService
 	) {
+
+		this.ecc = this._electronService.remote.require('eosjs-ecc');
+		this.keytar = this._electronService.remote.require('keytar');
+		this.fs = this._electronService.remote.require('fs');
+
 		this.isValidAccount = true;
 		this.max = 100;
 		this.min = 0;
@@ -128,6 +161,7 @@ export class VoteComponent implements OnInit, AfterViewInit, OnDestroy {
 		this.stakerr = '';
 		this.fromAccount = '';
 		this.stakedisabled = true;
+		this.autoClaimStatus = false;
 		this.singleSelectionBP = {
 			name: ''
 		};
@@ -149,11 +183,12 @@ export class VoteComponent implements OnInit, AfterViewInit, OnDestroy {
 		}));
 
 		this.subscriptions.push(this.aService.selected.asObservable().subscribe((selected: any) => {
-			this.totalStaked = 0 ;
-			this.votedDecay = 0 ;
-			this.votedEOSDecay = 0 ;
-			if (selected && selected['name']) {
+			this.totalStaked = 0;
+			this.votedDecay = 0;
+			this.votedEOSDecay = 0;
+			if (selected && selected['name'] && this.selectedAccountName !== selected['name']) {
 				this.fromAccount = selected.name;
+				this.selectedAccountName = selected.name;
 				this.totalBalance = selected.full_balance;
 				this.stakedBalance = selected.staked;
 				this.unstaking = selected.unstaking;
@@ -173,25 +208,45 @@ export class VoteComponent implements OnInit, AfterViewInit, OnDestroy {
 				this.net_weight = selected.details.total_resources.net_weight;
 				const _cpu = RexComponent.asset2Float(this.cpu_weight);
 				const _net = RexComponent.asset2Float(this.net_weight);
+				this.cpu_weight_n = _cpu;
+				this.net_weight_n = _net;
 				this.stakingRatio = (_cpu / (_cpu + _net)) * 100;
 
 				if (selected.details.voter_info) {
+
+					let weeks = 52;
+					let block_timestamp_epoch = 946684800;
+					let precision = 10000;
+					if (this.aService.activeChain['symbol'] === 'WAX') {
+						weeks = 13;
+						block_timestamp_epoch = 946684800;
+						precision = 100000000;
+					}
+
+					if (this.aService.activeChain['symbol'] === 'LLC') {
+						precision = 100000000;
+					}
+
 					this.hasVote = true;
-					this.totalStaked = (selected.details.voter_info.staked / 10000);
-					const a = (moment().unix() - 946684800);
-					const b = parseInt('' + (a / 604800), 10) / 52;
-					const decayEOS = (selected.details.voter_info.last_vote_weight / Math.pow(2, b) / 10000);
+					this.totalStaked = (selected.details.voter_info.staked / precision);
+					const a = (moment().unix() - block_timestamp_epoch);
+					const b = parseInt('' + (a / 604800), 10) / weeks;
+					const decayEOS = (selected.details.voter_info.last_vote_weight / Math.pow(2, b) / precision);
 					this.votedEOSDecay = this.totalStaked - decayEOS;
-					if (selected.details.voter_info.last_vote_weight > 0){
-						this.votedDecay = 100 - Math.round(((decayEOS * 100 ) / this.totalStaked ) * 1000) / 1000;
+					if (selected.details.voter_info.last_vote_weight > 0) {
+						this.votedDecay = 100 - Math.round(((decayEOS * 100) / this.totalStaked) * 1000) / 1000;
 					}
 				} else {
 					this.hasVote = false;
 				}
 
-				this.eosjs.getRexData(selected.name).then(async (rexdata) => {
-					this.hasRex = !rexdata.rexbal;
-				});
+				this.getRexBalance(selected.name);
+
+				if (this.aService.activeChain.name === 'WAX MAINNET') {
+					this.checkWaxGBMdata(selected.name);
+					this.checkVoterRewards(selected.name);
+					this.verifyAutoClaimSetup(selected);
+				}
 			}
 		}));
 
@@ -273,6 +328,7 @@ export class VoteComponent implements OnInit, AfterViewInit, OnDestroy {
 			this.aService.selected.asObservable().subscribe((selected) => {
 				this.voteService.currentVoteType(selected);
 				this.voteOption(this.voteService.voteType);
+				this.cdr.detectChanges();
 			})
 		);
 	}
@@ -318,10 +374,10 @@ export class VoteComponent implements OnInit, AfterViewInit, OnDestroy {
 	callSetStake(password) {
 		this.busy = true;
 		const account = this.aService.selected.getValue();
-		const pubkey = account.details['permissions'][0]['required_auth'].keys[0].key;
+		const [pubkey, permission] = this.aService.getStoredKey(account);
 		this.crypto.authenticate(password, pubkey).then((data) => {
 			if (data === true) {
-				this.eos.changebw(account.name, this.stakingDiff, this.aService.activeChain['symbol'], this.stakingRatio / 100)
+				this.eos.changebw(account.name, permission, this.stakingDiff, this.aService.activeChain['symbol'], this.stakingRatio / 100, this.aService.activeChain['precision'])
 					.then((trx) => {
 						this.busy = false;
 						this.wrongpass = '';
@@ -364,25 +420,125 @@ export class VoteComponent implements OnInit, AfterViewInit, OnDestroy {
 		this.totalBalance = selectedAcc.full_balance;
 		this.stakedBalance = selectedAcc.staked;
 		if (selectedAcc.details.voter_info) {
+
+			let weeks = 52;
+			let block_timestamp_epoch = 946684800;
+			let precision = 10000;
+			if (this.aService.activeChain['symbol'] === 'WAX') {
+				weeks = 13;
+				block_timestamp_epoch = 946684800;
+				precision = 100000000;
+			}
+
+			if (this.aService.activeChain['symbol'] === 'LLC') {
+				precision = 100000000;
+			}
+
 			this.hasVote = true;
-			this.totalStaked = (selectedAcc.details.voter_info.staked / 10000);
-			const a = (moment().unix() - 946684800);
-			const b = parseInt('' + (a / 604800), 10) / 52;
-			const decayEOS = (selectedAcc.details.voter_info.last_vote_weight / Math.pow(2, b) / 10000);
+			this.totalStaked = (selectedAcc.details.voter_info.staked / precision);
+			const a = (moment().unix() - block_timestamp_epoch);
+			const b = parseInt('' + (a / 604800), 10) / weeks;
+			const decayEOS = (selectedAcc.details.voter_info.last_vote_weight / Math.pow(2, b) / precision);
 			this.votedEOSDecay = this.totalStaked - decayEOS;
-			if (selectedAcc.details.voter_info.last_vote_weight > 0){
-				this.votedDecay = 100 - Math.round(((decayEOS * 100 ) / this.totalStaked ) * 1000) / 1000;
+			if (selectedAcc.details.voter_info.last_vote_weight > 0) {
+				this.votedDecay = 100 - Math.round(((decayEOS * 100) / this.totalStaked) * 100000) / 100000;
 			}
 		} else {
 			this.hasVote = false;
 		}
 
-		this.eosjs.getRexData(selectedAcc.name).then(async (rexdata) => {
-			// console.log('REX DATA', rexdata.rexbal);
-			this.hasRex = !rexdata.rexbal;
+		this.getRexBalance(selectedAcc.name);
+	}
+
+	getRexBalance(acc) {
+		if (this.aService.activeChain.features['rex']) {
+			this.eosjs.getRexData(acc).then(async (rexdata) => {
+				this.hasRex = !rexdata.rexbal;
+			});
+		} else {
+			this.hasRex = false;
+		}
+	}
+
+	storeConfig() {
+		try {
+			const data = JSON.stringify(this.autoClaimConfig, null, '\t');
+			this.fs.writeFileSync('autoclaim.json', data);
+		} catch (e) {
+			console.log(e);
+		}
+	}
+
+	enableAutoClaimStartup() {
+		const AutoLaunch = this._electronService.remote.require('auto-launch');
+		const walletAutoLauncher = new AutoLaunch({
+			name: 'simpleos'
+		});
+		walletAutoLauncher.opts.appPath += '" --autostart"';
+		walletAutoLauncher.isEnabled().then((isEnabled) => {
+			if (isEnabled) {
+				return;
+			}
+			walletAutoLauncher.enable();
+		}).catch(function (err) {
+			console.log(err);
 		});
 	}
 
+	async verifyAutoClaimSetup(selected) {
+		this.autoClaimStatus = false;
+		this.claimSetupWarning = '';
+		const filename = 'autoclaim.json';
+		if (!this.fs.existsSync(filename)) {
+			console.log('autoclaim file not present, creating...');
+		} else {
+			this.autoClaimConfig = JSON.parse(this.fs.readFileSync('autoclaim.json'));
+		}
+		if (this.autoClaimConfig['enabled']) {
+			if (this.autoClaimConfig['WAX-GBM']) {
+				const accJob = this.autoClaimConfig['WAX-GBM']['jobs'].find(j => j.account === selected.name);
+				if (accJob) {
+					this.eosjs.rpc.get_account(selected.name).then(details => {
+						const perms = details.permissions;
+						const claim_perm = perms.find(p => p.perm_name === 'claim');
+						if (claim_perm) {
+							const claim_key = claim_perm.required_auth.keys[0].key;
+							this.keytar.getPassword('simpleos', claim_key).then((key) => {
+								try {
+									if (claim_key === this.ecc.privateToPublic(key)) {
+										this.checkLinkedAuth(selected.name).then((req_link) => {
+											if (req_link.length === 0) {
+												this.autoClaimStatus = true;
+												this.claimPublicKey = claim_key;
+											} else {
+												console.log('Missing link auth');
+												this.claimSetupWarning = 'Linkauth missing for (' + req_link.join(', ') + '). Please renew your claim key or set the permission links manually.';
+											}
+										});
+									} else {
+										console.log('FATAL: Invalid key');
+									}
+								} catch (e) {
+									console.log('Key verification failed');
+								}
+							}).catch((error) => {
+								console.log(error);
+							});
+						} else {
+							console.log('Claim permission not defined');
+							this.claimSetupWarning = 'Claim permission not defined. Please try renewing your key.';
+						}
+					});
+				}
+			}
+		} else {
+			console.log('autoclaim disabled');
+			this.enableAutoClaimStartup();
+			this.autoClaimConfig['enabled'] = true;
+			this.storeConfig();
+		}
+	}
+
 
 	//
 	// getMyVote(account){
@@ -396,7 +552,9 @@ export class VoteComponent implements OnInit, AfterViewInit, OnDestroy {
 	getProxyVotes(account) {
 		this.listProxyVote = [];
 		this.eos.getAccountInfo(account).then(v => {
-			this.listProxyVote = v['voter_info']['producers'];
+			if (v['voter_info']) {
+				this.listProxyVote = v['voter_info']['producers'];
+			}
 		});
 	}
 
@@ -545,17 +703,16 @@ export class VoteComponent implements OnInit, AfterViewInit, OnDestroy {
 	modalVote(pass) {
 		this.busy = true;
 		const voter = this.aService.selected.getValue();
-		const publicKey = voter.details['permissions'][0]['required_auth'].keys[0].key;
+		const [publicKey, permission] = this.aService.getStoredKey(voter);
 		this.crypto.authenticate(pass, publicKey).then((data) => {
 			if (data === true) {
-				// this.aService.injectLedgerSigner();
-				this.eos.voteAction(voter.name, this.selectedVotes, this.voteService.voteType).then((result) => {
+				this.eos.voteAction(voter.name, this.selectedVotes, this.voteService.voteType, permission).then((result) => {
 					if (JSON.parse(result).code) {
-						// if (err2.error.code === 3081001) {
-						this.wrongpass = JSON.parse(result).error.details[0].message;
-						// } else {
-						//   this.wrongpass = err2.error['what'];
-						// }
+						if (JSON.parse(result).error.details.length > 0) {
+							this.wrongpass = JSON.parse(result).error.details[0].message;
+						} else {
+							this.wrongpass = JSON.parse(result).error.what;
+						}
 						this.busy = false;
 					} else {
 						this.wrongpass = '';
@@ -680,5 +837,332 @@ export class VoteComponent implements OnInit, AfterViewInit, OnDestroy {
 		});
 	}
 
+	async checkLinkedAuth(account): Promise<string[]> {
+		const result = await this.http.get(this.aService.activeChain.historyApi + '/history/get_actions?account=' + account + '&filter=eosio:linkauth').toPromise();
+		const required = ['claimgbmvote', 'claimgenesis', 'voteproducer'];
+		if (result['actions'].length > 0) {
+			for (const a of result['actions']) {
+				const idx = required.indexOf(a['act']['data']['type']);
+				if (idx !== -1) {
+					required.splice(idx, 1);
+				}
+			}
+		}
+		return required;
+	}
+
+	claimGBMrewards() {
+		if (this.autoClaimStatus) {
+			this.claimDirect(false);
+		} else {
+			this.claimWithActive();
+		}
+	}
+
+	claimWithActive() {
+		const [auth, publicKey] = this.trxFactory.getAuth();
+		console.log(auth);
+		const sym = this.aService.activeChain['symbol'];
+		const messageHTML = `
+		<h5 class="white mb-0">Performing eosio::claimgenesis and eosio::claimgbmvote actions</h5>
+		`;
+		const _actions = [];
+		_actions.push({
+			account: 'eosio',
+			name: 'claimgenesis',
+			authorization: [{
+				actor: auth.actor,
+				permission: 'active',
+			}],
+			data: {
+				claimer: auth.actor
+			},
+		});
+		_actions.push({
+			account: 'eosio',
+			name: 'claimgbmvote',
+			authorization: [{
+				actor: auth.actor,
+				permission: 'active',
+			}],
+			data: {
+				owner: auth.actor
+			},
+		});
+		this.trxFactory.modalData.next({
+			transactionPayload: {
+				actions: _actions
+			},
+			termsHeader: '',
+			signerAccount: auth.actor,
+			signerPublicKey: publicKey,
+			labelHTML: messageHTML,
+			actionTitle: 'claim WAX GBM Rewards',
+			termsHTML: ''
+		});
+		this.trxFactory.launcher.emit(true);
+		const subs = this.trxFactory.status.subscribe((event) => {
+			if (event === 'done') {
+				subs.unsubscribe();
+			}
+			if (event === 'modal_closed') {
+				subs.unsubscribe();
+			}
+		});
+	}
+
+	async claimDirect(voteOnly) {
+		const [auth, publicKey] = this.trxFactory.getAuth();
 
+		// check current votes
+		const accountData = await this.eosjs.rpc.get_account(auth.actor);
+
+		let _producers = [];
+		let _proxy = '';
+
+		if (accountData['voter_info']) {
+			if (accountData['voter_info']['proxy'] !== '') {
+				// voting on proxy
+				_proxy = accountData['voter_info']['proxy'];
+			} else {
+				// voting on producers
+				_producers = accountData['voter_info']['producers'];
+			}
+		}
+
+		const claim_private_key = await this.keytar.getPassword('simpleos', this.claimPublicKey);
+		const signatureProvider = new JsSignatureProvider([claim_private_key]);
+		const rpc = this.eosjs.rpc;
+		const api = new Api({rpc, signatureProvider, textDecoder: new TextDecoder, textEncoder: new TextEncoder});
+
+		const _actions = [];
+
+		_actions.push({
+			account: 'eosio',
+			name: 'voteproducer',
+			authorization: [{
+				actor: auth.actor,
+				permission: 'claim',
+			}],
+			data: {
+				voter: auth.actor,
+				proxy: _proxy,
+				producers: _producers
+			},
+		});
+
+		if (!voteOnly) {
+			_actions.push({
+				account: 'eosio',
+				name: 'claimgenesis',
+				authorization: [{
+					actor: auth.actor,
+					permission: 'claim',
+				}],
+				data: {
+					claimer: auth.actor
+				},
+			});
+
+			_actions.push({
+				account: 'eosio',
+				name: 'claimgbmvote',
+				authorization: [{
+					actor: auth.actor,
+					permission: 'claim',
+				}],
+				data: {
+					owner: auth.actor
+				},
+			});
+		}
+
+		try {
+			const result = await api.transact({
+				actions: _actions
+			}, {
+				blocksBehind: 3,
+				expireSeconds: 30,
+			});
+			this.claimError = '';
+			if (voteOnly) {
+				this.showToast('success', 'Vote broadcasted', 'Check your history for confirmation.');
+			} else {
+				this.showToast('success', 'GBM Rewards Claimed', 'Check your history for confirmation.');
+			}
+		} catch (e) {
+			if (e instanceof RpcError) {
+				const eJson = e.json;
+				switch (eJson.error.code) {
+					case 3090005: {
+						this.claimError = 'Irrelevant authority included, missing linkauth';
+						break;
+					}
+					case 3050003: {
+						this.claimError = 'Account already claimed in the past 24 hours. Please wait.';
+						break;
+					}
+					default: {
+						this.claimError = eJson.error.what;
+					}
+				}
+				console.log(JSON.stringify(eJson, null, 2));
+			}
+		}
+	}
+
+
+	async createClaimPermission() {
+		const [auth, publicKey] = this.trxFactory.getAuth();
+		const sym = this.aService.activeChain['symbol'];
+		const messageHTML = `
+		<h5 class="white mb-0">
+		This action will create a custom permission that is only allowed to claim rewards (linked with eosio::claimgenesis).
+		<br><br> This permission will be automatically called once per day to claim your GBM rewards.
+		<br><br> You don't need to leave your wallet open, your computer just needs to be turned on.
+		<br><br>This action doesn't expose your private key.  </h5>
+		`;
+
+		console.log('Generating new key pair...');
+		const private_key = await this.ecc.randomKey();
+		const public_key = this.ecc.privateToPublic(private_key);
+
+		const _actions = [];
+		let changeKey = true;
+		if (auth.permission === 'active' || auth.permission === 'owner') {
+
+			_actions.push({
+				account: 'eosio',
+				name: 'updateauth',
+				authorization: [auth],
+				data: {
+					account: auth.actor,
+					permission: 'claim',
+					parent: 'active',
+					auth: {
+						threshold: 1,
+						keys: [{key: public_key, weight: 1}],
+						accounts: [],
+						waits: []
+					}
+				}
+			});
+		} else {
+			changeKey = false;
+		}
+
+		// Test linkauth
+		const req_link = await this.checkLinkedAuth(auth.actor);
+		console.log(req_link);
+
+		for (const link_type of req_link) {
+			_actions.push({
+				account: 'eosio',
+				name: 'linkauth',
+				authorization: [auth],
+				data: {
+					account: auth.actor,
+					code: 'eosio',
+					type: link_type,
+					requirement: 'claim'
+				}
+			});
+		}
+
+		console.log(_actions);
+
+		this.trxFactory.modalData.next({
+			transactionPayload: {
+				actions: _actions
+			},
+			termsHeader: '',
+			signerAccount: auth.actor,
+			signerPublicKey: publicKey,
+			labelHTML: messageHTML,
+			actionTitle: 'auto-claim setup',
+			termsHTML: ''
+		});
+		this.trxFactory.launcher.emit(true);
+		const subs = this.trxFactory.status.subscribe((event) => {
+			if (event === 'done') {
+				// Save private key to credential storage
+				if (!changeKey) {
+					this.keytar.setPassword('simpleos', publicKey, this.crypto.getPK());
+					this.claimPublicKey = publicKey;
+					this.configureAutoClaim(auth.actor, publicKey, 'claim');
+				} else {
+					this.keytar.setPassword('simpleos', public_key, private_key);
+					this.claimPublicKey = public_key;
+					this.configureAutoClaim(auth.actor, public_key, 'claim');
+				}
+				this.autoClaimStatus = true;
+				subs.unsubscribe();
+			}
+			if (event === 'modal_closed') {
+				subs.unsubscribe();
+			}
+		});
+	}
+
+	configureAutoClaim(accountName, publicKey, permission) {
+		if (!this.autoClaimConfig['WAX-GBM']) {
+			this.autoClaimConfig['WAX-GBM'] = {
+				apis: [
+					'https://wax.eosrio.io',
+					'https://api.waxsweden.org',
+					'https://chain.wax.io'
+				],
+				jobs: []
+			};
+		}
+		const newObj = {
+			'account': accountName,
+			'public_key': publicKey,
+			'permission': permission,
+			'last_claim': this.last_claim_time,
+			'total_rewards': 0,
+			'next_claim_time': this.last_claim_time + (24 * 60 * 60 * 1000)
+		};
+		const idx = this.autoClaimConfig['WAX-GBM']['jobs'].findIndex(j => j.account === accountName);
+		if (idx === -1) {
+			this.autoClaimConfig['WAX-GBM']['jobs'].push(newObj);
+		} else {
+			this.autoClaimConfig['WAX-GBM']['jobs'][idx] = newObj;
+		}
+		this.storeConfig();
+	}
+
+	private async checkVoterRewards(name: string) {
+		const voter = (await this.eosjs.rpc.get_account(name))['voter_info'];
+		const _gstate = (await this.eosjs.rpc.get_table_rows({
+			code: 'eosio',
+			scope: 'eosio',
+			table: 'global'
+		}))['rows'][0];
+		const voterBucket = parseFloat(_gstate['voters_bucket']) / 100000000;
+		const unpaidVoteShare = parseFloat(voter['unpaid_voteshare']);
+		const globalUnpaidVoteShare = parseFloat(_gstate['total_unpaid_voteshare']);
+		this.voteRewardsDaily = parseFloat((voterBucket * (unpaidVoteShare / globalUnpaidVoteShare)).toFixed(2));
+	}
+
+	private async checkWaxGBMdata(name: any) {
+		const results = await this.eosjs.rpc.get_table_rows({
+			json: true,
+			code: 'eosio',
+			table: 'genesis',
+			scope: name
+		});
+		const data = results.rows[0];
+		this.gbmBalance = parseFloat(data['balance'].split(' ')[0]);
+		this.gbmLastClaim = data['last_claim_time'];
+		this.last_claim_time = new Date(data['last_claim_time']).getTime();
+		this.gbmLastClaim = moment(this.gbmLastClaim).format('DD-MM-YYYY HH:mm');
+		if (this.gbmBalance > 0) {
+			this.gbmEstimatedDaily = parseFloat((this.gbmBalance / 1095).toFixed(2));
+		} else {
+			this.gbmEstimatedDaily = 0;
+		}
+		this.gbmNextClaim = moment(data['last_claim_time']).add(1, 'day').fromNow();
+		this.claimReady = ((new Date(data['last_claim_time']).getTime()) + (24 * 60 * 60 * 1000) === Date.now());
+	}
 }
diff --git a/src/app/dashboard/wallet/wallet.component.css b/src/app/dashboard/wallet/wallet.component.css
index 5e240f74..557331e2 100644
--- a/src/app/dashboard/wallet/wallet.component.css
+++ b/src/app/dashboard/wallet/wallet.component.css
@@ -180,7 +180,7 @@ li:last-child {
 
 .tr-canexpand:hover {
 	cursor: pointer;
-	background-color: var(--top-btn-backgorund);
+	background-color: var(--tr-hover) !important;
 	-webkit-transition-duration: 0.3s;
 	transition-duration: 0.3s;
 	-webkit-transition-property: background-color;
@@ -233,11 +233,6 @@ li:last-child {
 	margin-top: 10px;
 }
 
-/deep/ .segment-key {
-	color: #b7b7b7 !important;
-}
-
-
 .table-flex {
 	display: flex;
 	flex-grow: 1;
@@ -291,3 +286,7 @@ li:last-child {
 /deep/ .mat-calendar-body-selected {
 	background-color: #0094d2;
 }
+
+/deep/ .history-json .ngx-json-viewer {
+	font-family: Metropolis !important;
+}
diff --git a/src/app/dashboard/wallet/wallet.component.html b/src/app/dashboard/wallet/wallet.component.html
index dd6356ce..7abe71dc 100644
--- a/src/app/dashboard/wallet/wallet.component.html
+++ b/src/app/dashboard/wallet/wallet.component.html
@@ -4,97 +4,114 @@
 	<div class="clr-row flex-items-xs-between" style="height: 100%;">
 
 		<!--<div >-->
-			<div class="clr-col-md-10 text-center animate flex-column" style="padding: 39px; height: 100%" *ngIf="aService.selected.getValue().name">
-
-					<div>
-						<div class="balance">
-							BALANCE
-							<ng-container *ngIf="aService.activeChain.name === 'EOS MAINNET'">
-								${{(fullBalance) * aService.usd_rate | number: '1.2-2'}}
-							</ng-container>
-						</div>
-						<div class="eos special-font font-weight-bold">{{fullBalance | number: '1.2-4'}} {{aService.activeChain['symbol']}}</div>
-						<div class="infos">
+		<div class="clr-col-md-10 text-center animate flex-column" style="padding: 39px; height: 100%"
+			 *ngIf="aService.selected.getValue().name">
+
+			<div>
+				<div class="balance">
+					BALANCE
+					<ng-container *ngIf="aService.activeChain.name === 'EOS MAINNET'">
+						${{(fullBalance) * aService.usd_rate | number: '1.2-2'}}
+					</ng-container>
+				</div>
+				<div
+					class="eos special-font font-weight-bold">{{fullBalance | number: '1.0-' + aService.activeChain['precision']}} {{aService.activeChain['symbol']}}</div>
+				<div class="infos">
 							<span style="padding-right: 15px">
 							  <fa-icon
-								  [icon]="['far', 'lock']"></fa-icon>&nbsp;Staked <span class="special-font-regular">{{staked | number: '1.0-4'}} {{aService.activeChain['symbol']}}</span>
+								  [icon]="['far', 'lock']"></fa-icon>&nbsp;Staked <span
+								class="special-font-regular">{{staked | number: '1.0-' + aService.activeChain['precision']}} {{aService.activeChain['symbol']}}</span>
 							</span>
-								|
-								<span style="padding-left: 15px">
+					|
+					<span style="padding-left: 15px">
 							  <fa-icon
-								  [icon]="['far', 'lock-open']"></fa-icon>&nbsp;Unstaked <span  class="special-font-regular">{{unstaked | number: '1.0-4'}} {{aService.activeChain['symbol']}}</span>
-									<span *ngIf="unstaking > 0" style="color: #616161;">(+{{(unstaking) | number :'1.0-4'}} {{aService.activeChain['symbol']}} {{unstakeTime}})</span>
+								  [icon]="['far', 'lock-open']"></fa-icon>&nbsp;Unstaked <span
+						class="special-font-regular">{{unstaked | number: '1.0-' + aService.activeChain['precision']}} {{aService.activeChain['symbol']}}</span>
+									<span *ngIf="unstaking > 0"
+										  style="color: #616161;">(+{{(unstaking) | number :'1.0-' + aService.activeChain['precision']}} {{aService.activeChain['symbol']}} {{unstakeTime}}
+										)</span>
 							</span>
-						</div>
+				</div>
 
-						<div class="clr-row flex-items-xs-between" style="margin-top: 21px;">
-							<div class="clr-col-6">
-							<span style="width: 212px; float: left;">
-								<a class="blue btn btn-sm btn-link2" style="max-width: none;" (click)="openAccount()">
+				<div class="clr-row flex-items-xs-between" style="margin-top: 21px;">
+					<div class="clr-col-6">
+							<span style="width: 212px; float: left;"
+								  *ngIf="aService.activeChain['explorers'].length !== 0">
+								<a class="blue btn btn-sm btn-link" style="max-width: none;" (click)="openAccount()">
 									Open <strong style="color: #b0b0b7">{{aService.selected.getValue().name}}</strong> on a block explorer
 								</a>
 							</span>
-							</div>
-							<div class="clr-col-6">
+					</div>
+					<div class="clr-col-6">
 							<span (click)="refresh()" style="width: 100px; float: right">
-								<a class="blue btn btn-sm btn-link2" style="max-width: none;" (click)="refresh()">
+								<a class="blue btn btn-sm btn-link" style="max-width: none;" (click)="refresh()">
 									<fa-icon [icon]="['far', 'undo']"></fa-icon>
 									Refresh
 								</a>
 							</span>
-							</div>
-						</div>
+					</div>
+				</div>
 
-						<div class="clr-row" style="margin-bottom: 1px;">
-							<div class="clr-col-12">
-								<div class="card info-card">
-									<div class="card-block">
-										<form  [formGroup]="frmFilters" >
-										<div class="clr-row flex-items-xs-between">
-											<div class="clr-col-lg-3">
-												<mat-form-field class="action-selector example-full-width" style="width: 185px;">
-													<mat-select #selectAction formControlName="selectAction" [value]="''"
-																(selectionChange)="choosedAction($event.value);">
-														<fa-icon matSuffix [icon]="['fas', 'caret-down']"></fa-icon>
-														<mat-option *ngFor="let act of actionsFilter"
-																	[value]="act['filter']" class="action-selector-option">
-															{{act['name'] }}
-														</mat-option>
-													</mat-select>
-												</mat-form-field>
-											</div>
-											<div class="clr-col-lg-3">
-												<mat-form-field style="margin-top:8px;width: 150px;">
-													<input  matInput #startDate (focus)="myPicker.open()" formControlName="startDate" [matDatepicker]="myPicker" [min]="launchDate" [max]="maxDate" (dateChange)="choosedAfterDate($event.value)" placeholder="Choose a start date" >
-													<mat-datepicker-toggle  matSuffix [for]="myPicker"  style="color: #0095d3;"></mat-datepicker-toggle>
-													<mat-datepicker #myPicker disabled="false"></mat-datepicker>
-												</mat-form-field>
-
-											</div>
-											<div class="clr-col-lg-3">
-												<mat-form-field style="margin-top:8px;width: 150px;">
-													<input  matInput  #endDate (focus)="myPicker2.open()" formControlName="endDate" [matDatepicker]="myPicker2" [min]="minDate" (dateChange)="choosedBeforeDate($event.value)"  placeholder="Choose a end date" >
-													<mat-datepicker-toggle  matSuffix [for]="myPicker2" style="color: #0095d3;"></mat-datepicker-toggle>
-													<mat-datepicker #myPicker2  disabled="false"></mat-datepicker>
-												</mat-form-field>
-
-											</div>
-<!--											<div class="clr-col-lg-3">-->
-<!--												<mat-checkbox class="spam-checkbox" (change)="hideSpan()" ngDefaultControl>Hide spam</mat-checkbox>-->
-<!--											</div>-->
-<!--											<div class="clr-col-lg-3">-->
-<!--												<button class="btn btn-info-outline btn-sm" style="margin-right: 5px;margin-top: 20px;" (click)="clearFilter()">CLEAR FILTERS</button>-->
-<!--											</div>-->
+				<div class="clr-row" style="margin-bottom: 1px;">
+					<div class="clr-col-12">
+						<div class="card info-card" *ngIf="aService.activeChain['historyApi'] !==  ''">
+							<div class="card-block">
+								<form [formGroup]="frmFilters">
+									<div class="clr-row flex-items-xs-between">
+										<div class="clr-col-lg-3">
+											<mat-form-field class="action-selector example-full-width"
+															style="width: 185px;">
+												<mat-select #selectAction formControlName="selectAction" [value]="''"
+															(selectionChange)="choosedAction($event.value);">
+													<fa-icon matSuffix [icon]="['fas', 'caret-down']"></fa-icon>
+													<mat-option *ngFor="let act of actionsFilter"
+																[value]="act['filter']" class="action-selector-option">
+														{{act['name'] }}
+													</mat-option>
+												</mat-select>
+											</mat-form-field>
 										</div>
-										</form>
+										<div class="clr-col-lg-3">
+											<mat-form-field style="margin-top:8px;width: 150px;">
+												<input matInput #startDate (focus)="myPicker.open()"
+													   formControlName="startDate" [matDatepicker]="myPicker"
+													   [min]="launchDate" [max]="maxDate"
+													   (dateChange)="choosedAfterDate($event.value)"
+													   placeholder="Choose a start date">
+												<mat-datepicker-toggle matSuffix [for]="myPicker"
+																	   style="color: #0095d3;"></mat-datepicker-toggle>
+												<mat-datepicker #myPicker disabled="false"></mat-datepicker>
+											</mat-form-field>
+
+										</div>
+										<div class="clr-col-lg-3">
+											<mat-form-field style="margin-top:8px;width: 150px;">
+												<input matInput #endDate (focus)="myPicker2.open()"
+													   formControlName="endDate" [matDatepicker]="myPicker2"
+													   [min]="minDate" (dateChange)="choosedBeforeDate($event.value)"
+													   placeholder="Choose a end date">
+												<mat-datepicker-toggle matSuffix [for]="myPicker2"
+																	   style="color: #0095d3;"></mat-datepicker-toggle>
+												<mat-datepicker #myPicker2 disabled="false"></mat-datepicker>
+											</mat-form-field>
+
+										</div>
+										<!--											<div class="clr-col-lg-3">-->
+										<!--												<mat-checkbox class="spam-checkbox" (change)="hideSpan()" ngDefaultControl>Hide spam</mat-checkbox>-->
+										<!--											</div>-->
+										<!--											<div class="clr-col-lg-3">-->
+										<!--												<button class="btn btn-info-outline btn-sm" style="margin-right: 5px;margin-top: 20px;" (click)="clearFilter()">CLEAR FILTERS</button>-->
+										<!--											</div>-->
 									</div>
-								</div>
+								</form>
 							</div>
 						</div>
-
 					</div>
-					<!--</div>-->
-					<!--MAINTENANCE MODE--><!--
+				</div>
+
+			</div>
+			<!--</div>-->
+			<!--MAINTENANCE MODE--><!--
 				<ng-container *ngIf="aService.actions.length === 0 || aService.activeChain.name === 'EOS MAINNET'">
 					<div class="card info-card">
 						<div class="card-block text-center">
@@ -124,85 +141,88 @@ <h3 style="color: #acacac;">Meanwhile, please use a block explorer to check
 					</div>
 				</ng-container>
 				-->
-					<!--HISTORY TABLE-->
-					<div class="table-flex history-table"> <!-- || aService.activeChain.name === 'EOS MAINNET'">-->
-
-						<p-table #tableHistory [value]="aService.actions"
-								 [responsive]="true"
-								 [totalRecords]="aService.totalActions"
-								 dataKey="seq"
-								 class="overview-table flex-column"
-								 sortField="date"
-								 sortMode="single"
-								 [sortOrder]="-1"
-								 [rows]="12"
-								 [paginator]="true"
-								 rowExpandMode="single"
-								 (onPage)="loadActionsLazy($event)">
-							<ng-template pTemplate="header">
-								<tr>
-									<th style="width: 70px;">
-									</th>
-									<th>
-										amount
-									</th>
-									<th>
-
-									</th>
-									<th [pSortableColumn]="'date'">
-										date
-										<p-sortIcon [field]="'date'"></p-sortIcon>
-									</th>
-									<th style="width: 80px;">
-										status
-									</th>
-									<th style="width: 60px;">
-
-									</th>
-								</tr>
-							</ng-template>
-							<ng-template pTemplate="body" let-item let-expanded="expanded">
-
-								<tr [pSelectableRow]="item" [pRowToggler]="item" class="tr-canexpand {{expanded?' expandRow ':''}}"
-									 *ngIf="!item.dup">
-
-									<td class="text-center" style="width: 50px;">
-										<fa-icon *ngIf="item.type === 'received' && item.user !== item.contract"
-												 [icon]="['fal', 'arrow-alt-to-bottom']" size="lg"
-												 class="blue"></fa-icon>
-										<fa-icon *ngIf="item.type === 'received' && item.user === item.contract "
-												 [icon]="['far', 'parachute-box']" size="lg" class="blue"></fa-icon>
-										<fa-icon *ngIf="item.type === 'buyram' || item.type === 'sellram'"
-												 [icon]="['fal', 'memory']" class="blue"></fa-icon>
-										<fa-icon *ngIf="item.type === 'sent'" [icon]="['fal', 'paper-plane']"
-												 class="blue"></fa-icon>
-										<fa-icon
-											*ngIf="item.type === 'bytes_in' || item.type === 'bytes_out' || item.type === 'bytes_s'"
-											[icon]="['fas', 'th']" class="blue"></fa-icon>
-										<fa-icon *ngIf="item.type === 'unstaked_in' || item.type === 'unstaked_out' || item.type === 'mvfrsavings' || item.type === 'unstaketorex'"
-												 [icon]="['far', 'lock-open']" class="blue"></fa-icon>
-										<fa-icon *ngIf="item.type === 'staked_in' || item.type === 'staked_out' || item.type === 'mvtosavings'"
-												 [icon]="['far', 'lock']" class="blue"></fa-icon>
-										<fa-icon *ngIf="item.type === 'vote'" class="blue"
-												 [icon]="['far', 'edit']"></fa-icon>
-										<fa-icon *ngIf="item.type === 'other'||item.type === 'other2'" class="blue"
-												 [icon]="['far', 'receipt']"></fa-icon>
-										<fa-icon *ngIf="item.type === 'new'" class="blue"
-												 [icon]="['far', 'user']"></fa-icon>
-										<fa-icon *ngIf="item.type === 'rentcpu' || item.type === 'rentnet'" class="blue"
-												 [icon]="['far', 'hand-holding-usd']"></fa-icon>
-										<fa-icon *ngIf="item.type === 'refund'" class="blue"
-												 [icon]="['far', 'undo-alt']"></fa-icon>
-										<fa-icon *ngIf="item.type === 'withdraw' ||item.type === 'deposit'" class="blue"
-												 [icon]="['far', 'donate']"></fa-icon>
-										<fa-icon *ngIf="item.type === 'buyrex' || item.type === 'sellrex'" class="blue"
-												 [icon]="['far', 'exchange-alt']"></fa-icon>
-									</td>
-
-									<td class="text-center">
-
-										<!--TRANSFER-->
-										<ng-container *ngIf="item.action_name === 'transfer'">
+			<!--HISTORY TABLE-->
+			<div class="table-flex history-table"> <!-- || aService.activeChain.name === 'EOS MAINNET'">-->
+
+				<p-table #tableHistory [value]="aService.actions"
+						 [responsive]="true"
+						 [totalRecords]="aService.totalActions"
+						 dataKey="seq"
+						 class="overview-table flex-column"
+						 sortField="date"
+						 sortMode="single"
+						 [sortOrder]="-1"
+						 [rows]="12"
+						 [paginator]="true"
+						 rowExpandMode="single"
+						 (onPage)="loadActionsLazy($event)">
+					<ng-template pTemplate="header">
+						<tr>
+							<th style="width: 70px;">
+							</th>
+							<th>
+								amount
+							</th>
+							<th>
+
+							</th>
+							<th [pSortableColumn]="'date'">
+								date
+								<p-sortIcon [field]="'date'"></p-sortIcon>
+							</th>
+							<th style="width: 80px;">
+								status
+							</th>
+							<th style="width: 60px;">
+
+							</th>
+						</tr>
+					</ng-template>
+					<ng-template pTemplate="body" let-item let-expanded="expanded">
+
+						<tr [pSelectableRow]="item" [pRowToggler]="item"
+							class="tr-canexpand {{expanded?' expandRow ':''}}"
+							*ngIf="!item.dup">
+
+							<td class="text-center" style="width: 50px;">
+								<fa-icon *ngIf="item.type === 'received' && item.user !== item.contract"
+										 [icon]="['fal', 'arrow-alt-to-bottom']" size="lg"
+										 class="blue"></fa-icon>
+								<fa-icon *ngIf="item.type === 'received' && item.user === item.contract "
+										 [icon]="['far', 'parachute-box']" size="lg" class="blue"></fa-icon>
+								<fa-icon *ngIf="item.type === 'buyram' || item.type === 'sellram'"
+										 [icon]="['fal', 'memory']" class="blue"></fa-icon>
+								<fa-icon *ngIf="item.type === 'sent'" [icon]="['fal', 'paper-plane']"
+										 class="blue"></fa-icon>
+								<fa-icon
+									*ngIf="item.type === 'bytes_in' || item.type === 'bytes_out' || item.type === 'bytes_s'"
+									[icon]="['fas', 'th']" class="blue"></fa-icon>
+								<fa-icon
+									*ngIf="item.type === 'unstaked_in' || item.type === 'unstaked_out' || item.type === 'mvfrsavings' || item.type === 'unstaketorex'"
+									[icon]="['far', 'lock-open']" class="blue"></fa-icon>
+								<fa-icon
+									*ngIf="item.type === 'staked_in' || item.type === 'staked_out' || item.type === 'mvtosavings'"
+									[icon]="['far', 'lock']" class="blue"></fa-icon>
+								<fa-icon *ngIf="item.type === 'vote'" class="blue"
+										 [icon]="['far', 'edit']"></fa-icon>
+								<fa-icon *ngIf="item.type === 'other'||item.type === 'other2'" class="blue"
+										 [icon]="['far', 'receipt']"></fa-icon>
+								<fa-icon *ngIf="item.type === 'new'" class="blue"
+										 [icon]="['far', 'user']"></fa-icon>
+								<fa-icon *ngIf="item.type === 'rentcpu' || item.type === 'rentnet'" class="blue"
+										 [icon]="['far', 'hand-holding-usd']"></fa-icon>
+								<fa-icon *ngIf="item.type === 'refund'" class="blue"
+										 [icon]="['far', 'undo-alt']"></fa-icon>
+								<fa-icon *ngIf="item.type === 'withdraw' ||item.type === 'deposit'" class="blue"
+										 [icon]="['far', 'donate']"></fa-icon>
+								<fa-icon *ngIf="item.type === 'buyrex' || item.type === 'sellrex'" class="blue"
+										 [icon]="['far', 'exchange-alt']"></fa-icon>
+							</td>
+
+							<td class="text-center">
+
+								<!--TRANSFER-->
+								<ng-container *ngIf="item.action_name === 'transfer'">
 											<span class="white special-font-regular">
 												<span *ngIf="item.type === 'received'">+</span>
 												<span *ngIf="item.type === 'sent'">-</span>
@@ -210,55 +230,58 @@ <h3 style="color: #acacac;">Meanwhile, please use a block explorer to check
 												<span *ngIf="item.type === 'buyram'">-</span>
 												{{item.amount}} <span class="blue">{{item.symbol}}</span>
 											</span>
-											<ng-container *ngIf="item.symbol === aService.activeChain['symbol']">
-												<span *ngIf="aService.activeChain['name'] === 'EOS MAINNET'"> (${{item.amount * aService.usd_rate | number}})</span>
-											</ng-container>
-										</ng-container>
-
-										<!--BUYRAMBYTES-->
-										<ng-container *ngIf="item.action_name === 'buyrambytes'">
+									<ng-container *ngIf="item.symbol === aService.activeChain['symbol']">
+										<span
+											*ngIf="aService.activeChain['name'] === 'EOS MAINNET'"> (${{item.amount * aService.usd_rate | number}}
+											)</span>
+									</ng-container>
+								</ng-container>
+
+								<!--BUYRAMBYTES-->
+								<ng-container *ngIf="item.action_name === 'buyrambytes'">
 											<span class="white special-font-regular">
 												<span>+</span>
 												{{item.amount}} <span class="blue">{{item.symbol}}</span>
 											</span>
-										</ng-container>
+								</ng-container>
 
-										<!--SELLRAM-->
-										<ng-container *ngIf="item.action_name === 'sellram'">
+								<!--SELLRAM-->
+								<ng-container *ngIf="item.action_name === 'sellram'">
 											<span class="white special-font-regular">
 												<span>-</span>
 												{{item.amount}} <span class="blue">{{item.symbol}}</span>
 											</span>
-										</ng-container>
+								</ng-container>
 
-										<!--MVTOSAVINGS-->
-										<ng-container *ngIf="item.action_name === 'mvtosavings'">
+								<!--MVTOSAVINGS-->
+								<ng-container *ngIf="item.action_name === 'mvtosavings'">
 											<span class="white special-font-regular">
 												<span>+</span>
 												{{item.amount}} <span class="blue">{{item.symbol}}</span>
 											</span>
-										</ng-container>
+								</ng-container>
 
-										<!--MVFRSAVINGS-->
-										<ng-container *ngIf="item.action_name === 'mvfrsavings'">
+								<!--MVFRSAVINGS-->
+								<ng-container *ngIf="item.action_name === 'mvfrsavings'">
 											<span class="white special-font-regular">
 												<span>-</span>
 												{{item.amount}} <span class="blue">{{item.symbol}}</span>
 											</span>
-										</ng-container>
-
-										<!--VOTEPRODUCER-->
-										<ng-container *ngIf="item.action_name === 'voteproducer'">
-											<ng-container *ngIf="item.votedProducers.length > 0">
-												Voted on {{item.votedProducers.length}} BPs
-											</ng-container>
-											<ng-container *ngIf="item.votedProducers.length === 0 && item.proxy !== ''">
-												Proxied votes to <span class="blue">{{item.proxy}}</span>
-											</ng-container>
-										</ng-container>
-
-										<!--DELEGATEBW/UNDELEGATEBW-->
-										<ng-container *ngIf="item.action_name === 'undelegatebw' || item.action_name === 'delegatebw'">
+								</ng-container>
+
+								<!--VOTEPRODUCER-->
+								<ng-container *ngIf="item.action_name === 'voteproducer'">
+									<ng-container *ngIf="item.votedProducers.length > 0">
+										Voted on {{item.votedProducers.length}} BPs
+									</ng-container>
+									<ng-container *ngIf="item.votedProducers.length === 0 && item.proxy !== ''">
+										Proxied votes to <span class="blue">{{item.proxy}}</span>
+									</ng-container>
+								</ng-container>
+
+								<!--DELEGATEBW/UNDELEGATEBW-->
+								<ng-container
+									*ngIf="item.action_name === 'undelegatebw' || item.action_name === 'delegatebw'">
 											<span class="white special-font-regular">
 												<span *ngIf="item.type === 'staked_in'">-</span>
 												<span *ngIf="item.type === 'staked_out'">-</span>
@@ -270,13 +293,13 @@ <h3 style="color: #acacac;">Meanwhile, please use a block explorer to check
 												</span>
 											</span>
 
-											<span *ngIf="aService.activeChain['name'] === 'EOS MAINNET'">
+									<span *ngIf="aService.activeChain['name'] === 'EOS MAINNET'">
 												(${{item.amount * aService.usd_rate | number}})
 											</span>
-										</ng-container>
+								</ng-container>
 
-										<!--UNSTAKEDTOREX-->
-										<ng-container *ngIf="item.action_name === 'unstaketorex'">
+								<!--UNSTAKEDTOREX-->
+								<ng-container *ngIf="item.action_name === 'unstaketorex'">
 											<span class="white special-font-regular">
 												- {{item.amount}}
 												<span class="blue">
@@ -284,256 +307,261 @@ <h3 style="color: #acacac;">Meanwhile, please use a block explorer to check
 												</span>
 											</span>
 
-<!--											<span *ngIf="aService.activeChain['name'] === 'EOS MAINNET'">-->
-<!--												(${{item.amount * aService.usd_rate | number}})-->
-<!--											</span>-->
-										</ng-container>
+									<!--											<span *ngIf="aService.activeChain['name'] === 'EOS MAINNET'">-->
+									<!--												(${{item.amount * aService.usd_rate | number}})-->
+									<!--											</span>-->
+								</ng-container>
 
-										<!--BUYREX-->
-										<ng-container *ngIf="item.action_name === 'buyrex'">
+								<!--BUYREX-->
+								<ng-container *ngIf="item.action_name === 'buyrex'">
 											<span class="white special-font-regular">
 												<span>+</span>
-												{{item.amount}} <span class="blue">{{aService.activeChain['symbol']}}</span>
+												{{item.amount}} <span
+												class="blue">{{aService.activeChain['symbol']}}</span>
 											</span>
-										</ng-container>
+								</ng-container>
 
-										<!--DEPOSIT-->
-										<ng-container *ngIf="item.action_name === 'deposit'">
+								<!--DEPOSIT-->
+								<ng-container *ngIf="item.action_name === 'deposit'">
 											<span class="white special-font-regular">
 												<span>-</span>
-												{{item.amount}} <span class="blue">{{aService.activeChain['symbol']}}</span>
+												{{item.amount}} <span
+												class="blue">{{aService.activeChain['symbol']}}</span>
 											</span>
-										</ng-container>
+								</ng-container>
 
-										<!--WITHDRAW-->
-										<ng-container *ngIf="item.action_name === 'withdraw'">
+								<!--WITHDRAW-->
+								<ng-container *ngIf="item.action_name === 'withdraw'">
 											<span class="white special-font-regular">
 												<span>+</span>
-												{{item.amount}} <span class="blue">{{aService.activeChain['symbol']}}</span>
+												{{item.amount}} <span
+												class="blue">{{aService.activeChain['symbol']}}</span>
 										</span>
-										</ng-container>
+								</ng-container>
 
-										<!--SELLREX-->
-										<ng-container *ngIf="item.action_name === 'sellrex'">
+								<!--SELLREX-->
+								<ng-container *ngIf="item.action_name === 'sellrex'">
 											<span class="white special-font-regular">
 												<span>-</span>
 												{{item.amount}} <span class="blue">{{item.symbol}}</span>
 											</span>
-										</ng-container>
+								</ng-container>
 
-										<!--RENTCPU-->
-										<ng-container *ngIf="item.action_name === 'rentcpu'">
+								<!--RENTCPU-->
+								<ng-container *ngIf="item.action_name === 'rentcpu'">
 											<span class="white special-font-regular">
 												<span>-</span>
-												{{item.amount}} <span class="blue">{{aService.activeChain['symbol']}}</span>
+												{{item.amount}} <span
+												class="blue">{{aService.activeChain['symbol']}}</span>
 											</span>
-										</ng-container>
+								</ng-container>
 
-										<!--RENTCPU-->
-										<ng-container *ngIf="item.action_name === 'rentnet'">
+								<!--RENTCPU-->
+								<ng-container *ngIf="item.action_name === 'rentnet'">
 											<span class="white">
 												<span>-</span>
-												{{item.amount}} <span class="blue">{{aService.activeChain['symbol']}}</span>
+												{{item.amount}} <span
+												class="blue">{{aService.activeChain['symbol']}}</span>
 											</span>
-										</ng-container>
+								</ng-container>
 
-										<!--OTHERS-->
-										<ng-container *ngIf="item.type === 'new'">
-											Created account -
-											<span class="blue">{{item.user}}</span>
-										</ng-container>
+								<!--OTHERS-->
+								<ng-container *ngIf="item.type === 'new'">
+									Created account -
+									<span class="blue">{{item.user}}</span>
+								</ng-container>
 
-										<!--OTHERS-->
-										<ng-container *ngIf="!item.matched">
-											action: {{item.action_name}}
-										</ng-container>
-									</td>
+								<!--OTHERS-->
+								<ng-container *ngIf="!item.matched">
+									action: {{item.action_name}}
+								</ng-container>
+							</td>
 
-									<td class="text-center">
+							<td class="text-center">
 
-										<ng-container *ngIf="item.action_name === 'voteproducer'">
-											with {{item.voter}}
-										</ng-container>
+								<ng-container *ngIf="item.action_name === 'voteproducer'">
+									with {{item.voter}}
+								</ng-container>
 
-										<ng-container *ngIf="item.action_name === 'transfer'">
+								<ng-container *ngIf="item.action_name === 'transfer'">
 											<span *ngIf="item.type === 'received'">
 												from <span class="blue">{{item.user}}</span>
 											</span>
-											<span *ngIf="item.type === 'sent'">
+									<span *ngIf="item.type === 'sent'">
 												to <span class="blue">{{item.user}}</span>
 											</span>
-											<span *ngIf="item.type === 'buyram'" class="blue">bought RAM</span>
-											<span *ngIf="item.type === 'sellram'" class="blue">sold RAM</span>
-											<span *ngIf="item.type === 'buyrex'" class="blue">bought REX</span>
-											<span *ngIf="item.type === 'buyrex'" class="blue">sold REX</span>
-										</ng-container>
-
-										<span *ngIf="item.type === 'unstaked_in'" class="blue">UNSTAKED</span>
-										<span *ngIf="item.type === 'unstaked_out'">
+									<span *ngIf="item.type === 'buyram'" class="blue">bought RAM</span>
+									<span *ngIf="item.type === 'sellram'" class="blue">sold RAM</span>
+									<span *ngIf="item.type === 'buyrex'" class="blue">bought REX</span>
+									<span *ngIf="item.type === 'buyrex'" class="blue">sold REX</span>
+								</ng-container>
+
+								<span *ngIf="item.type === 'unstaked_in'" class="blue">UNSTAKED</span>
+								<span *ngIf="item.type === 'unstaked_out'">
 											<span class="blue">UNSTAKED</span>
 											from <span class="blue">{{item.user}}</span>
 										</span>
 
-										<span *ngIf="item.type === 'staked_in'" class="blue">STAKED</span>
-										<span *ngIf="item.type === 'staked_out'">
+								<span *ngIf="item.type === 'staked_in'" class="blue">STAKED</span>
+								<span *ngIf="item.type === 'staked_out'">
 											<span class="blue">STAKED</span>
 											to <span class="blue">{{item.user}}</span>
 										</span>
-										<span *ngIf="item.type === 'refund'">
+								<span *ngIf="item.type === 'refund'">
 											<span class="blue">REFUND</span>
 											to <span class="blue">this account</span>
 										</span>
 
-										<span *ngIf="item.type === 'mvtosavings'" class="blue">STAKED (Savings)</span>
-										<span *ngIf="item.type === 'mvfrsavings'" class="blue">UNSTAKED (Maturing)</span>
+								<span *ngIf="item.type === 'mvtosavings'" class="blue">STAKED (Savings)</span>
+								<span *ngIf="item.type === 'mvfrsavings'" class="blue">UNSTAKED (Maturing)</span>
 
-										<span *ngIf="item.type === 'unstaketorex'" class="blue">UNSTAKED (To REX)</span>
+								<span *ngIf="item.type === 'unstaketorex'" class="blue">UNSTAKED (To REX)</span>
 
-										<span *ngIf="item.type === 'buyrex'">
+								<span *ngIf="item.type === 'buyrex'">
 											<span class="blue">bought REX</span>
 											to <span class="blue">this account</span>
 										</span>
-										<span *ngIf="item.type === 'sellrex'">
+								<span *ngIf="item.type === 'sellrex'">
 											<span class="blue">sold REX</span>
 											from <span class="blue">this account</span>
 										</span>
 
-										<span *ngIf="item.type === 'deposit'">
+								<span *ngIf="item.type === 'deposit'">
 											<span class="blue">SEND TO REX</span>
 											from <span class="blue">this account</span>
 										</span>
 
-										<span *ngIf="item.type === 'withdraw'">
+								<span *ngIf="item.type === 'withdraw'">
 											<span class="blue">SEND FROM REX</span>
 											to <span class="blue">this account</span>
 										</span>
 
-										<span *ngIf="item.type === 'rentcpu'">
+								<span *ngIf="item.type === 'rentcpu'">
 											<span class="blue">rent CPU</span>
 											to <span class="blue">{{item.user}}</span>
 										</span>
 
-										<span *ngIf="item.type === 'rentnet'">
+								<span *ngIf="item.type === 'rentnet'">
 											<span class="blue">rent NET</span>
 											to <span class="blue">{{item.user}}</span>
 										</span>
 
 
-										<span *ngIf="item.type === 'bytes_in'">
+								<span *ngIf="item.type === 'bytes_in'">
 											<span class="blue">bought bytes</span>
 											to <span class="blue">this account</span>
 										</span>
-										<span *ngIf="item.type === 'bytes_out'">
+								<span *ngIf="item.type === 'bytes_out'">
 											<span class="blue">bought bytes</span>
 											to <span class="blue">{{item.user}}</span>
 										</span>
 
-										<span *ngIf="item.type === 'bytes_s'">
+								<span *ngIf="item.type === 'bytes_s'">
 											<span class="blue">sold bytes</span>
 											from <span class="blue">this account</span>
 										</span>
-										<span *ngIf="item.type === 'new'">
+								<span *ngIf="item.type === 'new'">
 											by {{memoCreatorAccName(item.memo)}}
 
 										</span>
-										<span *ngIf="item.type === 'other'||item.type === 'other2'">
+								<span *ngIf="item.type === 'other'||item.type === 'other2'">
 											<span class="blue">{{item.contract}}</span>-{{item.action_name}}
 										</span>
 
-										<ng-container *ngIf="!item.matched">
-											code: {{item.contract}}
-										</ng-container>
-									</td>
-
-									<!--td class="text-center"><time am-time-ago="item.date"></time> </td-->
-									<td class="text-center">{{moment.utc(item.date).fromNow()}}</td>
-
-									<td class="text-center" style="width: 90px;">
-										<fa-icon *ngIf="LIB >= item.block" [icon]="['far', 'check']" size="lg"
-												 class="blue"></fa-icon>
-										<fa-icon *ngIf="LIB < item.block" [icon]="['far', 'hourglass']"
-												 size="lg"></fa-icon>
-									</td>
-
-									<td class="text-right expandable" style="width: 35px;">
-<!--										<a  href="#" [pRowToggler]="item">-->
-											<fa-icon
-												[icon]="['fal', expanded ? 'chevron-circle-up' : 'chevron-circle-down']"
-												size="lg" class="blue">
-											</fa-icon>
-<!--										</a>-->
-									</td>
-
-								</tr>
-							</ng-template>
-							<ng-template pTemplate="rowexpansion" let-item>
-								<tr class="tr-expanded">
-									<td colspan="6" >
-										<div class="clr-row row-expanded">
-											<div class="clr-col-1">
-											</div>
-											<div class="col-11 text-left">
-												<div>
-													<span class="blue">Transaction ID: </span>
-													<a (click)="openTX(item.id)" pTooltip="Open on explorer"
-													   style="cursor: pointer;">
-														{{item.id}}
-													</a>
-												</div>
-												<div class="col-8 text-left" style="overflow-x: auto;">
-													<ng-container *ngIf="item.action_name === 'voteproducer'">
-														<ng-container *ngIf="item.votedProducers.length > 0">
-															<span class="blue">Producers: </span>
-															<ng-container
-																*ngFor="let p of item.votedProducers; let i = index">
-																<a style="cursor: pointer;"
-																   (click)="openAccount(p)">{{p}}</a>
-																<span>{{i < item.votedProducers.length - 1 ? ', ' : ''}}</span>
-															</ng-container>
-
-														</ng-container>
-														<ng-container
-															*ngIf="item.votedProducers.length === 0 && item.proxy !== ''">
-															<span class="blue">Proxy: </span>
-															<a pTooltip="Open account on explorer"
-															   style="cursor: pointer;"
-															   (click)="openAccount(item.proxy)">{{item.proxy}}</a>
-														</ng-container>
+								<ng-container *ngIf="!item.matched">
+									code: {{item.contract}}
+								</ng-container>
+							</td>
+
+							<!--td class="text-center"><time am-time-ago="item.date"></time> </td-->
+							<td class="text-center">{{moment.utc(item.date).fromNow()}}</td>
+
+							<td class="text-center" style="width: 90px;">
+								<fa-icon *ngIf="LIB >= item.block" [icon]="['far', 'check']" size="lg"
+										 class="blue"></fa-icon>
+								<fa-icon *ngIf="LIB < item.block" [icon]="['far', 'hourglass']"
+										 size="lg"></fa-icon>
+							</td>
+
+							<td class="text-right expandable" style="width: 35px;">
+								<!--										<a  href="#" [pRowToggler]="item">-->
+								<fa-icon
+									[icon]="['fal', expanded ? 'chevron-circle-up' : 'chevron-circle-down']"
+									size="lg" class="blue">
+								</fa-icon>
+								<!--										</a>-->
+							</td>
+
+						</tr>
+					</ng-template>
+					<ng-template pTemplate="rowexpansion" let-item>
+						<tr class="tr-expanded">
+							<td colspan="6">
+								<div class="clr-row row-expanded">
+									<div class="clr-col-1">
+									</div>
+									<div class="col-11 text-left">
+										<div>
+											<span class="blue">Transaction ID: </span>
+											<a (click)="openTX(item.id)" pTooltip="Open on explorer"
+											   style="cursor: pointer;">
+												{{item.id}}
+											</a>
+										</div>
+										<div class="col-8 text-left" style="overflow-x: auto;">
+											<ng-container *ngIf="item.action_name === 'voteproducer'">
+												<ng-container *ngIf="item.votedProducers.length > 0">
+													<span class="blue">Producers: </span>
+													<ng-container
+														*ngFor="let p of item.votedProducers; let i = index">
+														<a style="cursor: pointer;"
+														   (click)="openAccount(p)">{{p}}</a>
+														<span>{{i < item.votedProducers.length - 1 ? ', ' : ''}}</span>
 													</ng-container>
-<!--													<ng-container-->
-<!--														*ngIf="item.action_name === 'transfer'||item.type === 'other2'">-->
-<!--														<span class="blue">Memo: </span>{{item.memo}}-->
-<!--													</ng-container>-->
-												</div>
-												<div>
+
+												</ng-container>
+												<ng-container
+													*ngIf="item.votedProducers.length === 0 && item.proxy !== ''">
+													<span class="blue">Proxy: </span>
+													<a pTooltip="Open account on explorer"
+													   style="cursor: pointer;"
+													   (click)="openAccount(item.proxy)">{{item.proxy}}</a>
+												</ng-container>
+											</ng-container>
+											<!--													<ng-container-->
+											<!--														*ngIf="item.action_name === 'transfer'||item.type === 'other2'">-->
+											<!--														<span class="blue">Memo: </span>{{item.memo}}-->
+											<!--													</ng-container>-->
+										</div>
+										<div>
 													<span class="blue">
 														Date:
 													</span>
-													{{moment.utc(item.date).format('DD/MM/YYYY H:mm:ss')}}(UTC)
-												</div>
-												<div *ngIf="!item.matched||item.type === 'new'">
+											{{moment.utc(item.date).format('DD/MM/YYYY H:mm:ss')}}(UTC)
+										</div>
+										<div *ngIf="!item.matched||item.type === 'new'">
 													<span class="blue">
 														Action Data (JSON):
 													</span>
-													<ngx-json-viewer width="300" [json]="item.json_data"
-																	 [expanded]="false"></ngx-json-viewer>
-												</div>
-											</div>
+											<ngx-json-viewer width="300" [json]="item.json_data"
+															 [expanded]="false" class="history-json"></ngx-json-viewer>
 										</div>
-									</td>
-								</tr>
-							</ng-template>
-							<ng-template pTemplate="emptymessage" let-columns>
-								<tr>
-									<td [attr.colspan]="6">
-										No records found
-									</td>
-								</tr>
-							</ng-template>
-						</p-table>
+									</div>
+								</div>
+							</td>
+						</tr>
+					</ng-template>
+					<ng-template pTemplate="emptymessage" let-columns>
+						<tr>
+							<td [attr.colspan]="6">
+								No records found
+							</td>
+						</tr>
+					</ng-template>
+				</p-table>
 
 
-					</div>
+			</div>
 		</div>
 
 		<div class="col-md-2 tokens-panel" style="height: 100%;">
@@ -543,7 +571,7 @@ <h3 style="color: #acacac;">Meanwhile, please use a block explorer to check
 					<ng-container *ngIf="aService.totalAssetsSum !== 0">
 						<div *ngIf="aService.activeChain.name === 'EOS MAINNET'" style="font-size: 16px;">Total:
 							${{ (aService.totalAssetsSum) + (fullBalance * aService.usd_rate) | number:
-								'1.2-2'}}
+                                '1.2-2'}}
 						</div>
 						<div *ngIf="aService.activeChain.name !== 'EOS MAINNET'" style="font-size: 16px;">Total:
 							{{ fullBalance | number: '1.2-2'}}
@@ -577,8 +605,9 @@ <h5 class="mt-0" style="color:var(--token-title-color);">{{aService.activeChain[
               </span>
 					</li>
 					<li *ngFor="let token of aService.tokens" class="tokens-pad">
-						<h5 class="mt-0" style="color:var(--token-title-color);" pTooltip="Contract: {{token.contract}}">{{token.name}}</h5>
-						<div class="destaque-color-token" >{{token.balance}}</div>
+						<h5 class="mt-0" style="color:var(--token-title-color);"
+							pTooltip="Contract: {{token.contract}}">{{token.name}}</h5>
+						<div class="destaque-color-token">{{token.balance}}</div>
 						<ng-container *ngIf="token.balance">
               <span *ngIf="token.price !== null" style="color: var(--token-price-color);">
                 ${{(token.balance * token.price) | number:'1.2-2'}} @{{token.price | number: '1.2-2'}}
diff --git a/src/app/dashboard/wallet/wallet.component.ts b/src/app/dashboard/wallet/wallet.component.ts
index 65875d07..a5332007 100644
--- a/src/app/dashboard/wallet/wallet.component.ts
+++ b/src/app/dashboard/wallet/wallet.component.ts
@@ -187,12 +187,10 @@ export class WalletComponent implements OnInit, AfterViewInit, OnDestroy {
 		this.selectedAccountSubscription = this.aService.selected.asObservable().subscribe((sel) => {
 			if (sel['name']) {
 				if (this.selectedAccountName !== sel['name']) {
-					console.log('account selected:', sel);
 					this.selectedAccountName = sel['name'];
 					this.fullBalance = sel.full_balance;
 					this.staked = sel.staked;
 					this.unstaking = sel.unstaking;
-					console.log(this.fullBalance, this.staked, this.unstaking);
 					this.unstaked = this.fullBalance - this.staked - this.unstaking;
 					this.unstakeTime = moment.utc(sel.unstakeTime).add(72, 'hours').fromNow();
 					this.tokens = [];
diff --git a/src/app/landing/landing.component.css b/src/app/landing/landing.component.css
index c0ee044c..5d9c4cee 100644
--- a/src/app/landing/landing.component.css
+++ b/src/app/landing/landing.component.css
@@ -8,7 +8,7 @@
 }
 
 .clicked:hover {
-	border-bottom: 1px solid #0079b8 !important;
+	border-bottom: 1px solid var(--text-blue-color) !important;
 }
 
 .clicked {
@@ -152,7 +152,7 @@
 }
 
 .bold {
-	color: lightgrey;
+	color: var(--text-gray3-color);
 	font-weight: 500;
 }
 
@@ -191,7 +191,6 @@
 
 .label-blue {
 	font-size: 14px;
-	color: #d3d3d3;
 	border-radius: 2px;
 	padding: 14px 0.5rem;
 }
@@ -280,7 +279,7 @@
 }
 
 /deep/ .chain-selector .mat-select-value {
-	color: #0094d2;
+	color: var(--text-blue-color);
 	font-family: Metropolis, "Avenir Next", "Helvetica Neue", Arial, sans-serif;
 	font-size: 21px;
 }
@@ -292,11 +291,11 @@
 }
 
 /deep/ .mat-select-panel {
-	background: #333333;
+	background: var(--info-card-background);
 }
 
 /deep/ .mat-primary .chain-option.mat-option.mat-selected:not(.mat-option-disabled) {
-	color: #0094d2;
+	color: var(--text-blue-color);
 }
 
 /deep/ .mat-select-arrow {
diff --git a/src/app/landing/landing.component.html b/src/app/landing/landing.component.html
index 78c40c7d..45e20a24 100644
--- a/src/app/landing/landing.component.html
+++ b/src/app/landing/landing.component.html
@@ -1,19 +1,22 @@
 <toaster-container [toasterconfig]="config"></toaster-container>
-<div class="wrap" style="height:-webkit-fill-available;overflow-y: scroll; width:100vw;">
+<div class="wrap" style="height:-webkit-fill-available; overflow-y: scroll; width:100vw;">
 	<!--<div class="container-fluid" style="width: 466px;">-->
 	<div class="container">
 		<div class="clr-row animate fadeInDown">
 			<div class="clr-col-md-6 text-center" style="width: 466px; margin: 0 auto;">
 				<div class="anim-logo">
-					<ng-container *ngIf="app.compilerVersion==='EOS MAINNET'">
+					<ng-container *ngIf="app.compilerVersion=='EOS MAINNET'">
 						<lottie-animation-view
 							[options]="lottieConfig"
 							[width]="300"
-							(animCreated)="handleAnimation($event)">
+							(animCreated)="handleAnimation($event)" class="display-animation">
 						</lottie-animation-view>
+						<img src="./assets/simpleos-logo-clara.svg" class="display-img" atl="Logo SimplEOS" height="230"
+							 style="margin: 64px auto 50px auto;"/>
 					</ng-container>
 					<ng-container *ngIf="app.compilerVersion!=='EOS MAINNET'">
-						<img src="../../assets/logos/liberland_logo.PNG" atl="Logo Liberland" height="210" style="margin: 50px auto;"/>
+						<img src="./assets/logos/liberland_logo.PNG" atl="Logo Liberland" height="210"
+							 style="margin: 50px auto;"/>
 					</ng-container>
 
 				</div>
@@ -31,7 +34,7 @@
 					<div class="error mt-2">Couldn't connect to the blockchain, check your internet connection and try
 						again
 					</div>
-					<button (click)="retryConn()" class="btn btn-link">
+					<button (click)="retryConn()" class="btn btn-link2">
 						<fa-icon [icon]="['far', 'undo']"></fa-icon>
 						&nbsp;RETRY
 					</button>
@@ -59,15 +62,18 @@
 
 					<div class="clr-col-md-12">
 						<div class="card info-card">
-							<div class="card-header title" [ngStyle]="{'display':(app.compilerVersion!=='EOS MAINNET'?'none':'inherit')}">
+							<div class="card-header title"
+								 [ngStyle]="{'display':(app.compilerVersion!=='EOS MAINNET'?'none':'inherit')}">
 								Connected to
 								<mat-form-field class="chain-selector example-full-width select-father"
-												style="width: 207px;">
+												style="width: 240px;">
 									<mat-select [value]="network.activeChain['id']"
 												(selectionChange)="changeChain($event)">
 										<!--<fa-icon matSuffix [icon]="['fas', 'caret-down']"></fa-icon>-->
 										<mat-option *ngFor="let chain of network.defaultChains" class="chain-option"
 													[value]="chain.id">
+											<img [src]="'./assets/chain-icons/' + chain.icon" width="28" height="28"
+												 class="chain-icon"/>
 											{{ chain.name }}
 										</mat-option>
 									</mat-select>
@@ -159,7 +165,7 @@
 							</button>
 						</div>
 						<ng-container *ngIf="checkerr === ''">
-							<div class="card-footer" *ngFor="let account of accounts">
+							<div class="card-footer black-white" *ngFor="let account of accounts">
                                 <span style="float: left;">Account:
 									<span class="blue">{{account.name}}</span>
 									- balance:
@@ -177,15 +183,18 @@
 					<div class="clr-row" style="justify-content: center;">
 						<div class="clr-col-md-12">
 							<div class="card info-card">
-								<div class="card-header title" [ngStyle]="{'display':(app.compilerVersion!=='EOS MAINNET'?'none':'inherit')}">
+								<div class="card-header title"
+									 [ngStyle]="{'display':(app.compilerVersion!=='EOS MAINNET'?'none':'inherit')}">
 									Connected to
 									<mat-form-field class="chain-selector example-full-width select-father"
-													style="width: 207px;">
+													style="width: 240px;">
 										<mat-select [value]="network.activeChain['id']"
 													(selectionChange)="changeChain($event)">
 											<!--<fa-icon matSuffix [icon]="['fas', 'caret-down']"></fa-icon>-->
 											<mat-option *ngFor="let chain of network.defaultChains" class="chain-option"
 														[value]="chain.id">
+												<img [src]="'./assets/chain-icons/' + chain.icon" width="28" height="28"
+													 class="chain-icon"/>
 												{{ chain.name }}
 											</mat-option>
 										</mat-select>
@@ -215,15 +224,17 @@
 					</div>
 					<br>
 				</ng-container>
-				<section class="placeholder border-r" style="margin-top:10px;" *ngIf="app.compilerVersion=='EOS MAINNET'">
-					<div class="credits">Made with
+				<section class="placeholder border-r" style="margin-top:10px;"
+						 *ngIf="app.compilerVersion=='EOS MAINNET'">
+					<div class="credits made-with-love">Made with
 						<fa-icon [icon]="['fas', 'heart']"></fa-icon>
-						by <a class="link-eosrio">EOS Rio</a>
+						by <span style="color: var(--btn-link2-color)">EOS Rio</span>
 					</div>
-					<div class="version">v{{aService.versionSys}}</div>
+					<div class="version made-with-love">v{{aService.versionSys}}</div>
 					<br>
 				</section>
-				<section class="placeholder border-r" style="margin-top:10px;" *ngIf="app.compilerVersion!=='EOS MAINNET'">
+				<section class="placeholder border-r" style="margin-top:10px;"
+						 *ngIf="app.compilerVersion!=='EOS MAINNET'">
 					<div class="credits">Powered by</div>
 					<div class="version">SimplEOS v{{aService.versionSys}}</div>
 					<br>
@@ -244,11 +255,11 @@
 	<clr-wizard-button [type]="'finish'">Finish</clr-wizard-button>
 
 	<clr-wizard-page [clrWizardPageNextDisabled]="!pvtform.valid"
-					 (clrWizardPageOnCommit)="verifyPrivateKey(pkField.value)"
+					 (clrWizardPageOnCommit)="verifyPrivateKey(pkField.value,true)"
 					 [clrWizardPagePreventDefault]="true"
 					 (clrWizardPageOnCancel)="doCancel()">
 		<ng-template clrPageTitle>Import Key</ng-template>
-		<h5 style="color: #a7a7a7;">Insert your existing <strong>ACTIVE</strong> private key below</h5>
+		<h5 class="black-white">Insert your existing private key below (ACTIVE key recommended)</h5>
 		<form [formGroup]="pvtform">
 			<mat-form-field class="mt-1" style="width: 100%;">
 				<input #pkField matInput type="password" formControlName="private_key"
@@ -269,11 +280,11 @@ <h5 style="color: #a7a7a7;">Insert your existing <strong>ACTIVE</strong> private
 			</mat-form-field>
 		</form>
 
-		<div *ngIf="importedAccounts.length > 0" style="color: #bebebe; margin-top: 10px">
+		<div *ngIf="importedAccounts.length > 0" style="margin-top: 10px" class="gray3">
 			Account<span *ngIf="importedAccounts.length > 1">s</span>
 		</div>
-		<div *ngFor="let importedAccount of importedAccounts">
-			<span class="label label-blue">{{importedAccount['account_name']}}</span>
+		<div *ngFor="let importedAccount of importedAccounts" class="gray3">
+			<span class="label label-blue">{{importedAccount['account_name']}}@{{importedAccount['permission']}}</span>
 		</div>
 	</clr-wizard-page>
 	<clr-wizard-page
@@ -284,7 +295,7 @@ <h5 style="color: #a7a7a7;">Insert your existing <strong>ACTIVE</strong> private
 		<ng-template clrPageTitle>Password</ng-template>
 
 		<form [formGroup]="passform">
-			<h5 style="color: #a7a7a7;">Define your password. This will be used to <strong>transactions
+			<h5 class="black-white">Define your password. This will be used to <strong>transactions
 				confirmations.</strong></h5>
 			<mat-form-field class="mt-1">
 				<input matInput #pass type="password" placeholder="Password" (blur)="passCompare()"
@@ -325,8 +336,8 @@ <h5 style="color: #a7a7a7;">Define your password. This will be used to <strong>t
 
 	<clr-wizard-page *ngIf="noPIN" (clrWizardPageOnCommit)="importCredentials()">
 		<ng-template clrPageTitle>Lockscreen</ng-template>
-		<h5 style="margin-bottom: 15px; color: #a7a7a7;">
-			<span style="color: #c3c3c3; font-weight: 700;">Lockscreen pin.</span>
+		<h5 style="margin-bottom: 15px;" class="black-white">
+			<span style="font-weight: 700;" class="blue">Lockscreen pin.</span>
 			Do you want to define a small privacy pin used to unlock the screen next time you enter SimplEOS?
 		</h5>
 		<h5 style="margin-bottom: 18px; color: #636363;">*This <span style="font-weight: 700;">does not</span> replace
@@ -357,7 +368,8 @@ <h5 style="margin-bottom: 18px; color: #636363;">*This <span style="font-weight:
 	<clr-wizard-button [type]="'finish'">Finish</clr-wizard-button>
 	<clr-wizard-page>
 		<ng-template clrPageTitle>Intro</ng-template>
-		<h5 class="mt-0" style="color: var(--text-white-color);"><strong>Recommended if you don't have any EOS account yet.</strong>
+		<h5 class="mt-0" style="color: var(--text-white-color);"><strong>Recommended if you don't have any EOS account
+			yet.</strong>
 		</h5>
 		<h5 style="color: #a7a7a7;">Create your eos account via a smart contract.</h5>
 		<h5 style="color: var(--text-white-color);"><strong>How does it work?</strong></h5>
@@ -445,17 +457,19 @@ <h5>Please enter your desired public keys or click the <span
 		<h5 style="color: #a9a9a9">In eos, creation of new accounts costs a small amount of eos to allocate the
 			necessary resources to the account.</h5>
 		<h5 style="color: #a9a9a9">The amount you will need to transfer will be as shown below:</h5>
-		<div style="color: white; margin-top: 15px"><strong>Amount to CPU:</strong><span class="blue"> 0.75 EOS</span>
+		<div class="black-white" style="margin-top: 15px"><strong>Amount to CPU:</strong><span
+			class="blue"> 0.75 EOS</span>
 		</div>
-		<div style="color: white;"><strong>Amount to NET:</strong><span class="blue"> 0.25 EOS</span></div>
-		<div style="color: white;"><strong>Amount of RAM:</strong><span style="color: #a9a9a9"> 4096 bytes</span>
+		<div class="black-white"><strong>Amount to NET:</strong><span class="blue"> 0.25 EOS</span></div>
+		<div class="black-white"><strong>Amount of RAM:</strong><span style="color: #a9a9a9"> 4096 bytes</span>
 			<span style="margin: 0 12px;">=</span>
 			<span class="blue">{{(ram.ramPriceEOS * (4096 / 1024)) * 1.05 | number: '1.0-4'}} EOS</span>
 		</div>
-		<div style="color: white;"><strong>Safety margin:</strong><span class="blue"> 0.25 EOS (in case RAM price changes)</span>
+		<div class="black-white"><strong>Safety margin:</strong><span
+			class="blue"> 0.25 EOS (in case RAM price changes)</span>
 		</div>
 		<div style="border-bottom: 1px solid #0079b8; margin: 10px 0;"></div>
-		<div style="color: white;"><strong>Total Amount:</strong><span
+		<div class="black-white"><strong>Total Amount:</strong><span
 			class="blue"> {{1.25 + (ram.ramPriceEOS * (4096 / 1024)) * 1.05 | number: '1.0-4'}} EOS</span></div>
 		<div style="margin-top: 5px; color: #a9a9a9;">*If you transfer more than this amount the difference will remain
 			as liquid tokens in your new account
@@ -521,7 +535,8 @@ <h5 style="border-top: 1px solid; padding-top: 14px;">If your exchange doesn't a
 		<ng-container *ngIf="relayMethod">
 
 
-			<h4 style="color: var(--text-white-color);">Some exchanges, like Binance, impose some limitations. But don't worry, we came
+			<h4 style="color: var(--text-white-color);">Some exchanges, like Binance, impose some limitations. But don't
+				worry, we came
 				up with a solution for those cases!</h4>
 			<h4 style="color: #a7a7a7;">Just follow the steps below:</h4>
 			<h5 style="color: #a7a7a7;"><span class="blue">1.</span> Log in to your exchange.</h5>
@@ -617,9 +632,9 @@ <h5 style="color: #a7a7a7;"><span class="blue">5.</span> After you make the tran
 		<ng-template clrPageTitle>New Keys</ng-template>
 		<h5 class="bold">We recommend you <span class="error">disconnet from the internet</span></h5>
 		<!--<h5>This will be your private keys. Please, <span class="bold">save them somewhere safe!</span></h5>-->
-		<h5>Please enter your desired public key or click the <span style="cursor:pointer;"
-																	class="blue"
-																	(click)="generateKeys()"> Generate Key Pair </span>
+		<h5 class="gray">Please enter your desired public key or click the <span style="cursor:pointer;"
+																				 class="blue"
+																				 (click)="generateKeys()"> Generate Key Pair </span>
 			button.</h5>
 		<mat-form-field class="mt-1" style="width: 470px">
 			<input matInput placeholder="Public key" [(ngModel)]="ownerpub2">
diff --git a/src/app/landing/landing.component.ts b/src/app/landing/landing.component.ts
index c1de23d0..f164b8a2 100644
--- a/src/app/landing/landing.component.ts
+++ b/src/app/landing/landing.component.ts
@@ -1,4 +1,4 @@
-import {Component, NgZone, OnInit, ViewChild, ElementRef} from '@angular/core';
+import {Component, NgZone, OnInit, ViewChild, ElementRef, OnDestroy} from '@angular/core';
 import {EOSJSService} from '../services/eosjs.service';
 import {FormBuilder, FormGroup, Validators} from '@angular/forms';
 import {AccountsService} from '../services/accounts.service';
@@ -11,15 +11,17 @@ import {RamService} from '../services/ram.service';
 import {HttpClient} from '@angular/common/http';
 import {VotingService} from '../services/voting.service';
 import {AppComponent} from '../app.component';
+import {ThemeService} from '../services/theme.service';
+import {Subscription} from 'rxjs';
 
 @Component({
 	selector: 'app-landing',
 	templateUrl: './landing.component.html',
 	styleUrls: ['./landing.component.css']
 })
-export class LandingComponent implements OnInit {
+export class LandingComponent implements OnInit, OnDestroy {
 
-	@ViewChild('wizardexists', {static: true}) exisitswizard: ClrWizard;
+	@ViewChild('wizardexists', {static: false}) exisitswizard: ClrWizard;
 	@ViewChild('wizardnew', {static: true}) wizardnew: ClrWizard;
 	@ViewChild('wizardkeys', {static: true}) wizardkeys: ClrWizard;
 	@ViewChild('customImportBK', {static: false}) customImportBK: ElementRef;
@@ -96,6 +98,8 @@ export class LandingComponent implements OnInit {
 	requestError = '';
 	noPIN = true;
 	apierror = '';
+	private subscriptions: Subscription[] = [];
+	private pvtImportReady: boolean;
 
 	static parseEOS(tk_string) {
 		if (tk_string.split(' ')[1] === 'EOS') {
@@ -135,7 +139,24 @@ export class LandingComponent implements OnInit {
 				private zone: NgZone,
 				public ram: RamService,
 				private http: HttpClient,
-				public app: AppComponent) {
+				public app: AppComponent,
+				private theme: ThemeService) {
+
+
+		switch (this.aService.activeChain.name) {
+			case 'WAX MAINNET': {
+				this.theme.waxTheme();
+				break;
+			}
+			case 'LIBERLAND TESTNET': {
+				this.theme.liberlandTheme();
+				break;
+			}
+			default: {
+				this.theme.defaultTheme();
+				console.log('default theme');
+			}
+		}
 
 		this.busy = true;
 		this.existingWallet = false;
@@ -178,6 +199,15 @@ export class LandingComponent implements OnInit {
 		this.pvtform = this.fb.group({
 			private_key: ['', Validators.required]
 		});
+
+		this.subscriptions.push(this.pvtform.get('private_key').valueChanges.subscribe((value) => {
+			if (value.length === 51) {
+				this.verifyPrivateKey(value, false);
+			} else {
+				this.pvtImportReady = false;
+			}
+		}));
+
 		this.passformexodus = this.fb.group({
 			matchingPassword: this.fb.group({
 				pass1: ['', [Validators.required, Validators.minLength(10)]],
@@ -235,18 +265,24 @@ export class LandingComponent implements OnInit {
 
 	ngOnInit() {
 		this.getCurrentEndpoint();
-		if(this.app.compilerVersion==='EOS MAINNET') {
-			setTimeout ( () => {
-				this.anim.pause ();
-			} , 10 );
-
-			setTimeout ( () => {
-				this.anim.play ();
-			} , 900 );
+		if (this.app.compilerVersion === 'EOS MAINNET') {
+			setTimeout(() => {
+				this.anim.pause();
+			}, 10);
+
+			setTimeout(() => {
+				this.anim.play();
+			}, 900);
 		}
 		this.checkPIN();
 	}
 
+	ngOnDestroy(): void {
+		this.subscriptions.forEach((s) => {
+			s.unsubscribe();
+		});
+	}
+
 
 	getCurrentEndpoint() {
 		if (this.network.activeChain.lastNode !== '') {
@@ -516,59 +552,76 @@ export class LandingComponent implements OnInit {
 		}
 	}
 
-	verifyPrivateKey(input) {
-		if (input !== '') {
-			console.log(input);
-			this.busyActivekey = true;
-			this.eos.checkPvtKey(input).then((results) => {
-				this.publicEOS = results.publicKey;
-				this.importedAccounts = [];
-				this.importedAccounts = [...results.foundAccounts];
-				this.importedAccounts.forEach((item) => {
-					if (item['refund_request']) {
-						const tempDate = item['refund_request']['request_time'] + '.000Z';
-						const refundTime = new Date(tempDate).getTime() + (72 * 60 * 60 * 1000);
-						const now = new Date().getTime();
-						if (now > refundTime) {
-							this.eos.claimRefunds(item.account_name, input).then((tx) => {
-								console.log(tx);
-							});
-						} else {
-							console.log('Refund not ready!');
-						}
-					}
-				});
-				this.pvtform.controls['private_key'].setErrors(null);
-				this.zone.run(() => {
-					this.exisitswizard.forceNext();
-					this.errormsg = '';
-					this.apierror = '';
-				});
-			}).catch((e) => {
-				this.zone.run(() => {
-					this.dropReady = true;
-					this.exodusValid = false;
-					this.pvtform.controls['private_key'].setErrors({'incorrect': true});
+	verifyPrivateKey(input, auto) {
+		if (this.pvtImportReady) {
+			this.zone.run(() => {
+				this.exisitswizard.forceNext();
+				this.errormsg = '';
+				this.apierror = '';
+			});
+		} else {
+			if (input !== '') {
+				this.busyActivekey = true;
+				this.eos.checkPvtKey(input).then((results) => {
+					this.publicEOS = results.publicKey;
 					this.importedAccounts = [];
-					if (e.message.includes('Invalid checksum')) {
-						this.errormsg = 'invalid private key';
-					}
-					if (e.message === 'no_account') {
-						this.errormsg = 'No account associated with this private key';
-					}
-					if (e.message === 'non_active') {
-						this.errormsg = 'This is not the active key. Please import the active key.';
-					}
-					if (e.message === 'api_arror') {
-						this.apierror = 'API Unavailable, please try again with another endpoint.';
-					}
+					this.importedAccounts = [...results.foundAccounts];
+					this.importedAccounts.forEach((item) => {
+						console.log(item);
+						item['permission'] = item.permissions.find(p => {
+							return p.required_auth.keys[0].key === results.publicKey;
+						})['perm_name'];
+						if (item['refund_request']) {
+							const tempDate = item['refund_request']['request_time'] + '.000Z';
+							const refundTime = new Date(tempDate).getTime() + (72 * 60 * 60 * 1000);
+							const now = new Date().getTime();
+							if (now > refundTime) {
+								this.eos.claimRefunds(item.account_name, input, item['permission']).then((tx) => {
+									console.log(tx);
+								});
+							} else {
+								console.log('Refund not ready!');
+							}
+						}
+					});
+					this.pvtform.controls['private_key'].setErrors(null);
+					this.pvtImportReady = true;
+					this.zone.run(() => {
+						if (auto) {
+							this.exisitswizard.forceNext();
+						}
+						this.errormsg = '';
+						this.apierror = '';
+					});
+				}).catch((e) => {
+					this.pvtImportReady = false;
+					this.zone.run(() => {
+						this.dropReady = true;
+						this.exodusValid = false;
+						this.pvtform.controls['private_key'].setErrors({'incorrect': true});
+						this.importedAccounts = [];
+						if (e.message.includes('Invalid checksum')) {
+							this.errormsg = 'invalid private key';
+						}
+						if (e.message === 'no_account') {
+							this.errormsg = 'No account associated with this private key';
+						}
+						if (e.message === 'non_active') {
+							this.errormsg = 'This is not the active key. Please import the active key.';
+						}
+						if (e.message === 'api_arror') {
+							this.apierror = 'API Unavailable, please try again with another endpoint.';
+						}
+					});
 				});
-			});
+			}
 		}
 	}
 
 	doCancel(): void {
+		this.pvtform.reset();
 		this.exisitswizard.close();
+		this.exisitswizard.reset();
 	}
 
 	// Verify public key - step 1
@@ -705,9 +758,9 @@ export class LandingComponent implements OnInit {
 					newTxt += '<h5 class="text-muted2"><b>' + line.replace('###', '') + '</b></h5>';
 				} else if (line.substr(0, 2) === '##') {
 					newTxt += '<h4 class="blue"><b>' + line.replace('##', '') + '</b></h4>';
-				} else if (line.substr(0, 1) === '#' ) {
+				} else if (line.substr(0, 1) === '#') {
 					newTxt += '<h3 class="blue"><b>' + line.replace('#', '') + '</b></h3>';
-				} else if (line.substr(0, 3) === '---' || line.substr(0, 3) === '___' ) {
+				} else if (line.substr(0, 3) === '---' || line.substr(0, 3) === '___') {
 					newTxt += '<hr class="lineHR"/>';
 				} else if (line.match(/\(http(\w\S(.)*?)\)/g)) {
 
@@ -716,17 +769,17 @@ export class LandingComponent implements OnInit {
 					const linkImage = line.match(/(!\[.*?])+/g);
 
 					let newLine = line;
-					link.forEach ( (val , idx: number) => {
-						const newlink = val.replace ( '(' , '' ).replace ( ')' , '' );
+					link.forEach((val, idx: number) => {
+						const newlink = val.replace('(', '').replace(')', '');
 						let oldVal = val;
 						let newValName = newlink;
 						let repVal = '';
 
 						if (linkImage !== null) {
-							if (linkImage[ idx ] !== null && linkImage[ idx ] !== '![]') {
-								newValName = linkImage[ idx ].replace ( '![' , '' ).replace ( ']' , '' );
-								oldVal = linkImage[ idx ] + val;
-							} else if (linkImage[ idx ] !== null && linkImage[ idx ] === '![]') {
+							if (linkImage[idx] !== null && linkImage[idx] !== '![]') {
+								newValName = linkImage[idx].replace('![', '').replace(']', '');
+								oldVal = linkImage[idx] + val;
+							} else if (linkImage[idx] !== null && linkImage[idx] === '![]') {
 								newValName = '';
 								oldVal = '![]' + val;
 							} else {
@@ -737,10 +790,10 @@ export class LandingComponent implements OnInit {
 
 						} else {
 
-							if (linkName !== null && linkName[ idx ] !== '[]') {
-								newValName = linkName[ idx ].replace ( '[' , '' ).replace ( ']' , '' );
-								oldVal = linkName[ idx ] + val;
-							} else if (linkName !== null && linkName[ idx ] === '[]') {
+							if (linkName !== null && linkName[idx] !== '[]') {
+								newValName = linkName[idx].replace('[', '').replace(']', '');
+								oldVal = linkName[idx] + val;
+							} else if (linkName !== null && linkName[idx] === '[]') {
 								oldVal = '[]' + val;
 							} else {
 								oldVal = val;
@@ -749,12 +802,12 @@ export class LandingComponent implements OnInit {
 							repVal = '<span class="link-ref" ref-link="' + newlink + '" >' + newValName + '</span>';
 						}
 
-						newLine = newLine.replace ( oldVal , repVal );
-					} );
+						newLine = newLine.replace(oldVal, repVal);
+					});
 					newTxt += '<p class="' + color + '" >' + newLine + '</p>';
 
 				} else if (line.match(/`(.*?)`/g)) {
-					console.log()
+					console.log();
 					newTxt += '<p class="' + color + '" style="overflow-wrap: break-word;" >' + line + '</p>';
 				} else {
 					newTxt += '<p class="' + color + '" style="overflow-wrap: break-word;" >' + line + '</p>';
@@ -764,7 +817,7 @@ export class LandingComponent implements OnInit {
 		if (newTxt.match(/`(.*?)`+/g)) {
 			const strong = newTxt.match(/`(.*?)`+/g);
 			strong.forEach((val) => {
-				const newVal =  '<span class="white">' + val.replace( new RegExp(/`+/g, 'g') , '' ) + '</span> ';
+				const newVal = '<span class="white">' + val.replace(new RegExp(/`+/g, 'g'), '') + '</span> ';
 				newTxt = newTxt.replace(val, newVal);
 			});
 		}
diff --git a/src/app/lockscreen/lockscreen.component.css b/src/app/lockscreen/lockscreen.component.css
index 897bdac0..5ae776c2 100644
--- a/src/app/lockscreen/lockscreen.component.css
+++ b/src/app/lockscreen/lockscreen.component.css
@@ -21,11 +21,13 @@
 	margin-bottom: 10px;
 	font-weight: var(--special-font-weight);
 }
+
 .slogan {
     font-size: 20px;
     font-family: inherit;
 	margin-bottom: 10px;
 	letter-spacing: var(--special-font-spacing);
+	color: var(--slogan-special-color);
 }
 
 @-webkit-keyframes fadeInDown {
@@ -109,3 +111,7 @@
 .modal-body {
     overflow-y: hidden !important;
 }
+
+/*.logout-btn {*/
+/*	color: var(--text-destaque-color);*/
+/*}*/
diff --git a/src/app/lockscreen/lockscreen.component.html b/src/app/lockscreen/lockscreen.component.html
index d41bb373..e2d15717 100644
--- a/src/app/lockscreen/lockscreen.component.html
+++ b/src/app/lockscreen/lockscreen.component.html
@@ -8,11 +8,12 @@
 						<lottie-animation-view
 							[options]="lottieConfig"
 							[width]="300"
-							(animCreated)="handleAnimation($event)">
+							(animCreated)="handleAnimation($event)"  class="display-animation">
 						</lottie-animation-view>
+						<img src="./assets/simpleos-logo-clara.svg" class="display-img" atl="Logo SimplEOS" height="256" style="margin: 12px auto 50px auto;"/>
 					</ng-container>
 					<ng-container *ngIf="app.compilerVersion!=='EOS MAINNET'">
-						<img src="../../assets/logos/liberland_logo.PNG" atl="Logo Liberland" height="256" style="margin: 50px auto;"/>
+						<img src="./assets/logos/liberland_logo.PNG" atl="Logo Liberland" height="256" style="margin: 50px auto;"/>
 					</ng-container>
                 </div>
 				<div class="slogan" *ngIf="app.compilerVersion=='EOS MAINNET'">Your simple and secure EOS wallet</div>
@@ -42,18 +43,23 @@
                 </div>
 			</div>
 			<div class="clr-col-md-12 text-center">
-                <div>Forgot your pin?
-                    <a class="blue btn btn-sm btn-link" style="max-width: none;" (click)="logoutModal = true">
+                <div class="made-with-love" style="margin-top: 5px;">Forgot your pin?
+                    <a class="blue c btn-sm btn-link2" style="max-width: none; cursor: pointer;" (click)="logoutModal = true">
                         Clear all data and logout
                         <fa-icon [icon]="['far', 'sign-out-alt']"></fa-icon>
                     </a>
                 </div>
-				<section class="placeholder border-r" style="margin-top:10px;">
-					<div class="credits">Made with
+				<section class="placeholder border-r" style="margin-top:10px;" *ngIf="app.compilerVersion=='EOS MAINNET'">
+					<div class="credits made-with-love">Made with
 						<fa-icon [icon]="['fas', 'heart']"></fa-icon>
-						by <a class="link-eosrio">EOS Rio</a>
+						by <a style="color: var(--btn-link2-color)">EOS Rio</a>
 					</div>
-					<div class="version">v{{aService.versionSys}}</div>
+					<div class="version made-with-love">v{{aService.versionSys}}</div>
+					<br>
+				</section>
+				<section class="placeholder border-r" style="margin-top:10px;" *ngIf="app.compilerVersion!=='EOS MAINNET'">
+					<div class="credits">Powered by</div>
+					<div class="version">SimplEOS v{{aService.versionSys}}</div>
 					<br>
 				</section>
             </div>
diff --git a/src/app/services/accounts.service.ts b/src/app/services/accounts.service.ts
index 6f45cd3d..8c3600d8 100644
--- a/src/app/services/accounts.service.ts
+++ b/src/app/services/accounts.service.ts
@@ -87,6 +87,25 @@ export class AccountsService {
 		// }
 	}
 
+	getStoredKey(account) {
+		const store = localStorage.getItem('eos_keys.' + this.activeChain.id);
+		let key = '';
+		let _perm = '';
+		if (store) {
+			const keys = Object.keys(JSON.parse(store));
+			account.details.permissions.forEach((p) => {
+				if (p.required_auth.keys.length > 0) {
+					const _k = p.required_auth.keys[0].key;
+					if (keys.indexOf(_k) !== -1) {
+						key = _k;
+						_perm = p.perm_name;
+					}
+				}
+			});
+		}
+		return [key, _perm];
+	}
+
 	parseEOS(tk_string) {
 		if (tk_string.split(' ')[1] === this.activeChain['symbol']) {
 			return parseFloat(tk_string.split(' ')[0]);
@@ -175,10 +194,37 @@ export class AccountsService {
 				this.loadingTokens = false;
 				return this.accounts;
 			} else {
-				this.loading = false;
-				this.loadingTokens = false;
-				this.lastTkLoadTime = Date.now();
-				return null;
+				if (this.activeChain.historyApi !== '') {
+					// Load with hyperion
+					const data = await this.http.get(this.activeChain.historyApi + '/state/get_tokens?account=' + account).toPromise();
+					const tokens = data['tokens'];
+					for (const token of tokens) {
+						if (token.symbol !== this.activeChain['symbol']) {
+							token['balance'] = token['amount'];
+							token['usd_value'] = 0;
+							this.registerSymbol(token);
+						}
+					}
+					this.tokens.sort((a: any, b: any) => {
+						if (a.symbol < b.symbol) {
+							return -1;
+						}
+						if (a.symbol > b.symbol) {
+							return 1;
+						}
+						return 0;
+					});
+					this.lastTkLoadTime = Date.now();
+					this.loading = false;
+					this.accounts[this.selectedIdx]['tokens'] = this.tokens;
+					this.loadingTokens = false;
+					return this.accounts;
+				} else {
+					this.loading = false;
+					this.loadingTokens = false;
+					this.lastTkLoadTime = Date.now();
+					return null;
+				}
 			}
 		} else {
 			if (this.tokens.length > 0) {
@@ -393,7 +439,7 @@ export class AccountsService {
 			user: user,
 			block: block_num,
 			date: date,
-			amount: amount,
+			amount: (Math.round(amount * 10000) / 10000),
 			symbol: symbol,
 			memo: memo,
 			votedProducers: votedProducers,
@@ -445,6 +491,7 @@ export class AccountsService {
 				}
 			} else {
 				// Test API
+				this.getActions(account, nActions, 0);
 				console.log('Starting history api test');
 
 
@@ -453,28 +500,20 @@ export class AccountsService {
 	}
 
 	getActions(account, offset, pos, filter?, after?, before?, parent?) {
-		// filter = "eosio:buyrambytes";
 		this.actions = [];
 		this.totalActions = 0;
 		if (this.activeChain.historyApi !== '') {
-			console.log('Starting history api test V2');
-			// let url = this.activeChain.historyApi+'/get_actions?account='+account+'&limit='+offset+'&skip='+pos+'&parent=0';
 			let url = this.activeChain.historyApi + '/history/get_actions?account=' + account + '&limit=' + offset + '&skip=' + pos;
 			url = url + (filter !== '' && filter !== undefined ? filter : '');
 			url = url + (after !== '' && after !== undefined ? '&after=' + after : '');
 			url = url + (before !== '' && before !== undefined ? '&before=' + before : '');
 			url = url + (parent !== '' && parent !== undefined ? '&parent=' + parent : '');
-
-			// console.log(url);
-
-
 			this.http.get(url).subscribe((result) => {
 				if (result['actions']) {
 					if (result['actions'].length > 0) {
 						this.actionStore[account]['actions'] = result['actions'];
 						const payload = JSON.stringify(this.actionStore);
 						localStorage.setItem('actionStore.' + this.activeChain['id'], payload);
-
 						this.actionStore[account]['actions'].forEach((action) => {
 							const act = action['act'];
 							const tx_id = action['trx_id'];
@@ -483,19 +522,13 @@ export class AccountsService {
 							const seq = action['global_sequence'];
 							this.processAction(act, tx_id, blk_num, blk_time, seq);
 						});
-
-						// console.log(this.actions);
-
 						this.totalActions = result['total']['value'];
-
 						this.accounts[this.selectedIdx]['actions'] = this.actions;
 						this.calcTotalAssets();
-
 					} else {
 						this.actionStore[account]['actions'] = {};
 						this.actions = [];
 					}
-
 				} else {
 					console.log('empty result history!');
 					this.actions = [];
@@ -503,11 +536,10 @@ export class AccountsService {
 				}
 			}, (err) => {
 				console.log(err);
-
 			});
 		} else {
 			this.eos.getAccountActions(account, offset, pos).then(val => {
-				// console.log(val);
+				console.log(val);
 				const actions = val['actions'];
 				if (actions.length > 0) {
 					this.actionStore[account]['actions'] = actions;
diff --git a/src/app/services/crypto.service.ts b/src/app/services/crypto.service.ts
index 4d9ac2c6..aa5af495 100644
--- a/src/app/services/crypto.service.ts
+++ b/src/app/services/crypto.service.ts
@@ -214,6 +214,10 @@ export class CryptoService {
 		}
 	}
 
+	getPK() {
+		return this.eosjs.baseConfig.keyProvider;
+	}
+
 	async storeLedgerAccount(pbk: string, slotNumber: number): Promise<void> {
 		let store = {};
 		const oldData = JSON.parse(localStorage.getItem('eos_keys.' + this.eosjs.chainID));
diff --git a/src/app/services/eosjs.service.ts b/src/app/services/eosjs.service.ts
index 2165fb71..080237c9 100644
--- a/src/app/services/eosjs.service.ts
+++ b/src/app/services/eosjs.service.ts
@@ -3,6 +3,7 @@ import {Injectable} from '@angular/core';
 import * as EOSJS from '../../assets/eos.js';
 import {BehaviorSubject, Subject} from 'rxjs';
 
+
 @Injectable()
 export class EOSJSService {
 	eosio: any;
@@ -103,8 +104,8 @@ export class EOSJSService {
 	getKeyAccounts(pubkey: string): Promise<any> {
 		return new Promise((resolve2, reject2) => {
 			this.eos['getKeyAccounts']({
-					public_key: pubkey
-				}).then(data => {
+				public_key: pubkey
+			}).then(data => {
 				resolve2(data);
 				// console.log('ff',data);
 			}).catch(error => {
@@ -238,20 +239,23 @@ export class EOSJSService {
 		});
 	}
 
-	requestRefund(from: string) {
+	requestRefund(from: string, permission) {
 		// console.log(from, receiver, (net+' EOS'), (cpu+' EOS'));
-		return this.eos.refund(from);
+		const options = {authorization: from + '@' + permission};
+		return this.eos.refund(from, options);
 	}
 
-	unDelegate(from: string, receiver: string, net: string, cpu: string, symbol: string) {
+	unDelegate(from: string, receiver: string, net: string, cpu: string, symbol: string, permission) {
 		// console.log(from, receiver, (net+' EOS'), (cpu+' EOS'));
-		return this.eos.undelegatebw(from, receiver, (net + ' ' + symbol), (cpu + ' ' + symbol));
+		const options = {authorization: from + '@' + permission};
+		return this.eos.undelegatebw(from, receiver, (net + ' ' + symbol), (cpu + ' ' + symbol), options);
 	}
 
-	delegateBW(from: string, receiver: string, net: string, cpu: string, symbol: string) {
+	delegateBW(from: string, receiver: string, net: string, cpu: string, symbol: string, permission) {
 		// console.log(from, receiver, (net +' EOS'), (cpu +' EOS'));
+		const options = {authorization: from + '@' + permission};
 		return new Promise((resolve, reject) => {
-			this.eos.delegatebw(from, receiver, (net + ' ' + symbol), (cpu + ' ' + symbol), 0).then(data => {
+			this.eos.delegatebw(from, receiver, (net + ' ' + symbol), (cpu + ' ' + symbol), 0, options).then(data => {
 				resolve(data);
 			}).catch(err2 => {
 				reject(err2);
@@ -259,13 +263,13 @@ export class EOSJSService {
 		});
 	}
 
-	claimRefunds(account, k): Promise<any> {
+	claimRefunds(account, k, permission): Promise<any> {
 		this.baseConfig.keyProvider = [k];
 		const tempEos = EOSJS(this.baseConfig);
 		return tempEos['refund']({owner: account}, {
 			broadcast: true,
 			sign: true,
-			authorization: account + '@active'
+			authorization: account + '@' + permission
 		});
 	}
 
@@ -279,65 +283,20 @@ export class EOSJSService {
 				const tempAccData = [];
 				this.getKeyAccounts(pubkey).then((data) => {
 					console.log('load', data);
-					// if (data['account_names'].length > 0) {
-					if (data.length > 0) {
+					if (data['account_names'].length > 0) {
 						const promiseQueue = [];
-						// data['account_names'].forEach((acc) => {
-						data.forEach((acc) => {
+						data['account_names'].forEach((acc) => {
 							const tempPromise = new Promise((resolve1, reject1) => {
-								// this.getAccountInfo(acc).then((acc_data) => {
-								this.getAccountInfo(acc.account).then((acc_data) => {
-									console.log('eeee1.4');
+								this.getAccountInfo(acc).then((acc_data) => {
 									tempAccData.push(acc_data);
-									// if (acc_data.permissions[0]['required_auth']['keys'][0].key === pubkey) {
 									this.getTokens(acc_data['account_name']).then((tokens) => {
 										acc_data['tokens'] = tokens;
 										this.accounts[acc] = acc_data;
-										tempAccData.push(acc_data);
 										resolve1(acc_data);
 									}).catch((err) => {
 										console.log(err);
 										reject1();
 									});
-									// } else {
-									//   reject1();
-									// }
-								});
-							});
-							promiseQueue.push(tempPromise);
-						});
-						Promise.all(promiseQueue).then((results) => {
-							resolve({
-								foundAccounts: results,
-								publicKey: pubkey
-							});
-						}).catch(() => {
-							console.log(data);
-							reject2({
-								message: 'non_active',
-								accounts: data
-							});
-						});
-					} else if (data['account_names'].length > 0) {
-						const promiseQueue = [];
-						data['account_names'].forEach((acc) => {
-							// data.forEach((acc) => {
-							const tempPromise = new Promise((resolve1, reject1) => {
-								this.getAccountInfo(acc).then((acc_data) => {
-									tempAccData.push(acc_data);
-									// console.log(acc_data.permissions[0]['required_auth']['keys'][0].key);
-									if (acc_data.permissions[0]['required_auth']['keys'][0].key === pubkey) {
-										this.getTokens(acc_data['account_name']).then((tokens) => {
-											acc_data['tokens'] = tokens;
-											this.accounts[acc] = acc_data;
-											resolve1(acc_data);
-										}).catch((err) => {
-											console.log(err);
-											reject1();
-										});
-									} else {
-										reject1();
-									}
 								});
 							});
 							promiseQueue.push(tempPromise);
@@ -412,8 +371,8 @@ export class EOSJSService {
 		return this.eos['getAbi'](contract);
 	}
 
-	pushActionContract(contract, action, form, account) {
-		const options = {authorization: account + '@active'};
+	pushActionContract(contract, action, form, account, permission) {
+		const options = {authorization: account + '@' + permission};
 
 		console.log(JSON.stringify(form));
 		return new Promise((resolve, reject2) => {
@@ -440,12 +399,12 @@ export class EOSJSService {
 		localStorage.setItem('simpleos.txhistory.' + this.chainID, payload);
 	}
 
-	async transfer(contract, from, to, amount, memo): Promise<any> {
+	async transfer(contract, from, to, amount, memo, permission): Promise<any> {
 		if (this.auth) {
+			const options = {authorization: from + '@' + permission};
 			if (contract === 'eosio.token') {
 				return new Promise((resolve, reject) => {
-					this.eos['transfer'](from, to, amount, memo, (err) => {
-						// console.log(err, trx);
+					this.eos['transfer'](from, to, amount, memo, options, (err) => {
 						if (err) {
 							reject(JSON.parse(err));
 						} else {
@@ -458,9 +417,7 @@ export class EOSJSService {
 					this.eos['contract'](contract, (err, tokenContract) => {
 						if (!err) {
 							if (tokenContract['transfer']) {
-								const options = {authorization: from + '@active'};
 								tokenContract['transfer'](from, to, amount, memo, options, (err2) => {
-									// console.log(err, trx);
 									if (err2) {
 										reject(JSON.parse(err2));
 									} else {
@@ -492,30 +449,34 @@ export class EOSJSService {
 		}
 	}
 
-	ramBuyBytes(payer: string, receiver: string, bytes: string): Promise<any> {
-		return this.eos.buyrambytes(payer, receiver, parseInt(bytes, 10));
+	ramBuyBytes(payer: string, receiver: string, bytes: string, permission): Promise<any> {
+		const options = {authorization: payer + '@' + permission};
+		return this.eos.buyrambytes(payer, receiver, parseInt(bytes, 10), options);
 	}
 
-	ramBuyEOS(payer: string, receiver: string, quant: number, symbol: string): Promise<any> {
-		return this.eos.buyram(payer, receiver, quant.toFixed(4) + ' ' + symbol);
+	ramBuyEOS(payer: string, receiver: string, quant: number, symbol: string, permission): Promise<any> {
+		const options = {authorization: payer + '@' + permission};
+		return this.eos.buyram(payer, receiver, quant.toFixed(4) + ' ' + symbol, options);
 	}
 
-	ramSellBytes(account: string, bytes: string): Promise<any> {
-		return this.eos.sellram(account, parseInt(bytes, 10));
+	ramSellBytes(account: string, bytes: string, permission): Promise<any> {
+		const options = {authorization: account + '@' + permission};
+		return this.eos.sellram(account, parseInt(bytes, 10), options);
 	}
 
 	async createAccount(creator: string, name: string, owner: string,
 						active: string, delegateAmount: number,
 						rambytes: number, transfer: boolean,
-						giftAmount: number, giftMemo: string, symbol: string): Promise<any> {
+						giftAmount: number, giftMemo: string, symbol: string, precision: number, permission): Promise<any> {
 		if (this.auth) {
+			const options = {authorization: creator + '@' + permission};
 			return this.eos.transaction(tr => {
 				tr['newaccount']({creator: creator, name: name, owner: owner, active: active});
 				tr['buyrambytes']({payer: creator, receiver: name, bytes: rambytes});
 				tr['delegatebw']({
 					from: creator, receiver: name,
-					stake_net_quantity: (delegateAmount * 0.3).toFixed(4) + ' ' + symbol,
-					stake_cpu_quantity: (delegateAmount * 0.7).toFixed(4) + ' ' + symbol,
+					stake_net_quantity: (delegateAmount * 0.3).toFixed(precision) + ' ' + symbol,
+					stake_cpu_quantity: (delegateAmount * 0.7).toFixed(precision) + ' ' + symbol,
 					transfer: transfer ? 1 : 0
 				});
 				if (giftAmount > 0) {
@@ -526,7 +487,7 @@ export class EOSJSService {
 						memo: giftMemo
 					});
 				}
-			});
+			}, options);
 		} else {
 			return new Promise(resolve => resolve(null));
 		}
@@ -569,45 +530,22 @@ export class EOSJSService {
 		}
 	}
 
-	async voteProducer(voter: string, list: string[]): Promise<any> {
+	async voteProducer(voter: string, list: string[], permission): Promise<any> {
 		if (list.length <= 30) {
 			const currentVotes = list;
 			currentVotes.sort();
-			// const info = await this.eos['getInfo']({}).then(result => {
-			//   return result;
-			// });
-			// const broadcast_lib = info['last_irreversible_block_num'];
-			// console.log(this.eos);
-			const options = {authorization: voter + '@active'};
+			const options = {authorization: voter + '@' + permission};
 			return this.eosio['voteproducer'](voter, '', currentVotes, options).then(data => {
 				return JSON.stringify(data);
 			}).catch(err => {
 				return err;
 			});
-			// return new Promise((resolve, reject) => {
-			//   const cb = (err, res) => {
-			//     if (err) {
-			//       reject(JSON.parse(err));
-			//     } else {
-			//       console.log(res);
-			//       // setTimeout(() => {
-			//       //   this.txCheckQueue.push({
-			//       //     block: broadcast_lib,
-			//       //     id: res['transaction_id']
-			//       //   });
-			//       //   this.startMonitoringLoop();
-			//       // }, 1000);
-			//       resolve(res);
-			//     }
-			//   };
-			//
-			// });
 		} else {
 			return new Error('Cannot cast more than 30 votes!');
 		}
 	}
 
-	async voteAction(voter: string, list: string[], type: number): Promise<any> {
+	async voteAction(voter: string, list: string[], type: number, permission: string): Promise<any> {
 		let proxy = '';
 		let currentVotes = [];
 		if (list.length <= 30) {
@@ -621,7 +559,7 @@ export class EOSJSService {
 			return new Error('Cannot cast more than 30 votes!');
 		}
 		console.log(proxy);
-		const options = {authorization: voter + '@active'};
+		const options = {authorization: voter + '@' + permission};
 		return this.eosio['voteproducer'](voter, type ? proxy : '', type ? '' : currentVotes, options).then(data => {
 			return JSON.stringify(data);
 		}).catch(err => {
@@ -629,14 +567,25 @@ export class EOSJSService {
 		});
 	}
 
-	async changebw(account, amount, symbol, ratio) {
+	async changebw(account, permission, amount, symbol, ratio, fr) {
 		let cpu_v, net_v;
 		const accountInfo = await this.eos['getAccount'](account);
 		const refund = accountInfo['refund_request'];
 		const liquid_bal = accountInfo['core_liquid_balance'];
+		let wei_cpu: any;
+		let wei_net: any;
 		let ref_cpu = 0;
 		let ref_net = 0;
 		let liquid = 0;
+
+		if ((typeof accountInfo['cpu_weight']) === 'string') {
+			wei_cpu = Math.round(parseFloat(accountInfo['cpu_weight'].split(' ')[0]) / 10000);
+			wei_net = Math.round(parseFloat(accountInfo['net_weight'].split(' ')[0]) / 10000);
+		} else {
+			wei_cpu = accountInfo['cpu_weight'];
+			wei_net = accountInfo['net_weight'];
+		}
+
 		if (liquid_bal) {
 			liquid = Math.round(parseFloat(liquid_bal.split(' ')[0]) * 10000);
 		}
@@ -644,27 +593,31 @@ export class EOSJSService {
 			ref_cpu = Math.round(parseFloat(refund['cpu_amount'].split(' ')[0]) * 10000);
 			ref_net = Math.round(parseFloat(refund['net_amount'].split(' ')[0]) * 10000);
 		}
-		const current_stake = accountInfo['cpu_weight'] + accountInfo['net_weight'];
+
+		const current_stake = wei_cpu + wei_net;
+
 		const new_total = current_stake + amount;
 		const new_cpu = new_total * ratio;
 		const new_net = new_total * (1 - ratio);
-		let cpu_diff = new_cpu - accountInfo['cpu_weight'];
-		let net_diff = new_net - accountInfo['net_weight'];
+		let cpu_diff = new_cpu - wei_cpu;
+		let net_diff = new_net - wei_net;
+
 
 		if (cpu_diff > (ref_cpu + liquid)) {
 			net_diff += (cpu_diff - (ref_cpu + liquid));
 			cpu_diff = (ref_cpu + liquid);
-		}
 
+		}
 		if (net_diff > (ref_net + liquid)) {
 			cpu_diff += (cpu_diff - (ref_cpu + liquid));
 			net_diff = (ref_net + liquid);
+
 		}
 		return this.eos.transaction((tr) => {
 			if (cpu_diff < 0 && net_diff >= 0) {
 				// Action 1 - Unstake CPU only
 				net_v = '0.0000';
-				cpu_v = ((Math.abs(cpu_diff)) / 10000).toFixed(4);
+				cpu_v = ((Math.abs(cpu_diff)) / 10000).toFixed(fr);
 				// console.log('Unstake CPU only', 'NET: ', net_v, 'CPU: ', cpu_v);
 				tr['undelegatebw']({
 					from: account,
@@ -675,7 +628,7 @@ export class EOSJSService {
 				if (net_diff > 0) {
 					// Action 2 - Stake NET only
 					cpu_v = '0.0000';
-					net_v = (net_diff / 10000).toFixed(4);
+					net_v = (net_diff / 10000).toFixed(fr);
 					// console.log('Stake NET only', 'NET: ', net_v, 'CPU: ', cpu_v);
 					tr['delegatebw']({
 						from: account,
@@ -687,7 +640,7 @@ export class EOSJSService {
 				}
 			} else if (net_diff < 0 && cpu_diff >= 0) {
 				// Action 1 - Unstake NET only
-				net_v = ((Math.abs(net_diff)) / 10000).toFixed(4);
+				net_v = ((Math.abs(net_diff)) / 10000).toFixed(fr);
 				cpu_v = '0.0000';
 				// console.log('Unstake NET only', 'NET: ', net_v, 'CPU: ', cpu_v);
 				tr['undelegatebw']({
@@ -699,7 +652,7 @@ export class EOSJSService {
 				// Action 2 - Stake CPU only
 				if (cpu_diff > 0) {
 					net_v = '0.0000';
-					cpu_v = (cpu_diff / 10000).toFixed(4);
+					cpu_v = (cpu_diff / 10000).toFixed(fr);
 					// console.log('Stake CPU only', 'NET: ', net_v, 'CPU: ', cpu_v);
 					tr['delegatebw']({
 						from: account,
@@ -711,8 +664,8 @@ export class EOSJSService {
 				}
 			} else if (net_diff < 0 && cpu_diff < 0) {
 				// Action 1 - Unstake Both
-				cpu_v = ((Math.abs(cpu_diff)) / 10000).toFixed(4);
-				net_v = ((Math.abs(net_diff)) / 10000).toFixed(4);
+				cpu_v = ((Math.abs(cpu_diff)) / 10000).toFixed(fr);
+				net_v = ((Math.abs(net_diff)) / 10000).toFixed(fr);
 				// console.log('Unstake Both', 'NET: ', net_v, 'CPU: ', cpu_v);
 				tr['undelegatebw']({
 					from: account,
@@ -722,9 +675,9 @@ export class EOSJSService {
 				});
 			} else {
 				// Action 1 - Stake both
-				cpu_v = (cpu_diff / 10000).toFixed(4);
-				net_v = (net_diff / 10000).toFixed(4);
-				// console.log('NET: ', net_v, 'CPU: ', cpu_v);
+				cpu_v = (cpu_diff / 10000).toFixed(fr);
+				net_v = (net_diff / 10000).toFixed(fr);
+				console.log('NET: ', net_v, symbol, 'CPU: ', cpu_v, symbol);
 				tr['delegatebw']({
 					from: account,
 					receiver: account,
@@ -733,50 +686,7 @@ export class EOSJSService {
 					transfer: 0
 				});
 			}
-		});
+		}, {authorization: account + '@' + permission});
 	}
 
-	// async stake(account, amount, symbol) {
-	// 	const accountInfo = await this.eos['getAccount'](account);
-	// 	const current_stake = accountInfo['cpu_weight'] + accountInfo['net_weight'];
-	// 	const new_total = current_stake + amount;
-	// 	const new_cpu = new_total * 0.75;
-	// 	const new_net = new_total * 0.25;
-	// 	const cpu_diff = new_cpu - accountInfo['cpu_weight'];
-	// 	const net_diff = new_net - accountInfo['net_weight'];
-	// 	if (amount > 2) {
-	// 		return this.changebw(account, cpu_diff, net_diff, symbol);
-	// 	} else {
-	// 		return null;
-	// 	}
-	// }
-
-	// async unstake(account, amount, symbol) {
-	// 	const accountInfo = await this.eos['getAccount'](account);
-	//
-	// 	const current_stake = accountInfo['cpu_weight'] + accountInfo['net_weight'];
-	//
-	// 	console.log(accountInfo);
-	// 	console.log(current_stake);
-	// 	console.log(amount);
-	// 	console.log(current_stake - amount);
-	//
-	// 	if (current_stake - amount >= 10000) {
-	// 		const n_ratio = accountInfo['net_weight'] / current_stake;
-	// 		const c_ratio = accountInfo['cpu_weight'] / current_stake;
-	// 		const net = ((amount * n_ratio) / 10000).toFixed(4);
-	// 		const cpu = ((amount * c_ratio) / 10000).toFixed(4);
-	// 		console.log('CPU: ', cpu + ' ' + symbol);
-	// 		console.log('NET: ', net + ' ' + symbol);
-	// 		return this.eos['undelegatebw']({
-	// 			from: account,
-	// 			receiver: account,
-	// 			unstake_net_quantity: net + ' ' + symbol,
-	// 			unstake_cpu_quantity: cpu + ' ' + symbol
-	// 		});
-	// 	} else {
-	// 		return null;
-	// 	}
-	// }
-
 }
diff --git a/src/app/services/ram.service.ts b/src/app/services/ram.service.ts
index 74dcb5ed..9bb8b2e2 100644
--- a/src/app/services/ram.service.ts
+++ b/src/app/services/ram.service.ts
@@ -24,7 +24,6 @@ export class RamService {
 
 	constructor(private aService: AccountsService, private eos: EOSJSService) {
 		this.socket = socketIo('https://hapi.eosrio.io/');
-
 		this.socket.on('ticker', (data) => {
 			if (data.price) {
 				if (this.aService.activeChain.name === 'EOS MAINNET') {
@@ -33,7 +32,6 @@ export class RamService {
 				}
 			}
 		});
-		this.reload();
 		setInterval(() => {
 			this.reload();
 		}, 60000);
diff --git a/src/app/services/theme.service.ts b/src/app/services/theme.service.ts
index df6aa411..2a5ff4a9 100644
--- a/src/app/services/theme.service.ts
+++ b/src/app/services/theme.service.ts
@@ -15,9 +15,10 @@ export const DefaultTheme = {
 	'--special-font-italic': 'inherit',
 	'--special-font-bolditalic': 'inherit',
 	'--slogan-special-color': 'inherit',
+	'--dashboard-animation-display': 'block',
+	'--dashboard-img-display': 'none',
 
-	'--landing-background': 'url("../../assets/fundosimpleos.png")',
-	// '--landing-image-background': 'url("../../assets/fundosimpleos.png")',
+	'--landing-background': 'url("./assets/fundosimpleos.png")',
 
 	'--sidenav-background': '#191919',
 	'--sidenav-color': '#b1b1b1',
@@ -35,7 +36,7 @@ export const DefaultTheme = {
 	'--mat-tab-bar-height': '2px',
 
 	'--tokens-panel-background': '#191919',
-	'--destaque-color-token': '#2e7db2',
+	'--destaque-color-token': '#0094d2',
 	'--token-title-color': '#b1b1b1',
 	'--token-price-color':'#696969',
 	'--letter-divider': '#3f3f3f',
@@ -57,6 +58,7 @@ export const DefaultTheme = {
 
 	'--table-th-color': '#cccccc',
 	'--table-th-background': '#333333',
+	'--table-tr-background': 'transparent',
 	'--table-tr-color': '#b1b1b1',
 	'--table-td-color': '#b1b1b1',
 
@@ -71,6 +73,8 @@ export const DefaultTheme = {
 	'--text-white-color': '#ffffff',
 	'--text-destaque-color': '#0094d2',
 	'--text-blue-color': '#0094d2',
+	'--text-error': '#d04d42',
+	'--made-with-love': '#a4a4a4',
 
 	'--a-link-color': '#0094d2',
 
@@ -82,7 +86,7 @@ export const DefaultTheme = {
 	'--modal-side-background': '#272727',
 	'--modal-step-background': '#535353',
 	'--modal-step-line-background': '#535353',
-	'--modal-step-off-background': '#565656',
+	'--modal-step-off-background': '#828181',
 
 	'--tr-even-backgorund': 'transparent',
 	'--tr-odd-backgorund': 'transparent',
@@ -91,34 +95,41 @@ export const DefaultTheme = {
 	'--tr-resource-even-backgorund': '#2C2C2C',
 	'--tr-resource-odd-color': '#ececec',
 	'--tr-resource-odd-backgorund': 'transparent',
+	'--tr-hover': '#1f1f1f',
 
 	'--rex-balance-title-color': '#b1b1b1',
 	'--rex-balance-info-color': '#ffffff',
 	'--rex-btn-color': '#0094d2',
+	'--rex-border-color': '#0094d2',
 
 	'--btn-border-color': '#0094d2',
 	'--btn-color': '#0094d2',
 	'--btn-success-color': '#ffffff',
 	'--btn-color-hover': '#ffffff',
 	'--btn-background-hover': '#0077b7',
+	'--btn-rev-color-hover': '#0094d2',
+
+	'--btn-primary-bg': '#0079b8',
+	'--btn-primary-hover': '#004d8a',
 
 	'--btn-inverse-color': '#ffffff',
-	'--btn-inverse-background-hover': '#ffffff',
-	'--btn-inverse-color-hover': '#0094d2',
+	'--btn-inverse-background-hover': '#0094d2',
+	'--btn-inverse-color-hover': '#ffffff',
 
 	'--btn-inverse2-color': '#ffffff',
 	'--btn-inverse2-background-hover': '#ffffff',
 	'--btn-inverse2-color-hover': '#0094d2',
 
-	'--btn-link-color': '#ffffff',
-	'--btn-link-background-hover': '#ffffff',
-	'--btn-link-color-hover': '#0094d2',
-
-	'--btn-link2-color': '#ffffff',
+	'--btn-link2-color': '#0094d2',
 	'--btn-link2-background-hover': '#ffffff',
-	'--btn-link2-color-hover': '#0094d2',
+	'--btn-link2-color-hover': '#0077b7',
+
+	'--btn-link-color': '#0094d2',
+	'--btn-link-background-hover': '#ffffff',
+	'--btn-link-color-hover': '#0077b7',
 
 	'--update-box-background':'#1f1f1f',
+	'--chain-icon-bg': '#c5c5c5',
 };
 
 export const LiberlandTheme = {
@@ -136,12 +147,9 @@ export const LiberlandTheme = {
 	'--special-font-bolditalic': 'Lora-BoldItalic',
 	'--special-font-weight': 'bold',
 	'--special-font-spacing': '1.3px',
-	'--slogan-special-color': '#ffffff47',
+	'--slogan-special-color': '#ffffff61',
 
-	// '--landing-image-background': 'none',
-	// '--landing-background': 'linear-gradient(to bottom, #1162A0 0%,#0A3E60 100%)',
-	// '--landing-background':  'url("../../assets/fundoliberland.png")',
-	'--landing-background':  'url("../../assets/fundoliberland1.png")',
+	'--landing-background':  'url("./assets/cover-liberland3.png")',
 
 	'--sidenav-background': '#1577C6',
 	'--sidenav-color': '#D6D6D6',
@@ -149,7 +157,6 @@ export const LiberlandTheme = {
 	'--sidenav-active-background': '#EDEDEC',
 	'--sidenav-active-color': '#1577C6',
 	'--sidenav-active-border-color1': '#EDEDEC',
-	//'--sidenav-active-border-color2': '#FCD215',
 
 	'--top-btn-backgorund': '#084577',
 	'--top-btn-color': '#f8f8f8',
@@ -183,6 +190,7 @@ export const LiberlandTheme = {
 
 	'--table-th-color': '#084577',
 	'--table-th-background': '#f8f8f8',
+	'--table-tr-background': '#ffffff',
 	'--table-tr-color': '#404040',
 	'--table-td-color': '#404040',
 
@@ -197,6 +205,8 @@ export const LiberlandTheme = {
 	'--text-gray3-color': '#b1b1b1',
 	'--text-destaque-color': '#FCD215',
 	'--text-blue-color': '#1577C6',
+	'--text-error': '#ff8880',
+	'--made-with-love': '#ffffff',
 
 	'--a-link-color': '#F8F8F8',
 
@@ -217,16 +227,22 @@ export const LiberlandTheme = {
 	'--tr-resource-even-backgorund': '#1577C6',
 	'--tr-resource-odd-color': '#202020',
 	'--tr-resource-odd-backgorund': 'transparent',
+	'--tr-hover': '#d2d2d2',
 
 	'--rex-balance-title-color': '#cccccc',
 	'--rex-balance-info-color': '#f8f8f8',
 	'--rex-btn-color': '#ffffff',
+	'--rex-border-color': '#ffffff',
 
 	'--btn-border-color': '#084577',
 	'--btn-color': '#084577',
 	'--btn-success-color': '#303030',
 	'--btn-color-hover': '#ffffff',
 	'--btn-background-hover': '#084577',
+	'--btn-rev-color-hover': '#1577C6',
+
+	'--btn-primary-bg': '#0079b8',
+	'--btn-primary-hover': '#004d8a',
 
 	'--btn-inverse-color': '#ffffff',
 	'--btn-inverse-background-hover': '#ffffff',
@@ -236,17 +252,18 @@ export const LiberlandTheme = {
 	'--btn-inverse2-background-hover': '#ffffff',
 	'--btn-inverse2-color-hover': '#084577',
 
-	'--btn-link-color': '#ffffff',
+	'--btn-link2-color': '#FCD215',
+	'--btn-link2-background-hover': '#ffffff',
+	'--btn-link2-color-hover': '#ffffff',
+
+	'--btn-link-color': '#1577C6',
 	'--btn-link-background-hover': '#ffffff',
 	'--btn-link-color-hover': '#084577',
 
-	'--btn-link2-color': '#404040',
-	'--btn-link2-background-hover': '#ffffff',
-	'--btn-link2-color-hover': '#1577C6',
-
 	'--update-box-background':'#0d3352',
-
+	'--chain-icon-bg': '#c5c5c5',
 };
+
 export const LightTheme = {
 	'--main-background': '#ffffff',
 	'--background-gd': 'linear-gradient(to right, #EDEDEC, #F8F8F8)',
@@ -262,29 +279,40 @@ export const LightTheme = {
 	'--special-font-italic': 'inherit',
 	'--special-font-bolditalic': 'inherit',
 	'--special-font-weight': 'inherit',
-	'--landing-background': 'url("../../assets/fundosimpleoslight.png")',
+	'--slogan-special-color': '#adadad',
+
+	'--landing-background': 'url("./assets/fundosimpleoslight.png")',
 	// '--landing-image-background': 'url("../../assets/fundosimpleoslight.png")',
 
-	'--sidenav-background': '#f8f8f8',
-	'--sidenav-color': '#565656',
-	'--sidenav-option-color': '#a5a5a5',
+
+	'--dashboard-animation-display': 'none',
+	'--dashboard-img-display': 'block',
+
+	// '--sidenav-background': '#f8f8f8',
+	'--sidenav-background': '#0094d2',
+	// '--sidenav-color': '#565656',
+	'--sidenav-color': '#dadada',
+	// '--sidenav-option-color': '#a5a5a5',
+	'--sidenav-option-color': '#f8f8f8',
 	'--sidenav-active-background': '#ffffff',
-	'--sidenav-active-color': '#9a9a9a',
-	'--sidenav-active-border-color1': '#ffffff',
+	// '--sidenav-active-color': '#9a9a9a',
+	'--sidenav-active-color': '#0094d2',
+	// '--sidenav-active-border-color1': '#ffffff',
+	'--sidenav-active-border-color1': '#EDEDEC',
 
 	'--top-btn-backgorund': '#afafaf',
 	'--top-btn-color': '#f8f8f8',
 
 	'--mat-tab-active': '#afafaf',
-	'--mat-tab-bar-active': '#0094d2',
+	'--mat-tab-bar-active': '#FCD215',
 	'--mat-tab-bar-height': '4px',
 
 	'--tokens-panel-background': '#f8f8f8',
 	'--destaque-color-token': '#0094d2',
 	'--token-title-color': '#000000',
 	'--token-price-color': '#707070',
-
 	'--letter-divider': '#afafaf',
+	'--contact-hover-color': '#ffffff',
 
 	'--accordion-hover-background': '#bfbfbf',
 	'--accordion-color': '#707070',
@@ -304,6 +332,7 @@ export const LightTheme = {
 
 	'--table-th-color': '#212121',
 	'--table-th-background': '#f8f8f8',
+	'--table-tr-background': '#ffffff',
 	'--table-tr-color': '#404040',
 	'--table-td-color': '#404040',
 
@@ -314,9 +343,12 @@ export const LightTheme = {
 	'--text-gray-color': '#404040',
 	'--text-gray2-color': '#707070',
 	'--text-gray3-color': '#b1b1b1',
-	'--text-destaque-color': '#0094d2',
+	'--text-destaque-color': '#FCD215',
 	'--text-blue-color': '#0094d2',
-	'--a-link-color': '#0094d2',
+	'--text-error': '#f44336',
+	'--made-with-love': '#404040',
+
+	'--a-link-color': '#FCD215',
 
 	'--modal-background': '#F8F8F8',
 	'--modal-color': '#707070',
@@ -326,51 +358,99 @@ export const LightTheme = {
 	'--modal-side-background': '#0094d2',
 	'--modal-step-background': '#afafaf',
 	'--modal-step-line-background': '#afafaf',
-	'--modal-step-off-background': '#d6d6d6',
+	'--modal-step-off-background': '#ffffff',
 
 	'--tr-even-backgorund': '#ffffff',
 	'--tr-odd-backgorund': '#ffffff',
 	'--tr-border-bottom-color': '1px solid #cccccc',
-	'--tr-resource-even-backgorund': '#0094d2',
+	'--tr-resource-even-backgorund': '#aaaaaa',
 	'--tr-resource-odd-color': '#202020',
 	'--tr-resource-odd-backgorund': 'transparent',
+	'--tr-hover': '#afafaf',
 
-	'--rex-balance-title-color': '#cccccc',
+	'--rex-balance-title-color': '#e9e9e9',
 	'--rex-balance-info-color': '#f8f8f8',
 	'--rex-btn-color': '#ffffff',
+	'--rex-border-color': '#ffffff',
 
-	'--btn-border-color': '#afafaf',
-	'--btn-color': '#afafaf',
+	'--btn-border-color': '#0094d2',
+	'--btn-color': '#0094d2',
 	'--btn-success-color': '#303030',
 	'--btn-color-hover': '#ffffff',
-	'--btn-background-hover': '#afafaf',
+	'--btn-background-hover': '#0094d2',
+	'--btn-rev-color-hover': '#0094d2',
+
+	'--btn-primary-bg': '#0079b8',
+	'--btn-primary-hover': '#004d8a',
 
 	'--btn-inverse-color': '#0094d2',
 	'--btn-inverse-background-hover': '#0094d2',
 	'--btn-inverse-color-hover': '#ffffff',
 
-	'--btn-link-color:': '#707070',
+	'--btn-inverse2-color': '#404040',
+	'--btn-inverse2-background-hover': '#ffffff',
+	'--btn-inverse2-color-hover': '#0094d2',
+
+	'--btn-link2-color': '#0079b8',
+	'--btn-link2-background-hover': '#ffffff',
+	'--btn-link2-color-hover': '#0066a6',
+
+	'--btn-link-color': '#0094d2',
 	'--btn-link-background-hover': '#ffffff',
-	'--btn-link-color-hover': '#0094d2',
+	'--btn-link-color-hover': '#0077b7',
 
 	'--update-box-background':'#a4a4a4',
+	'--chain-icon-bg': '#c5c5c5',
 
+};
+
+export const WaxLandingTheme = {
+	'--landing-background': 'url("./assets/cover-wax.jpg")',
+	'--info-card-background': '#002731',
+	'--btn-inverse-background-hover': '#F78E1E',
+	'--text-title-color': '#d0d0d0',
+	'--text-blue-color': '#F78E1E',
+	'--update-box-background': '#002731',
+	'--btn-link-color': '#F78E1E',
+	'--btn-link-color-hover': '#e8964a',
+	'--btn-link2-color': '#F78E1E',
+	'--btn-rev-color-hover': '#F78E1E',
+	'--modal-background': '#002731',
+	'--btn-border-color': '#F78E1E',
+	'--btn-color': '#F78E1E',
+	'--btn-background-hover': '#F78E1E',
+	'--modal-side-background': '#001d24',
+	'--modal-step-off-background': '#ffffff',
+	'--btn-primary-bg': '#c56907',
+	'--btn-primary-hover': '#8f4c05',
+	'--chain-icon-bg': 'white',
+	'--text-error': '#ff8e85',
+	'--made-with-love': '#bfbfbf',
 
 };
 
 @Injectable({ providedIn: 'root' })
 export class ThemeService {
+	public currentTheme: string;
+
 	defaultTheme() {
+		this.currentTheme = 'dark';
 		this.setTheme(DefaultTheme);
 	}
 
 	liberlandTheme() {
+		this.currentTheme = 'liberland';
 		this.setTheme(LiberlandTheme);
 	}
 
+	waxTheme() {
+		this.currentTheme = 'wax';
+		this.setTheme(WaxLandingTheme);
+	}
+
 	lightTheme() {
-		this.setTheme(DefaultTheme);
-		 // this.setTheme(LightTheme);
+		this.currentTheme = 'light';
+		this.setTheme(LightTheme);
 	}
 
 	private setTheme(theme: {}) {
diff --git a/src/app/services/voting.service.ts b/src/app/services/voting.service.ts
index 96d0d274..6b90004e 100644
--- a/src/app/services/voting.service.ts
+++ b/src/app/services/voting.service.ts
@@ -189,19 +189,33 @@ export class VotingService {
 
 			this.hasList = producers.rows.length > 0;
 
+			let weeks = 52;
+			let block_timestamp_epoch = 946684800;
+			let precision = 10000;
+			if (this.aService.activeChain['symbol'] === 'WAX') {
+				weeks = 13;
+				block_timestamp_epoch = 946684800;
+				precision = 100000000;
+			}
+
+			if (this.aService.activeChain['symbol'] === 'LLC') {
+				precision = 100000000;
+			}
+
 			producers.rows.forEach((prod: any, idx) => {
 				const vote_pct: any = Math.round((100 * prod['total_votes'] / total_votes) * 1000) / 1000;
 				let voted;
-				// console.log( VotingService.amountFilter((prod['total_votes'] / 10000), '2'));
-				const a = (moment().unix() - 946684800);
-				const b = parseInt('' + (a / 604800), 10) / 52;
-				const totalEos = (prod['total_votes'] / Math.pow(2, b) / 10000);
-				// console.log(totalEos);
+
+				const a = (moment().unix() - block_timestamp_epoch);
+				const b = parseInt('' + (a / 604800), 10) / weeks;
+				const totalEos = (prod['total_votes'] / Math.pow(2, b) / precision);
+
 				if (myAccount.details['voter_info']) {
 					voted = myAccount.details['voter_info']['producers'].indexOf(prod['owner']) !== -1;
 				} else {
 					voted = false;
 				}
+
 				const producerMetadata = {
 					name: prod['owner'],
 					account: prod['owner'],
@@ -359,6 +373,20 @@ export class VotingService {
 						// console.log('ListProxies returned ' + result['voters'].length + ' proxies');
 						// Pass 1 - Add accounts
 						// console.log(myAccount);
+
+						let weeks = 52;
+						let block_timestamp_epoch = 946684800;
+						let precision = 10000;
+						if (this.aService.activeChain['symbol'] === 'WAX') {
+							weeks = 13;
+							block_timestamp_epoch = 946684800;
+							precision = 100000000;
+						}
+
+						if (this.aService.activeChain['symbol'] === 'LLC') {
+							precision = 100000000;
+						}
+
 						result['voters'].forEach((item, idx) => {
 							let voted;
 							if (myAccount.details['voter_info']) {
@@ -368,9 +396,9 @@ export class VotingService {
 							}
 
 							// const vote_pct: any = Math.round((100 * item['total_votes'] / total_votes) * 1000) / 1000;
-							const a = (moment().unix() - 946684800);
-							const b = parseInt('' + (a / 604800), 10) / 52;
-							const totalEos = (item['weight'] / Math.pow(2, b) / 10000);
+							const a = (moment().unix() - block_timestamp_epoch);
+							const b = parseInt('' + (a / 604800), 10) / weeks;
+							const totalEos = (item['weight'] / Math.pow(2, b) / precision);
 
 							const proxiesMetadata = {
 								name: '-',
diff --git a/src/assets/chain-icons/bos.png b/src/assets/chain-icons/bos.png
new file mode 100644
index 00000000..ddc3c414
Binary files /dev/null and b/src/assets/chain-icons/bos.png differ
diff --git a/src/assets/chain-icons/eos.png b/src/assets/chain-icons/eos.png
new file mode 100644
index 00000000..0e48cac4
Binary files /dev/null and b/src/assets/chain-icons/eos.png differ
diff --git a/src/assets/chain-icons/jungle.png b/src/assets/chain-icons/jungle.png
new file mode 100644
index 00000000..62995e47
Binary files /dev/null and b/src/assets/chain-icons/jungle.png differ
diff --git a/src/assets/chain-icons/kylin.png b/src/assets/chain-icons/kylin.png
new file mode 100644
index 00000000..80fc3dbb
Binary files /dev/null and b/src/assets/chain-icons/kylin.png differ
diff --git a/src/assets/chain-icons/liberland.png b/src/assets/chain-icons/liberland.png
new file mode 100644
index 00000000..2ac9b34b
Binary files /dev/null and b/src/assets/chain-icons/liberland.png differ
diff --git a/src/assets/chain-icons/meetone.png b/src/assets/chain-icons/meetone.png
new file mode 100644
index 00000000..9cecf6b6
Binary files /dev/null and b/src/assets/chain-icons/meetone.png differ
diff --git a/src/assets/chain-icons/telos.png b/src/assets/chain-icons/telos.png
new file mode 100644
index 00000000..471de6a4
Binary files /dev/null and b/src/assets/chain-icons/telos.png differ
diff --git a/src/assets/chain-icons/wax.png b/src/assets/chain-icons/wax.png
new file mode 100644
index 00000000..5e4c7361
Binary files /dev/null and b/src/assets/chain-icons/wax.png differ
diff --git a/src/assets/chain-icons/worbli.png b/src/assets/chain-icons/worbli.png
new file mode 100644
index 00000000..4f58a719
Binary files /dev/null and b/src/assets/chain-icons/worbli.png differ
diff --git a/src/assets/cover-liberland3.png b/src/assets/cover-liberland3.png
new file mode 100644
index 00000000..f02ed25c
Binary files /dev/null and b/src/assets/cover-liberland3.png differ
diff --git a/src/assets/cover-wax - Copy.png b/src/assets/cover-wax - Copy.png
new file mode 100644
index 00000000..0a5e2fee
Binary files /dev/null and b/src/assets/cover-wax - Copy.png differ
diff --git a/src/assets/cover-wax.jpg b/src/assets/cover-wax.jpg
new file mode 100644
index 00000000..7f2353de
Binary files /dev/null and b/src/assets/cover-wax.jpg differ
diff --git a/src/assets/cover-wax.png b/src/assets/cover-wax.png
new file mode 100644
index 00000000..8aef42bc
Binary files /dev/null and b/src/assets/cover-wax.png differ
diff --git a/src/assets/fundoliberland.png b/src/assets/fundoliberland.png
deleted file mode 100644
index 3e3a5b8e..00000000
Binary files a/src/assets/fundoliberland.png and /dev/null differ
diff --git a/src/assets/icons/ico/ll.ico b/src/assets/icons/ico/ll.ico
new file mode 100644
index 00000000..16fc8d7f
Binary files /dev/null and b/src/assets/icons/ico/ll.ico differ
diff --git a/src/assets/icons/ico/simpleos-multi.ico b/src/assets/icons/ico/simpleos-multi.ico
new file mode 100644
index 00000000..00e2002c
Binary files /dev/null and b/src/assets/icons/ico/simpleos-multi.ico differ
diff --git a/src/assets/icons/liberland256x256.icns b/src/assets/icons/liberland256x256.icns
new file mode 100644
index 00000000..dd782631
Binary files /dev/null and b/src/assets/icons/liberland256x256.icns differ
diff --git a/src/assets/liberland-map.png b/src/assets/liberland-map.png
new file mode 100644
index 00000000..65b397a1
Binary files /dev/null and b/src/assets/liberland-map.png differ
diff --git a/src/assets/liberland_256_LdC_icon.ico b/src/assets/liberland_256_LdC_icon.ico
new file mode 100644
index 00000000..abb370a4
Binary files /dev/null and b/src/assets/liberland_256_LdC_icon.ico differ
diff --git a/src/assets/logos/liberland_256.png b/src/assets/logos/liberland_256.png
new file mode 100644
index 00000000..2ac9b34b
Binary files /dev/null and b/src/assets/logos/liberland_256.png differ
diff --git a/src/assets/simpleos-logo-clara-dashboard.svg b/src/assets/simpleos-logo-clara-dashboard.svg
new file mode 100644
index 00000000..8d806bcd
--- /dev/null
+++ b/src/assets/simpleos-logo-clara-dashboard.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 338.8 394.52" style="enable-background:new 0 0 338.8 394.52;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffffff;}
+	.st12{fill:#ffffff;}
+</style>
+<g>
+	<path class="st0" d="M0.5,389.7c-0.25-0.2-0.5-0.54-0.5-0.99c0-0.69,0.59-1.29,1.28-1.29c0.35,0,0.64,0.15,0.84,0.29
+		c3.47,3.11,6.94,4.49,11.7,4.48c5.2-0.01,8.76-2.94,8.75-6.91v-0.1c-0.01-3.66-1.95-5.79-9.82-7.35
+		c-8.32-1.66-11.7-4.48-11.71-9.72l0-0.1c-0.01-5.15,4.68-9.12,11.12-9.14c4.65-0.01,7.88,1.17,11.05,3.54
+		c0.25,0.2,0.55,0.54,0.55,1.04c0,0.69-0.59,1.29-1.28,1.29c-0.3,0-0.59-0.1-0.84-0.29c-3.03-2.32-6.05-3.25-9.57-3.24
+		c-5.1,0.01-8.46,2.94-8.45,6.56v0.1c0.01,3.66,1.9,5.89,10.12,7.55c8.03,1.61,11.4,4.48,11.41,9.53l0,0.1
+		c0.01,5.59-4.78,9.47-11.46,9.49C8.48,394.54,4.42,392.91,0.5,389.7z"/>
+	<path class="st0" d="M46.03,360.38c0-0.69,0.59-1.29,1.28-1.29c0.69,0,1.29,0.59,1.29,1.28l0.08,32.48c0,0.69-0.59,1.29-1.29,1.29
+		c-0.69,0-1.29-0.59-1.29-1.28L46.03,360.38z"/>
+	<path class="st0" d="M71.38,360.36c0-0.69,0.59-1.29,1.28-1.29h0.25c0.54,0,0.94,0.29,1.29,0.74l13.57,19.87l13.47-19.94
+		c0.3-0.45,0.74-0.74,1.29-0.75l0.25,0c0.69,0,1.29,0.59,1.29,1.28l0.08,32.43c0,0.69-0.59,1.29-1.28,1.29s-1.29-0.59-1.29-1.28
+		l-0.07-29.02l-12.68,18.55c-0.3,0.45-0.64,0.65-1.09,0.65c-0.45,0-0.79-0.2-1.09-0.64l-12.77-18.49l0.07,29.07
+		c0,0.69-0.54,1.24-1.23,1.24c-0.69,0-1.24-0.54-1.24-1.24L71.38,360.36z"/>
+	<path class="st0" d="M126.5,360.38c0-0.69,0.59-1.29,1.28-1.29l11.29-0.03c7.62-0.02,12.88,3.88,12.9,10.56l0,0.1
+		c0.02,7.28-6.26,11.06-13.49,11.07l-9.36,0.02l0.03,11.83c0,0.69-0.59,1.29-1.29,1.29c-0.69,0-1.29-0.59-1.29-1.28L126.5,360.38z
+		 M138.63,378.42c6.44-0.02,10.79-3.39,10.77-8.54v-0.1c-0.01-5.5-4.28-8.36-10.52-8.34l-9.8,0.02l0.04,16.98L138.63,378.42z"/>
+	<path class="st0" d="M171.71,360.07c0-0.69,0.59-1.29,1.28-1.29c0.69,0,1.29,0.59,1.29,1.28l0.08,31.19l19.36-0.05
+		c0.64,0,1.19,0.54,1.19,1.19c0,0.64-0.54,1.19-1.18,1.19l-20.65,0.05c-0.69,0-1.29-0.59-1.29-1.28L171.71,360.07z"/>
+	<path class="st0" d="M210.78,391.69l-0.11-45.84c0-0.99,0.84-1.84,1.83-1.84l31.97-0.08c0.92,0,1.7,0.77,1.7,1.69
+		c0,0.92-0.77,1.7-1.69,1.7l-30.14,0.07l0.05,19.45l26.95-0.07c0.92,0,1.7,0.77,1.7,1.69c0,0.92-0.77,1.7-1.69,1.7l-26.95,0.07
+		l0.05,19.88l30.49-0.08c0.92,0,1.7,0.77,1.7,1.69c0,0.92-0.77,1.7-1.69,1.7l-32.33,0.08C211.63,393.52,210.78,392.68,210.78,391.69
+		z"/>
+	<path class="st0" d="M249.78,368.81v-0.14c-0.03-13.51,9.91-25.63,24.91-25.67c15-0.04,24.86,11.89,24.89,25.41l0,0.14
+		c0.03,13.51-9.91,25.63-24.91,25.67C259.67,394.25,249.81,382.32,249.78,368.81z M295.76,368.7v-0.14
+		c-0.03-12.24-8.97-22.26-21.21-22.23c-12.24,0.03-20.98,9.96-20.95,22.19l0,0.14c0.03,12.24,8.97,22.26,21.21,22.23
+		C287.04,390.86,295.79,380.94,295.76,368.7z"/>
+	<path class="st0" d="M303.58,387.07c-0.35-0.28-0.71-0.78-0.71-1.41c0-0.99,0.84-1.84,1.83-1.84c0.5,0,0.92,0.21,1.2,0.42
+		c4.96,4.44,9.92,6.41,16.71,6.4c7.43-0.02,12.51-4.2,12.5-9.86l0-0.14c-0.01-5.23-2.78-8.27-14.03-10.51
+		c-11.89-2.38-16.71-6.4-16.73-13.89v-0.14c-0.02-7.36,6.69-13.03,15.88-13.06c6.65-0.02,11.25,1.67,15.79,5.05
+		c0.35,0.28,0.78,0.78,0.78,1.48c0,0.99-0.84,1.84-1.83,1.84c-0.42,0-0.85-0.14-1.2-0.42c-4.32-3.31-8.64-4.65-13.66-4.64
+		c-7.29,0.02-12.09,4.2-12.07,9.37l0,0.14c0.01,5.23,2.71,8.41,14.46,10.79c11.47,2.3,16.29,6.4,16.3,13.61v0.14
+		c0.02,7.99-6.83,13.53-16.38,13.55C314.99,393.98,309.18,391.66,303.58,387.07z"/>
+</g>
+<g>
+	<polygon class="st12" points="169.4,19.36 262.28,76.22 170.49,76.22 168.31,76.22 76.52,76.22 	"/>
+	<polygon class="st12" points="168.31,79.05 170.49,79.05 264.87,79.05 169.4,247.6 73.92,79.05 	"/>
+	<polygon class="st12" points="105.81,227.04 74.9,86.53 167.89,250.69 167.89,311.08 	"/>
+	<polygon class="st12" points="232.99,227.04 170.91,311.08 170.91,250.69 263.9,86.53 	"/>
+</g>
+</svg>
diff --git a/src/assets/simpleos-logo-clara.svg b/src/assets/simpleos-logo-clara.svg
new file mode 100644
index 00000000..adf2376b
--- /dev/null
+++ b/src/assets/simpleos-logo-clara.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 338.8 394.52" style="enable-background:new 0 0 338.8 394.52;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st12{fill:#4D4D4D;}
+</style>
+<g>
+	<path class="st12" d="M0.5,389.7c-0.25-0.2-0.5-0.54-0.5-0.99c0-0.69,0.59-1.29,1.28-1.29c0.35,0,0.64,0.15,0.84,0.29
+		c3.47,3.11,6.94,4.49,11.7,4.48c5.2-0.01,8.76-2.94,8.75-6.91v-0.1c-0.01-3.66-1.95-5.79-9.82-7.35
+		c-8.32-1.66-11.7-4.48-11.71-9.72l0-0.1c-0.01-5.15,4.68-9.12,11.12-9.14c4.65-0.01,7.88,1.17,11.05,3.54
+		c0.25,0.2,0.55,0.54,0.55,1.04c0,0.69-0.59,1.29-1.28,1.29c-0.3,0-0.59-0.1-0.84-0.29c-3.03-2.32-6.05-3.25-9.57-3.24
+		c-5.1,0.01-8.46,2.94-8.45,6.56v0.1c0.01,3.66,1.9,5.89,10.12,7.55c8.03,1.61,11.4,4.48,11.41,9.53l0,0.1
+		c0.01,5.59-4.78,9.47-11.46,9.49C8.48,394.54,4.42,392.91,0.5,389.7z"/>
+	<path class="st12" d="M46.03,360.38c0-0.69,0.59-1.29,1.28-1.29c0.69,0,1.29,0.59,1.29,1.28l0.08,32.48c0,0.69-0.59,1.29-1.29,1.29
+		c-0.69,0-1.29-0.59-1.29-1.28L46.03,360.38z"/>
+	<path class="st12" d="M71.38,360.36c0-0.69,0.59-1.29,1.28-1.29h0.25c0.54,0,0.94,0.29,1.29,0.74l13.57,19.87l13.47-19.94
+		c0.3-0.45,0.74-0.74,1.29-0.75l0.25,0c0.69,0,1.29,0.59,1.29,1.28l0.08,32.43c0,0.69-0.59,1.29-1.28,1.29s-1.29-0.59-1.29-1.28
+		l-0.07-29.02l-12.68,18.55c-0.3,0.45-0.64,0.65-1.09,0.65c-0.45,0-0.79-0.2-1.09-0.64l-12.77-18.49l0.07,29.07
+		c0,0.69-0.54,1.24-1.23,1.24c-0.69,0-1.24-0.54-1.24-1.24L71.38,360.36z"/>
+	<path class="st12" d="M126.5,360.38c0-0.69,0.59-1.29,1.28-1.29l11.29-0.03c7.62-0.02,12.88,3.88,12.9,10.56l0,0.1
+		c0.02,7.28-6.26,11.06-13.49,11.07l-9.36,0.02l0.03,11.83c0,0.69-0.59,1.29-1.29,1.29c-0.69,0-1.29-0.59-1.29-1.28L126.5,360.38z
+		 M138.63,378.42c6.44-0.02,10.79-3.39,10.77-8.54v-0.1c-0.01-5.5-4.28-8.36-10.52-8.34l-9.8,0.02l0.04,16.98L138.63,378.42z"/>
+	<path class="st12" d="M171.71,360.07c0-0.69,0.59-1.29,1.28-1.29c0.69,0,1.29,0.59,1.29,1.28l0.08,31.19l19.36-0.05
+		c0.64,0,1.19,0.54,1.19,1.19c0,0.64-0.54,1.19-1.18,1.19l-20.65,0.05c-0.69,0-1.29-0.59-1.29-1.28L171.71,360.07z"/>
+	<path class="st12" d="M210.78,391.69l-0.11-45.84c0-0.99,0.84-1.84,1.83-1.84l31.97-0.08c0.92,0,1.7,0.77,1.7,1.69
+		c0,0.92-0.77,1.7-1.69,1.7l-30.14,0.07l0.05,19.45l26.95-0.07c0.92,0,1.7,0.77,1.7,1.69c0,0.92-0.77,1.7-1.69,1.7l-26.95,0.07
+		l0.05,19.88l30.49-0.08c0.92,0,1.7,0.77,1.7,1.69c0,0.92-0.77,1.7-1.69,1.7l-32.33,0.08C211.63,393.52,210.78,392.68,210.78,391.69
+		z"/>
+	<path class="st12" d="M249.78,368.81v-0.14c-0.03-13.51,9.91-25.63,24.91-25.67c15-0.04,24.86,11.89,24.89,25.41l0,0.14
+		c0.03,13.51-9.91,25.63-24.91,25.67C259.67,394.25,249.81,382.32,249.78,368.81z M295.76,368.7v-0.14
+		c-0.03-12.24-8.97-22.26-21.21-22.23c-12.24,0.03-20.98,9.96-20.95,22.19l0,0.14c0.03,12.24,8.97,22.26,21.21,22.23
+		C287.04,390.86,295.79,380.94,295.76,368.7z"/>
+	<path class="st12" d="M303.58,387.07c-0.35-0.28-0.71-0.78-0.71-1.41c0-0.99,0.84-1.84,1.83-1.84c0.5,0,0.92,0.21,1.2,0.42
+		c4.96,4.44,9.92,6.41,16.71,6.4c7.43-0.02,12.51-4.2,12.5-9.86l0-0.14c-0.01-5.23-2.78-8.27-14.03-10.51
+		c-11.89-2.38-16.71-6.4-16.73-13.89v-0.14c-0.02-7.36,6.69-13.03,15.88-13.06c6.65-0.02,11.25,1.67,15.79,5.05
+		c0.35,0.28,0.78,0.78,0.78,1.48c0,0.99-0.84,1.84-1.83,1.84c-0.42,0-0.85-0.14-1.2-0.42c-4.32-3.31-8.64-4.65-13.66-4.64
+		c-7.29,0.02-12.09,4.2-12.07,9.37l0,0.14c0.01,5.23,2.71,8.41,14.46,10.79c11.47,2.3,16.29,6.4,16.3,13.61v0.14
+		c0.02,7.99-6.83,13.53-16.38,13.55C314.99,393.98,309.18,391.66,303.58,387.07z"/>
+</g>
+<g>
+	<polygon class="st12" points="169.4,19.36 262.28,76.22 170.49,76.22 168.31,76.22 76.52,76.22 	"/>
+	<polygon class="st12" points="168.31,79.05 170.49,79.05 264.87,79.05 169.4,247.6 73.92,79.05 	"/>
+	<polygon class="st12" points="105.81,227.04 74.9,86.53 167.89,250.69 167.89,311.08 	"/>
+	<polygon class="st12" points="232.99,227.04 170.91,311.08 170.91,250.69 263.9,86.53 	"/>
+</g>
+</svg>
diff --git a/src/assets/steemit2.png b/src/assets/steemit2.png
index 074ae95b..72bccd10 100644
Binary files a/src/assets/steemit2.png and b/src/assets/steemit2.png differ
diff --git a/src/assets/steemit3.png b/src/assets/steemit3.png
new file mode 100644
index 00000000..0dd24f57
Binary files /dev/null and b/src/assets/steemit3.png differ
diff --git a/src/styles.css b/src/styles.css
index fb195bdb..3adab4b2 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -37,9 +37,13 @@
 	--special-font-spacing: 'inherit';
 	--slogan-special-color: 'inherit';
 
-	--landing-background: url("./assets/fundosimpleos.png");
+	--landing-background: url("./assets/cover-wax.png");
 	/*--landing-image-background:url("./assets/fundosimpleos.png");*/
 
+	--dashboard-animation-display: block;
+	--dashboard-img-display: none;
+
+
 	--sidenav-background: #191919;
 	--sidenav-color: #b1b1b1;
 	--sidenav-option-color: #525a60;
@@ -56,7 +60,7 @@
 	--mat-tab-bar-height: 2px;
 
 	--tokens-panel-background: #191919;
-	--destaque-color-token: #2e7db2;
+	--destaque-color-token: #0094d2;
 	--token-title-color: #b1b1b1;
 	--token-price-color:#696969;
 	--letter-divider: #3f3f3f;
@@ -82,6 +86,7 @@
 
 	--table-th-color: #cccccc;
 	--table-th-background: #333333;
+	--table-tr-background: transparent;
 	--table-tr-color: #b1b1b1;
 	--table-td-color: #b1b1b1;
 
@@ -96,6 +101,8 @@
 	--text-gray2-color: #e9e9e9;
 	--text-gray3-color: #d6d6d6;
 	--text-destaque-color: #0094d2;
+	--text-error: #d04d42;
+	--made-with-love: #a4a4a4;
 
 	--a-link-color: #0094d2;
 
@@ -103,7 +110,7 @@
 	--modal-side-background: #272727;
 	--modal-step-background: #535353;
 	--modal-step-line-background: #535353;
-	--modal-step-off-background: #565656;
+	--modal-step-off-background: #828181;
 	--modal-color: #858585;
 	--modal-title-color: #e3e3e3;
 	--modal-side-title-color: #e3e3e3;
@@ -116,10 +123,12 @@
 	--tr-resource-even-backgorund: #2C2C2C;
 	--tr-resource-odd-color: #ececec;
 	--tr-resource-odd-backgorund: #transparent;
+	--tr-hover: #1f1f1f;
 
 	--rex-balance-title-color: #b1b1b1;
 	--rex-balance-info-color: #ffffff;
 	--rex-btn-color: #0094d2;
+	--rex-border-color: #0094d2;
 
 	--btn-border-color: #0094d2;
 	--btn-color: #0094d2;
@@ -129,6 +138,9 @@
 	--btn-rev-color-hover: #0094d2;
 	--btn-rev-background-hover: #ffffff;
 
+	--btn-primary-bg: #0079b8;
+	--btn-primary-hover: #004d8a;
+
 	--btn-inverse-color: #ffffff;
 	--btn-inverse-background-hover: #ffffff;
 	--btn-inverse-color-hover: #0094d2;
@@ -137,16 +149,16 @@
 	--btn-inverse2-background-hover: #ffffff;
 	--btn-inverse2-color-hover: #0094d2;
 
-	--btn-link-color: #ffffff;
-	--btn-link-background-hover: #ffffff;
-	--btn-link-color-hover: #0094d2;
-
-	--btn-link2-color: #ffffff;
+	--btn-link2-color: #0094d2;
 	--btn-link2-background-hover: #ffffff;
-	--btn-link2-color-hover: #0094d2;
+	--btn-link2-color-hover: #0077b7;
 
-	--update-box-background: #1f1f1f;
+	--btn-link-color: #0094d2;
+	--btn-link-background-hover: #ffffff;
+	--btn-link-color-hover: #0077b7;
 
+	--update-box-background: #1f1f1f;
+	--chain-icon-bg: #c5c5c5;
 }
 
 
@@ -197,6 +209,13 @@ body {
 	margin: 20px;
 }
 
+.display-animation{
+	display: var(--dashboard-animation-display);
+}
+.display-img{
+	display: var(--dashboard-img-display);
+}
+
 .update-box-class.show {
 	visibility: visible;
 	-webkit-animation: fadein 1.8s;
@@ -285,6 +304,9 @@ body a.link-eosrio:hover{
 	color: #e3e3e3;
 }
 
+.mat-tab-header, .mat-tab-nav-bar {
+	border-bottom: 0 !important;
+}
 .mat-tab-group.mat-primary .mat-ink-bar, .mat-tab-nav-bar.mat-primary .mat-ink-bar {
 	background-color: var(--mat-tab-bar-active);
 	height: var(--mat-tab-bar-height)
@@ -615,7 +637,8 @@ input:not([readonly]) {
 }
 
 .error {
-	color: #f44336 !important;
+	color: var(--text-error) !important;
+	font-weight: 600;
 }
 
 /*Prime's accordion*/
@@ -715,7 +738,7 @@ input:not([readonly]) {
 /*Prime's accordion end*/
 
 .modal-title {
-	color:  var(--text-title-color) !important;
+	color:  var(--text-white-color) !important;
 }
 
 .ui-table .ui-sortable-column.ui-state-highlight {
@@ -742,15 +765,21 @@ input:not([readonly]) {
 }
 .ui-table .ui-table-tfoot > tr > td{
 	color: var(--table-td-color) !important;
-}
-
-.ui-table .ui-table-tbody > tr:nth-child(even) {
 	background-color: var(--tr-even-backgorund) !important;
 }
-.ui-table .ui-table-tbody > tr:nth-child(odd) {
-	background-color: var(--tr-odd-backgorund) !important;
+.ui-table .ui-table-tbody > tr {
+	color: var(--table-td-color) !important;
+	background-color: var(--table-tr-background) !important;
 }
 
+/*.ui-table .ui-table-tbody > tr:nth-child(even) {*/
+/*	background-color: var(--tr-even-backgorund) !important;*/
+/*}*/
+
+/*.ui-table .ui-table-tbody > tr:nth-child(odd) {*/
+/*	background-color: var(--tr-odd-backgorund);*/
+/*}*/
+
 
 .ui-paginator {
 	background-color: var(--table-th-background) !important;
@@ -780,7 +809,9 @@ input:not([readonly]) {
 	-webkit-box-shadow: 0 2px 0 0 var(--btn-background-hover) inset !important;
 	box-shadow: 0 2px 0 0 var(--btn-background-hover) inset !important;
 }
+
 .btn.btn-info-outline.btn-rex{
+	border-color: var(--rex-border-color) !important;
 	color: var(--rex-btn-color) !important;
 }
 .btn.btn-info-outline.btn-rex:hover{
@@ -881,3 +912,23 @@ input:not([readonly]) {
 	-webkit-box-shadow: 0 2px 0 0 transparent inset !important;
 	box-shadow: 0 2px 0 0 transparent inset !important;
 }
+
+.btn-primary .btn, .btn.btn-primary {
+	border-color: var(--btn-primary-bg) !important;
+	background-color: var(--btn-primary-bg) !important;
+}
+
+.btn.btn-primary:hover {
+	background-color: var(--btn-primary-hover) !important;
+}
+
+.chain-icon {
+	margin-right: 5px;
+	background-color: var(--chain-icon-bg);
+	padding: 3px;
+	border-radius: 30px;
+}
+
+.made-with-love {
+	color: var(--made-with-love);
+}