ivy test

2025-12-07 08:15:34 +00:00 · 2019-12-19 01:45:12 +01:00
126 changed files with 2654 additions and 2945 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -225,24 +225,6 @@
      "contributions": [
        "code"
      ]
-    },
-    {
-      "login": "LeSeulArtichaut",
-      "name": "LeSeulArtichaut",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/38361244?v=4",
-      "profile": "https://github.com/LeSeulArtichaut",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "CyrilTaylor",
-      "name": "Cyril Taylor",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/12631466?v=4",
-      "profile": "https://github.com/CyrilTaylor",
-      "contributions": [
-        "code"
-      ]
    }
  ],
  "contributorsPerLine": 7,
@@ -250,6 +232,5 @@
  "projectOwner": "Eugeny",
  "repoType": "github",
  "repoHost": "https://github.com",
-  "commitConvention": "none",
-  "skipCi": true
+  "commitConvention": "none"
 }
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -79,7 +79,6 @@ rules:
      args: after-used
      argsIgnorePattern: ^_
  no-undef: error
-  no-var: error
  object-curly-spacing:
  - error
  - always
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -38,7 +38,7 @@ jobs:
      run: scripts/build-macos.js
      if: github.repository == 'Eugeny/terminus' && github.event_name == 'push'
      env:
-        #DEBUG: electron-builder,electron-builder:*
+        DEBUG: electron-builder,electron-builder:*
        GH_TOKEN: ${{ secrets.GH_TOKEN }}
        CSC_LINK: ${{ secrets.CSC_LINK }}
        CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -39,7 +39,7 @@ jobs:
        mkdir artifact-setup
        mv dist/*-setup.exe artifact-setup/
        mkdir artifact-portable
-        mv dist/*-portable.zip artifact-portable/
+        mv dist/*-portable.exe artifact-portable/

    - uses: actions/upload-artifact@master
      name: Upload installer
--- a/README.md
+++ b/README.md
@@ -13,13 +13,12 @@

 **Terminus** is a highly configurable terminal emulator for Windows, macOS and Linux

-  * Integrated SSH client and connection manager
  * Theming and color schemes
  * Fully configurable shortcuts
  * Split panes
  * Remembers your tabs
  * PowerShell (and PS Core), WSL, Git-Bash, Cygwin, Cmder and CMD support
-  * Direct file transfer from/to SSH sessions via Zmodem
+  * Integrated SSH client and connection manager
  * Full Unicode support including double-width characters
  * Doesn't choke on fast-flowing outputs
  * Proper shell experience on Windows including tab completion (via Clink)
@@ -35,15 +34,12 @@

 ---

-# Portable
-
-For portable in windows, user can create folder `data` at the same directory as `Terminal.exe` to save the settings.
-
 # Plugins

 Plugins and themes can be installed directly from the Settings view inside Terminus.

  * [clickable-links](https://github.com/Eugeny/terminus-clickable-links) - makes paths and URLs in the terminal clickable
+  * [shell-selector](https://github.com/Eugeny/terminus-shell-selector) - a quick shell selector pane
  * [title-control](https://github.com/kbjr/terminus-title-control) - allows modifying the title of the terminal tabs by providing a prefix, suffix, and/or strings to be removed
  * [quick-cmds](https://github.com/Domain/terminus-quick-cmds) - quickly send commands to one or all terminal tabs
  * [save-output](https://github.com/Eugeny/terminus-save-output) - record terminal output into a file
@@ -70,47 +66,42 @@ See [HACKING.md](https://github.com/Eugeny/terminus/blob/master/HACKING.md) and
 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):

 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
-<!-- prettier-ignore-start -->
-<!-- markdownlint-disable -->
+<!-- prettier-ignore -->
 <table>
  <tr>
-    <td align="center"><a href="http://www.russellmyers.com"><img src="https://avatars2.githubusercontent.com/u/184085?v=4" width="100px;" alt=""/><br /><sub><b>Russell Myers</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=mezner" title="Code">💻</a></td>
-    <td align="center"><a href="http://www.morwire.com"><img src="https://avatars1.githubusercontent.com/u/3991658?v=4" width="100px;" alt=""/><br /><sub><b>Austin Warren</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=ehwarren" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/Drachenkaetzchen"><img src="https://avatars1.githubusercontent.com/u/162974?v=4" width="100px;" alt=""/><br /><sub><b>Felicia Hummel</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=Drachenkaetzchen" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/mikemaccana"><img src="https://avatars2.githubusercontent.com/u/172594?v=4" width="100px;" alt=""/><br /><sub><b>Mike MacCana</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=mikemaccana" title="Tests">⚠️</a> <a href="#design-mikemaccana" title="Design">🎨</a></td>
-    <td align="center"><a href="https://github.com/yxuko"><img src="https://avatars1.githubusercontent.com/u/1786317?v=4" width="100px;" alt=""/><br /><sub><b>Yacine Kanzari</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=yxuko" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/BBJip"><img src="https://avatars2.githubusercontent.com/u/32908927?v=4" width="100px;" alt=""/><br /><sub><b>BBJip</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=BBJip" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/Futagirl"><img src="https://avatars2.githubusercontent.com/u/33533958?v=4" width="100px;" alt=""/><br /><sub><b>Futagirl</b></sub></a><br /><a href="#design-Futagirl" title="Design">🎨</a></td>
+    <td align="center"><a href="http://www.russellmyers.com"><img src="https://avatars2.githubusercontent.com/u/184085?v=4" width="100px;" alt="Russell Myers"/><br /><sub><b>Russell Myers</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=mezner" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.morwire.com"><img src="https://avatars1.githubusercontent.com/u/3991658?v=4" width="100px;" alt="Austin Warren"/><br /><sub><b>Austin Warren</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=ehwarren" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Drachenkaetzchen"><img src="https://avatars1.githubusercontent.com/u/162974?v=4" width="100px;" alt="Felicia Hummel"/><br /><sub><b>Felicia Hummel</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=Drachenkaetzchen" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/mikemaccana"><img src="https://avatars2.githubusercontent.com/u/172594?v=4" width="100px;" alt="Mike MacCana"/><br /><sub><b>Mike MacCana</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=mikemaccana" title="Tests">⚠️</a> <a href="#design-mikemaccana" title="Design">🎨</a></td>
+    <td align="center"><a href="https://github.com/yxuko"><img src="https://avatars1.githubusercontent.com/u/1786317?v=4" width="100px;" alt="Yacine Kanzari"/><br /><sub><b>Yacine Kanzari</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=yxuko" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/BBJip"><img src="https://avatars2.githubusercontent.com/u/32908927?v=4" width="100px;" alt="BBJip"/><br /><sub><b>BBJip</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=BBJip" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Futagirl"><img src="https://avatars2.githubusercontent.com/u/33533958?v=4" width="100px;" alt="Futagirl"/><br /><sub><b>Futagirl</b></sub></a><br /><a href="#design-Futagirl" title="Design">🎨</a></td>
  </tr>
  <tr>
-    <td align="center"><a href="https://www.levrik.io"><img src="https://avatars3.githubusercontent.com/u/9491603?v=4" width="100px;" alt=""/><br /><sub><b>Levin Rickert</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=levrik" title="Code">💻</a></td>
-    <td align="center"><a href="https://kwonoj.github.io"><img src="https://avatars2.githubusercontent.com/u/1210596?v=4" width="100px;" alt=""/><br /><sub><b>OJ Kwon</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=kwonoj" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/Domain"><img src="https://avatars2.githubusercontent.com/u/903197?v=4" width="100px;" alt=""/><br /><sub><b>domain</b></sub></a><br /><a href="#plugin-Domain" title="Plugin/utility libraries">🔌</a> <a href="https://github.com/Eugeny/terminus/commits?author=Domain" title="Code">💻</a></td>
-    <td align="center"><a href="http://www.jbrumond.me"><img src="https://avatars1.githubusercontent.com/u/195127?v=4" width="100px;" alt=""/><br /><sub><b>James Brumond</b></sub></a><br /><a href="#plugin-kbjr" title="Plugin/utility libraries">🔌</a></td>
-    <td align="center"><a href="http://www.growingwiththeweb.com"><img src="https://avatars0.githubusercontent.com/u/2193314?v=4" width="100px;" alt=""/><br /><sub><b>Daniel Imms</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=Tyriar" title="Code">💻</a> <a href="#plugin-Tyriar" title="Plugin/utility libraries">🔌</a> <a href="https://github.com/Eugeny/terminus/commits?author=Tyriar" title="Tests">⚠️</a></td>
-    <td align="center"><a href="https://github.com/baflo"><img src="https://avatars2.githubusercontent.com/u/834350?v=4" width="100px;" alt=""/><br /><sub><b>Florian Bachmann</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=baflo" title="Code">💻</a></td>
-    <td align="center"><a href="http://michael-kuehnel.de"><img src="https://avatars2.githubusercontent.com/u/441011?v=4" width="100px;" alt=""/><br /><sub><b>Michael Kühnel</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=mischah" title="Code">💻</a> <a href="#design-mischah" title="Design">🎨</a></td>
+    <td align="center"><a href="https://www.levrik.io"><img src="https://avatars3.githubusercontent.com/u/9491603?v=4" width="100px;" alt="Levin Rickert"/><br /><sub><b>Levin Rickert</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=levrik" title="Code">💻</a></td>
+    <td align="center"><a href="https://kwonoj.github.io"><img src="https://avatars2.githubusercontent.com/u/1210596?v=4" width="100px;" alt="OJ Kwon"/><br /><sub><b>OJ Kwon</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=kwonoj" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Domain"><img src="https://avatars2.githubusercontent.com/u/903197?v=4" width="100px;" alt="domain"/><br /><sub><b>domain</b></sub></a><br /><a href="#plugin-Domain" title="Plugin/utility libraries">🔌</a> <a href="https://github.com/Eugeny/terminus/commits?author=Domain" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.jbrumond.me"><img src="https://avatars1.githubusercontent.com/u/195127?v=4" width="100px;" alt="James Brumond"/><br /><sub><b>James Brumond</b></sub></a><br /><a href="#plugin-kbjr" title="Plugin/utility libraries">🔌</a></td>
+    <td align="center"><a href="http://www.growingwiththeweb.com"><img src="https://avatars0.githubusercontent.com/u/2193314?v=4" width="100px;" alt="Daniel Imms"/><br /><sub><b>Daniel Imms</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=Tyriar" title="Code">💻</a> <a href="#plugin-Tyriar" title="Plugin/utility libraries">🔌</a> <a href="https://github.com/Eugeny/terminus/commits?author=Tyriar" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/baflo"><img src="https://avatars2.githubusercontent.com/u/834350?v=4" width="100px;" alt="Florian Bachmann"/><br /><sub><b>Florian Bachmann</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=baflo" title="Code">💻</a></td>
+    <td align="center"><a href="http://michael-kuehnel.de"><img src="https://avatars2.githubusercontent.com/u/441011?v=4" width="100px;" alt="Michael Kühnel"/><br /><sub><b>Michael Kühnel</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=mischah" title="Code">💻</a> <a href="#design-mischah" title="Design">🎨</a></td>
  </tr>
  <tr>
-    <td align="center"><a href="https://github.com/NieLeben"><img src="https://avatars3.githubusercontent.com/u/47182955?v=4" width="100px;" alt=""/><br /><sub><b>Tilmann Meyer</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=NieLeben" title="Code">💻</a></td>
-    <td align="center"><a href="http://www.jubeat.net"><img src="https://avatars3.githubusercontent.com/u/11289158?v=4" width="100px;" alt=""/><br /><sub><b>PM Extra</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/issues?q=author%3APMExtra" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://jjuhas.keybase.pub//"><img src="https://avatars1.githubusercontent.com/u/6438760?v=4" width="100px;" alt=""/><br /><sub><b>Jonathan</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=IgnusG" title="Code">💻</a></td>
-    <td align="center"><a href="https://hans-koch.me"><img src="https://avatars0.githubusercontent.com/u/1093709?v=4" width="100px;" alt=""/><br /><sub><b>Hans Koch</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=hammster" title="Code">💻</a></td>
-    <td align="center"><a href="http://thepuzzlemaker.info"><img src="https://avatars3.githubusercontent.com/u/12666617?v=4" width="100px;" alt=""/><br /><sub><b>Dak Smyth</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=ThePuzzlemaker" title="Code">💻</a></td>
-    <td align="center"><a href="http://yfwz100.github.io"><img src="https://avatars2.githubusercontent.com/u/983211?v=4" width="100px;" alt=""/><br /><sub><b>Wang Zhi</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=yfwz100" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/jack1142"><img src="https://avatars0.githubusercontent.com/u/6032823?v=4" width="100px;" alt=""/><br /><sub><b>jack1142</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=jack1142" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/NieLeben"><img src="https://avatars3.githubusercontent.com/u/47182955?v=4" width="100px;" alt="Tilmann Meyer"/><br /><sub><b>Tilmann Meyer</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=NieLeben" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.jubeat.net"><img src="https://avatars3.githubusercontent.com/u/11289158?v=4" width="100px;" alt="PM Extra"/><br /><sub><b>PM Extra</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/issues?q=author%3APMExtra" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://jjuhas.keybase.pub//"><img src="https://avatars1.githubusercontent.com/u/6438760?v=4" width="100px;" alt="Jonathan"/><br /><sub><b>Jonathan</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=IgnusG" title="Code">💻</a></td>
+    <td align="center"><a href="https://hans-koch.me"><img src="https://avatars0.githubusercontent.com/u/1093709?v=4" width="100px;" alt="Hans Koch"/><br /><sub><b>Hans Koch</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=hammster" title="Code">💻</a></td>
+    <td align="center"><a href="http://thepuzzlemaker.info"><img src="https://avatars3.githubusercontent.com/u/12666617?v=4" width="100px;" alt="Dak Smyth"/><br /><sub><b>Dak Smyth</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=ThePuzzlemaker" title="Code">💻</a></td>
+    <td align="center"><a href="http://yfwz100.github.io"><img src="https://avatars2.githubusercontent.com/u/983211?v=4" width="100px;" alt="Wang Zhi"/><br /><sub><b>Wang Zhi</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=yfwz100" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/jack1142"><img src="https://avatars0.githubusercontent.com/u/6032823?v=4" width="100px;" alt="jack1142"/><br /><sub><b>jack1142</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=jack1142" title="Code">💻</a></td>
  </tr>
  <tr>
-    <td align="center"><a href="https://github.com/hdougie"><img src="https://avatars1.githubusercontent.com/u/450799?v=4" width="100px;" alt=""/><br /><sub><b>Howie Douglas</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=hdougie" title="Code">💻</a></td>
-    <td align="center"><a href="https://chriskaczor.com"><img src="https://avatars2.githubusercontent.com/u/180906?v=4" width="100px;" alt=""/><br /><sub><b>Chris Kaczor</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=ckaczor" title="Code">💻</a></td>
-    <td align="center"><a href="https://www.boxmein.net"><img src="https://avatars1.githubusercontent.com/u/358714?v=4" width="100px;" alt=""/><br /><sub><b>Johannes Kadak</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=boxmein" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/LeSeulArtichaut"><img src="https://avatars1.githubusercontent.com/u/38361244?v=4" width="100px;" alt=""/><br /><sub><b>LeSeulArtichaut</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=LeSeulArtichaut" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/CyrilTaylor"><img src="https://avatars0.githubusercontent.com/u/12631466?v=4" width="100px;" alt=""/><br /><sub><b>Cyril Taylor</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=CyrilTaylor" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/hdougie"><img src="https://avatars1.githubusercontent.com/u/450799?v=4" width="100px;" alt="Howie Douglas"/><br /><sub><b>Howie Douglas</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=hdougie" title="Code">💻</a></td>
+    <td align="center"><a href="https://chriskaczor.com"><img src="https://avatars2.githubusercontent.com/u/180906?v=4" width="100px;" alt="Chris Kaczor"/><br /><sub><b>Chris Kaczor</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=ckaczor" title="Code">💻</a></td>
+    <td align="center"><a href="https://www.boxmein.net"><img src="https://avatars1.githubusercontent.com/u/358714?v=4" width="100px;" alt="Johannes Kadak"/><br /><sub><b>Johannes Kadak</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=boxmein" title="Code">💻</a></td>
  </tr>
 </table>

-<!-- markdownlint-enable -->
-<!-- prettier-ignore-end -->
 <!-- ALL-CONTRIBUTORS-LIST:END -->

 This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
--- a/app/lib/app.ts
+++ b/app/lib/app.ts
@@ -1,5 +1,4 @@
 import { app, ipcMain, Menu, Tray, shell } from 'electron'
-// eslint-disable-next-line no-duplicate-imports
 import * as electron from 'electron'
 import { loadConfig } from './config'
 import { Window, WindowOptions } from './window'
@@ -14,17 +13,13 @@ export class Application {
        })

        const configData = loadConfig()
-        if (process.platform === 'linux') {
-            app.commandLine.appendSwitch('no-sandbox')
-            if (((configData.appearance || {}).opacity || 1) !== 1) {
-                app.commandLine.appendSwitch('enable-transparent-visuals')
-                app.disableHardwareAcceleration()
-            }
+        if (process.platform === 'linux' && ((configData.appearance || {}).opacity || 1) !== 1) {
+            app.commandLine.appendSwitch('enable-transparent-visuals')
+            app.disableHardwareAcceleration()
        }

        app.commandLine.appendSwitch('disable-http-cache')
        app.commandLine.appendSwitch('lang', 'EN')
-        app.allowRendererProcessReuse = false

        for (const flag of configData.flags || [['force_discrete_gpu', '0']]) {
            app.commandLine.appendSwitch(flag[0], flag[1])
@@ -76,7 +71,7 @@ export class Application {
            this.tray = new Tray(`${app.getAppPath()}/assets/tray.png`)
        }

-        this.tray.on('click', () => setTimeout(() => this.focus()))
+        this.tray.on('click', () => setTimeout(() => this.focus()));

        const contextMenu = Menu.buildFromTemplate([{
            label: 'Show',
@@ -187,7 +182,7 @@ export class Application {
                        },
                    },
                ],
-            },
+            }
        ]

        Menu.setApplicationMenu(Menu.buildFromTemplate(template))
--- a/app/lib/cli.ts
+++ b/app/lib/cli.ts
@@ -20,25 +20,25 @@ export function parseArgs (argv, cwd) {
            return yargs.option('escape', {
                alias: 'e',
                type: 'boolean',
-                describe: 'Perform shell escaping',
+                describe: 'Perform shell escaping'
            }).positional('text', {
-                type: 'string',
+                type: 'string'
            })
        })
        .version('version', '', app.getVersion())
        .option('debug', {
            alias: 'd',
            describe: 'Show DevTools on start',
-            type: 'boolean',
+            type: 'boolean'
        })
        .option('hidden', {
            describe: 'Start minimized',
-            type: 'boolean',
+            type: 'boolean'
        })
        .option('version', {
            alias: 'v',
            describe: 'Show version and exit',
-            type: 'boolean',
+            type: 'boolean'
        })
        .help('help')
        .parse(argv.slice(1))
--- a/app/lib/index.ts
+++ b/app/lib/index.ts
@@ -1,10 +1,9 @@
-import './portable'
 import './sentry'
 import './lru'
 import { app, ipcMain, Menu } from 'electron'
 import { parseArgs } from './cli'
 import { Application } from './app'
-import electronDebug = require('electron-debug')
+import * as electronDebug from 'electron-debug'

 if (!process.env.TERMINUS_PLUGINS) {
    process.env.TERMINUS_PLUGINS = ''
@@ -59,8 +58,8 @@ app.on('ready', () => {
                label: 'New window',
                click () {
                    this.app.newWindow()
-                },
-            },
+                }
+            }
        ]))
    }
    application.init()
--- a/app/lib/lru.ts
+++ b/app/lib/lru.ts
@@ -1,15 +1,13 @@
-import * as createLRU from 'lru-cache'
-import * as fs from 'fs'
-const lru = createLRU({ max: 256, maxAge: 250 })
-const origLstat = fs.realpathSync.bind(fs)
+let lru = require('lru-cache')({ max: 256, maxAge: 250 })
+
+let fs = require('fs')
+let origLstat = fs.realpathSync.bind(fs)

 // NB: The biggest offender of thrashing realpathSync is the node module system
 // itself, which we can't get into via any sane means.
 require('fs').realpathSync = function (p) {
    let r = lru.get(p)
-    if (r) {
-        return r
-    }
+    if (r) return r

    r = origLstat(p)
    lru.set(p, r)
--- a/app/lib/portable.ts
+++ b/app/lib/portable.ts
@@ -1,24 +0,0 @@
-import * as path from 'path'
-import * as fs from 'fs'
-
-let appPath: string | null = null
-try {
-    appPath = path.dirname(require('electron').app.getPath('exe'))
-} catch {
-    appPath = path.dirname(require('electron').remote.app.getPath('exe'))
-}
-
-if (null != appPath) {
-    if(fs.existsSync(path.join(appPath, 'terminus-data'))) {
-        fs.renameSync(path.join(appPath, 'terminus-data'), path.join(appPath, 'data'))
-    }
-    const portableData = path.join(appPath, 'data')
-    if (fs.existsSync(portableData)) {
-        console.log('reset user data to ' + portableData)
-        try {
-            require('electron').app.setPath('userData', portableData)
-        } catch {
-            require('electron').remote.app.setPath('userData', portableData)
-        }
-    }
-}
--- a/app/lib/sentry.ts
+++ b/app/lib/sentry.ts
@@ -1,5 +1,4 @@
 const { init } = process.type === 'main' ? require('@sentry/electron/dist/main') : require('@sentry/electron/dist/renderer')
-import * as isDev from 'electron-is-dev'


 const SENTRY_DSN = 'https://4717a0a7ee0b4429bd3a0f06c3d7eec3@sentry.io/181876'
@@ -10,12 +9,10 @@ try {
    release = require('electron').remote.app.getVersion()
 }

-if (!isDev) {
-    init({
-        dsn: SENTRY_DSN,
-        release,
-        integrations (integrations) {
-            return integrations.filter(integration => integration.name !== 'Breadcrumbs')
-        },
-    })
-}
+init({
+    dsn: SENTRY_DSN,
+    release,
+    integrations (integrations) {
+        return integrations.filter(integration => integration.name !== 'Breadcrumbs')
+    },
+})
--- a/app/lib/window.ts
+++ b/app/lib/window.ts
@@ -1,7 +1,7 @@
 import { Subject, Observable } from 'rxjs'
 import { debounceTime } from 'rxjs/operators'
 import { BrowserWindow, app, ipcMain, Rectangle, screen } from 'electron'
-import ElectronConfig = require('electron-config')
+import * as ElectronConfig from 'electron-config'
 import * as os from 'os'
 import * as path from 'path'

@@ -27,8 +27,6 @@ export class Window {
    private windowConfig: ElectronConfig
    private windowBounds: Rectangle
    private closing = false
-    private lastVibrancy: {enabled: boolean, type?: string} | null = null
-    private disableVibrancyWhileDragging = false

    get visible$ (): Observable<boolean> { return this.visible }

@@ -50,7 +48,6 @@ export class Window {
            webPreferences: {
                nodeIntegration: true,
                preload: path.join(__dirname, 'sentry.js'),
-                backgroundThrottling: false,
            },
            frame: false,
            show: false,
@@ -59,14 +56,14 @@ export class Window {

        if (this.windowBounds) {
            Object.assign(bwOptions, this.windowBounds)
-            const closestDisplay = screen.getDisplayNearestPoint( { x: this.windowBounds.x, y: this.windowBounds.y } )
+            const closestDisplay = screen.getDisplayNearestPoint( {x: this.windowBounds.x, y: this.windowBounds.y} )

-            const [left1, top1, right1, bottom1] = [this.windowBounds.x, this.windowBounds.y, this.windowBounds.x + this.windowBounds.width, this.windowBounds.y + this.windowBounds.height]
-            const [left2, top2, right2, bottom2] = [closestDisplay.bounds.x, closestDisplay.bounds.y, closestDisplay.bounds.x + closestDisplay.bounds.width, closestDisplay.bounds.y + closestDisplay.bounds.height]
+            const [left1, top1, right1, bottom1] = [this.windowBounds.x, this.windowBounds.y, this.windowBounds.x + this.windowBounds.width, this.windowBounds.y + this.windowBounds.height];
+            const [left2, top2, right2, bottom2] = [closestDisplay.bounds.x, closestDisplay.bounds.y, closestDisplay.bounds.x + closestDisplay.bounds.width, closestDisplay.bounds.y + closestDisplay.bounds.height];

            if ((left2 > right1 || right2 < left1 || top2 > bottom1 || bottom2 < top1) && !maximized) {
-                bwOptions.x = closestDisplay.bounds.width / 2 - bwOptions.width / 2
-                bwOptions.y = closestDisplay.bounds.height / 2 - bwOptions.height / 2
+                bwOptions.x = closestDisplay.bounds.width / 2 - bwOptions.width / 2;
+                bwOptions.y = closestDisplay.bounds.height / 2 - bwOptions.height / 2;
            }
        }

@@ -120,12 +117,11 @@ export class Window {
    }

    setVibrancy (enabled: boolean, type?: string) {
-        this.lastVibrancy = { enabled, type }
        if (process.platform === 'win32') {
            if (parseFloat(os.release()) >= 10) {
                let attribValue = AccentState.ACCENT_DISABLED
                if (enabled) {
-                    if (type === 'fluent') {
+                    if (parseInt(os.release().split('.')[2]) >= 17063 && type === 'fluent') {
                        attribValue = AccentState.ACCENT_ENABLE_ACRYLICBLURBEHIND
                    } else {
                        attribValue = AccentState.ACCENT_ENABLE_BLURBEHIND
@@ -135,8 +131,6 @@ export class Window {
            } else {
                DwmEnableBlurBehindWindow(this.window, enabled)
            }
-        } else {
-            this.window.setVibrancy(enabled ? 'dark' : null as any) // electron issue 20269
        }
    }

@@ -156,7 +150,7 @@ export class Window {
    }

    isDestroyed () {
-        return !this.window || this.window.isDestroyed()
+        return !this.window || this.window.isDestroyed();
    }

    private setupWindowManagement () {
@@ -208,10 +202,6 @@ export class Window {
            }
        })

-        this.window.on('focus', () => {
-            this.send('host:window-focused')
-        })
-
        ipcMain.on('window-focus', event => {
            if (!this.window || event.sender !== this.window.webContents) {
                return
@@ -299,29 +289,6 @@ export class Window {
        })

        this.window.webContents.on('new-window', event => event.preventDefault())
-
-        ipcMain.on('window-set-disable-vibrancy-while-dragging', (_event, value) => {
-            this.disableVibrancyWhileDragging = value
-        })
-
-        this.window.on('will-move', () => {
-            if (!this.lastVibrancy?.enabled || !this.disableVibrancyWhileDragging) {
-                return
-            }
-            let timeout: number|null = null
-            const oldVibrancy = this.lastVibrancy
-            this.setVibrancy(false)
-            const onMove = () => {
-                if (timeout) {
-                    clearTimeout(timeout)
-                }
-                timeout = setTimeout(() => {
-                    this.window.off('move', onMove)
-                    this.setVibrancy(oldVibrancy.enabled, oldVibrancy.type)
-                }, 500)
-            }
-            this.window.on('move', onMove)
-        })
    }

    private destroy () {
--- a/app/package.json
+++ b/app/package.json
@@ -13,14 +13,14 @@
    "watch": "webpack --progress --color --watch"
  },
  "dependencies": {
-    "@angular/animations": "7.2.8",
-    "@angular/common": "7.2.8",
-    "@angular/compiler": "7.2.8",
-    "@angular/core": "7.2.8",
-    "@angular/forms": "7.2.8",
-    "@angular/platform-browser": "7.2.8",
-    "@angular/platform-browser-dynamic": "7.2.8",
-    "@ng-bootstrap/ng-bootstrap": "^4.2.2",
+    "@angular/animations": "9.0.0-rc.5",
+    "@angular/common": "9.0.0-rc.5",
+    "@angular/compiler": "9.0.0-rc.5",
+    "@angular/core": "9.0.0-rc.5",
+    "@angular/forms": "9.0.0-rc.5",
+    "@angular/platform-browser": "9.0.0-rc.5",
+    "@angular/platform-browser-dynamic": "9.0.0-rc.5",
+    "@ng-bootstrap/ng-bootstrap": "^5.1.4",
    "devtron": "1.4.0",
    "electron-config": "2.0.0",
    "electron-debug": "^3.0.1",
@@ -28,27 +28,28 @@
    "electron-updater": "^4.2.0",
    "fontmanager-redux": "0.4.0",
    "js-yaml": "3.13.1",
-    "keytar": "^5.2.0",
+    "keytar": "^5.0.0",
    "mz": "^2.7.0",
-    "ngx-toastr": "^10.2.0",
+    "ngx-toastr": "^11.2.1",
    "node-pty": "^0.10.0-beta2",
    "npm": "6.9.0",
    "path": "0.12.7",
-    "rxjs": "^6.5.4",
-    "rxjs-compat": "^6.5.4",
-    "yargs": "^15.1.0",
-    "zone.js": "^0.8.29"
+    "rxjs": "^6.5.3",
+    "rxjs-compat": "^6.5.3",
+    "yargs": "^15.0.2",
+    "zone.js": "^0.10.2"
  },
  "optionalDependencies": {
    "macos-native-processlist": "^1.0.2",
    "windows-blurbehind": "^1.0.1",
-    "windows-native-registry": "^1.0.17",
+    "windows-native-registry": "^1.0.16",
    "windows-process-tree": "^0.2.4",
    "windows-swca": "^2.0.2"
  },
  "devDependencies": {
+    "@angular/localize": "^9.0.0-rc.7",
    "@types/mz": "0.0.32",
    "@types/node": "12.7.12",
-    "node-abi": "^2.15.0"
+    "node-abi": "^2.13.0"
  }
 }
--- a/app/src/app.module.ts
+++ b/app/src/app.module.ts
@@ -1,20 +1,48 @@
-import { NgModule } from '@angular/core'
+import { NgModule, Compiler, Inject, Injector, ɵcreateInjector as createInjector } from '@angular/core'
+import '@angular/localize/init'
+import { CommonModule } from '@angular/common'
 import { BrowserModule } from '@angular/platform-browser'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { ToastrModule } from 'ngx-toastr'

-export function getRootModule (plugins: any[]) {
-    const imports = [
+@NgModule({
+    imports: [
        BrowserModule,
-        ...plugins,
-        NgbModule.forRoot(),
+        CommonModule,
+        NgbModule,
        ToastrModule.forRoot({
            positionClass: 'toast-bottom-center',
            toastClass: 'toast',
            preventDuplicates: true,
            extendedTimeOut: 5000,
        }),
-    ]
+    ],
+})
+export class RootModule {
+    constructor (
+        private compiler: Compiler,
+        private injector: Injector,
+        @Inject('plugins') private plugins: any[],
+    ) { }
+
+    async ngDoBootstrap (app) {
+        console.log('bootstrap', app)
+        for (let plugin of this.plugins) {
+            console.log(plugin)
+            // try {
+            const injector = createInjector(plugin, this.injector)
+            console.log(injector)
+                const module = await this.compiler.compileModuleAsync(plugin)
+                console.log(module)
+            // } catch (e) {
+            //     console.error('Failed loading', plugin, e)
+            // }
+        }
+    }
+}
+
+
+export function setupRootModule (plugins: any[]) {
    const bootstrap = [
        ...plugins.filter(x => x.bootstrap).map(x => x.bootstrap),
    ]
@@ -22,11 +50,4 @@ export function getRootModule (plugins: any[]) {
    if (bootstrap.length === 0) {
        throw new Error('Did not find any bootstrap components. Are there any plugins installed?')
    }
-
-    @NgModule({
-        imports,
-        bootstrap,
-    }) class RootModule { } // eslint-disable-line @typescript-eslint/no-extraneous-class
-
-    return RootModule
 }
--- a/app/src/entry.preload.ts
+++ b/app/src/entry.preload.ts
@@ -1,4 +1,5 @@
 import '../lib/lru'
+import 'core-js/proposals/reflect-metadata'
 import 'source-sans-pro/source-sans-pro.css'
 import 'source-code-pro/source-code-pro.css'
 import '@fortawesome/fontawesome-free/css/solid.css'
@@ -6,3 +7,71 @@ import '@fortawesome/fontawesome-free/css/brands.css'
 import '@fortawesome/fontawesome-free/css/fontawesome.css'
 import 'ngx-toastr/toastr.css'
 import './preload.scss'
+import * as path from 'path'
+
+const nodeModule = require('module') // eslint-disable-line @typescript-eslint/no-var-requires
+const nodeRequire = (global as any).require
+
+
+const builtinModules = [
+    '@angular/animations',
+    '@angular/common',
+    '@angular/compiler',
+    '@angular/core',
+    '@angular/forms',
+    '@angular/localize',
+    '@angular/platform-browser',
+    '@angular/platform-browser-dynamic',
+    '@ng-bootstrap/ng-bootstrap',
+    'ngx-toastr',
+    'rxjs',
+    'rxjs/operators',
+    'rxjs/internal/observable/fromEvent',
+    'rxjs/internal/observable/merge',
+    'rxjs-compat/Subject',
+    'zone.js/dist/zone.js',
+    'terminus-core',
+    // 'terminus-settings',
+    // 'terminus-terminal',
+]
+
+const cachedBuiltinModules = {}
+
+if (process.env.TERMINUS_DEV) {
+    console.info(path.dirname(require('electron').remote.app.getAppPath()))
+    nodeModule.globalPaths.unshift(path.dirname(require('electron').remote.app.getAppPath()))
+    nodeModule.globalPaths.unshift(path.join(require('electron').remote.app.getAppPath(), 'node_modules'))
+}
+
+const originalRequire = (global as any).require
+;(global as any).require = function (query: string) {
+    if (cachedBuiltinModules[query]) {
+        return cachedBuiltinModules[query]
+    }
+    return originalRequire.apply(this, arguments)
+}
+
+const originalModuleRequire = nodeModule.prototype.require
+nodeModule.prototype.require = function (query: string) {
+    if (cachedBuiltinModules[query]) {
+        return cachedBuiltinModules[query]
+    }
+    return originalModuleRequire.call(this, query)
+}
+
+global['require'].resolve = originalRequire.resolve
+nodeModule.prototype.require.resolve = originalModuleRequire.resolve
+
+builtinModules.forEach(m => {
+    const label = 'Caching ' + m
+    console.time(label)
+    try {
+        console.log(m + '/__ivy_ngcc__/fesm5/' + m.split('/')[1] + '.js')
+        cachedBuiltinModules[m] = nodeRequire(m + '/__ivy_ngcc__/fesm5/' + m.split('/')[1] + '.js')
+        console.log('loaded ivy')
+    } catch (e) {
+        console.error(e)
+        cachedBuiltinModules[m] = nodeRequire(m)
+    }
+    console.timeEnd(label)
+})
--- a/app/src/entry.ts
+++ b/app/src/entry.ts
@@ -1,17 +1,12 @@
-import 'zone.js'
-import 'core-js/proposals/reflect-metadata'
-import 'rxjs'
-
 import * as isDev from 'electron-is-dev'

 import './global.scss'
 import './toastr.scss'

-import { enableProdMode, NgModuleRef, ApplicationRef } from '@angular/core'
-import { enableDebugTools } from '@angular/platform-browser'
+import { enableProdMode, NgModuleRef } from '@angular/core'
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'

-import { getRootModule } from './app.module'
+import { setupRootModule, RootModule } from './app.module'
 import { findPlugins, loadPlugins, PluginInfo } from './plugins'

 // Always land on the start view
@@ -33,19 +28,14 @@ async function bootstrap (plugins: PluginInfo[], safeMode = false): Promise<NgMo
    if (safeMode) {
        plugins = plugins.filter(x => x.isBuiltin)
    }
-    const pluginsModules = await loadPlugins(plugins, (current, total) => {
+    const pluginModules = await loadPlugins(plugins, (current, total) => {
        (document.querySelector('.progress .bar') as HTMLElement).style.width = `${100 * current / total}%` // eslint-disable-line
    })
-    const module = getRootModule(pluginsModules)
-    window['rootModule'] = module
-    return platformBrowserDynamic().bootstrapModule(module).then(moduleRef => {
-        if (isDev) {
-            const applicationRef = moduleRef.injector.get(ApplicationRef)
-            const componentRef = applicationRef.components[0]
-            enableDebugTools(componentRef)
-        }
-        return moduleRef
-    })
+    setupRootModule(pluginModules)
+    window['rootModule'] = RootModule
+    return platformBrowserDynamic([
+        { provide: 'plugins', useValue: pluginModules },
+    ]).bootstrapModule(RootModule)
 }

 findPlugins().then(async plugins => {
--- a/app/src/plugins.ts
+++ b/app/src/plugins.ts
@@ -14,14 +14,12 @@ function normalizePath (path: string): string {

 global['module'].paths.map((x: string) => nodeModule.globalPaths.push(normalizePath(x)))

-if (process.env.TERMINUS_DEV) {
-    nodeModule.globalPaths.unshift(path.dirname(require('electron').remote.app.getAppPath()))
-}

 const builtinPluginsPath = process.env.TERMINUS_DEV ? path.dirname(require('electron').remote.app.getAppPath()) : path.join((process as any).resourcesPath, 'builtin-plugins')

 const userPluginsPath = path.join(
-    require('electron').remote.app.getPath('userData'),
+    require('electron').remote.app.getPath('appData'),
+    'terminus',
    'plugins',
 )

@@ -51,49 +49,6 @@ export interface PluginInfo {
    info?: any
 }

-const builtinModules = [
-    '@angular/animations',
-    '@angular/common',
-    '@angular/compiler',
-    '@angular/core',
-    '@angular/forms',
-    '@angular/platform-browser',
-    '@angular/platform-browser-dynamic',
-    '@ng-bootstrap/ng-bootstrap',
-    'ngx-toastr',
-    'rxjs',
-    'rxjs/operators',
-    'rxjs-compat/Subject',
-    'terminus-core',
-    'terminus-settings',
-    'terminus-terminal',
-    'zone.js/dist/zone.js',
-]
-
-const cachedBuiltinModules = {}
-builtinModules.forEach(m => {
-    const label = 'Caching ' + m
-    console.time(label)
-    cachedBuiltinModules[m] = nodeRequire(m)
-    console.timeEnd(label)
-})
-
-const originalRequire = (global as any).require
-;(global as any).require = function (query: string) {
-    if (cachedBuiltinModules[query]) {
-        return cachedBuiltinModules[query]
-    }
-    return originalRequire.apply(this, arguments)
-}
-
-const originalModuleRequire = nodeModule.prototype.require
-nodeModule.prototype.require = function (query: string) {
-    if (cachedBuiltinModules[query]) {
-        return cachedBuiltinModules[query]
-    }
-    return originalModuleRequire.call(this, query)
-}
-
 export async function findPlugins (): Promise<PluginInfo[]> {
    const paths = nodeModule.globalPaths
    let foundPlugins: PluginInfo[] = []
@@ -166,6 +121,7 @@ export async function loadPlugins (foundPlugins: PluginInfo[], progress: Progres
    progress(0, 1)
    let index = 0
    for (const foundPlugin of foundPlugins) {
+        if (foundPlugin.name !== 'core') continue
        console.info(`Loading ${foundPlugin.name}: ${nodeRequire.resolve(foundPlugin.path)}`)
        progress(index, foundPlugins.length)
        try {
--- a/app/src/root.component.ts
+++ b/app/src/root.component.ts
@@ -1,6 +0,0 @@
-import { Component } from '@angular/core'
-
-@Component({
-    template: '<app-root></app-root>',
-})
-export class RootComponent { } // eslint-disable-line @typescript-eslint/no-extraneous-class
--- a/app/tsconfig.json
+++ b/app/tsconfig.json
@@ -1,7 +1,8 @@
 {
    "compilerOptions": {
        "baseUrl": "./src",
-        "module": "commonjs",
+        "module": "es2015",
+        "moduleResolution": "node",
        "target": "es2015",
        "declaration": false,
        "noImplicitAny": false,
@@ -19,7 +20,10 @@
           "es2015.iterable",
           "es2017",
           "es7"
-        ]
+        ],
+        "paths": {
+            "*": ["../../app/node_modules/*"]
+        }
    },
    "compileOnSave": false,
    "exclude": [
@@ -28,5 +32,9 @@
        "*/node_modules",
        "terminus*",
        "platforms"
-    ]
+    ],
+    "angularCompilerOptions": {
+        "enableIvy": true,
+        "disableTypeScriptVersionCheck": true
+    }
 }
--- a/app/webpack.config.js
+++ b/app/webpack.config.js
@@ -1,5 +1,6 @@
 const path = require('path')
 const webpack = require('webpack')
+const { AngularCompilerPlugin } = require('@ngtools/webpack')

 module.exports = {
  name: 'terminus',
@@ -28,13 +29,8 @@ module.exports = {
  module: {
    rules: [
      {
-        test: /\.ts$/,
-        use: {
-          loader: 'awesome-typescript-loader',
-          options: {
-            configFileName: path.resolve(__dirname, 'tsconfig.json'),
-          },
-        },
+          test: /(?:\.ngfactory\.js|\.ngfactory|\.ngstyle\.js|\.ts)$/,
+          loader: '@ngtools/webpack',
      },
      { test: /\.scss$/, use: ['style-loader', 'css-loader', 'sass-loader'] },
      { test: /\.css$/, use: ['style-loader', 'css-loader', 'sass-loader'] },
@@ -82,5 +78,10 @@ module.exports = {
    new webpack.DefinePlugin({
      'process.type': '"renderer"'
    }),
+    new AngularCompilerPlugin({
+        tsConfigPath: path.resolve(__dirname, 'tsconfig.json'),
+        entryModule: 'src/index#default',
+        sourceMap: true,
+    }),
  ],
 }
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -2,59 +2,170 @@
 # yarn lockfile v1


-"@angular/animations@7.2.8":
-  version "7.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.8.tgz#0285364c839c660a934ab0f753ec21424bfb292e"
-  integrity sha512-dJn9koYukyz15TouBc+z5z9fdThDk+bKgdlij25eYSu5Mpmtk04gB4eIMQA97K0UDh1d4YukgSJ5w3ZIk0m8DQ==
-  dependencies:
-    tslib "^1.9.0"
+"@angular/animations@9.0.0-rc.5":
+  version "9.0.0-rc.5"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-9.0.0-rc.5.tgz#8ed3fa2f5d16c16d1ea013ec71e46365c8336622"
+  integrity sha512-pb1QJjBaBOenSIdKB9h1Ts8yQwdAjjTuH9ckVycjYH3yKDc1cQuaGy4NxEx7TJF8ADo4iKkCvKTyh0dW42TOvg==

-"@angular/common@7.2.8":
-  version "7.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.8.tgz#660c816b6f08cd2919a6efb7465397e4ff14d265"
-  integrity sha512-LgOhf68+LPndGZhtnUlGFd2goReXYmHzaFZW8gCEi9aC+H+Io8bjYh0gkH3xDreevEOe3f0z6coXNFLIxSmTuA==
-  dependencies:
-    tslib "^1.9.0"
+"@angular/common@9.0.0-rc.5":
+  version "9.0.0-rc.5"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-9.0.0-rc.5.tgz#05c6cfeef03d55757bf131c8171fb3bf35daa59f"
+  integrity sha512-Gg24S8dMUwVrmIvVHIz2rWCU+q+4Su41s4oipJWJIW1bCBMWqb2oGtaWMhy7RbUkFq2TeL7tC3dS2FOqvgj9sg==

-"@angular/compiler@7.2.8":
-  version "7.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.8.tgz#9d9c1515e99914399e6915c1c90484b1d255560b"
-  integrity sha512-PrU97cTsOdofpaDkxK0rWUA/CGd0u6ESOI6XvFVm5xH9zJInsdY8ShSHklnr1JJnss70e1dGKZbZq32OChxWMw==
-  dependencies:
-    tslib "^1.9.0"
+"@angular/compiler@9.0.0-rc.5":
+  version "9.0.0-rc.5"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-9.0.0-rc.5.tgz#4771e04d8a4c25cfe195232b194dd8ac61bdce42"
+  integrity sha512-0CWPDbpHoWm/ZN40/Y+iPikRQbhd50keoE4xSAYM2SS1pnomJaF2ytIL9xfc3BMGGKgiX3aIk57B0m4yDYTiBw==

-"@angular/core@7.2.8":
-  version "7.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.8.tgz#6586d9b6c6321c80119b3f3e2bd0edbb32d0b649"
-  integrity sha512-QKwug2kWJC00zm2rvmD9mCJzsOkMVhSu8vqPWf83poWTh8+F9aIVWcy29W0VoGpBkSchOnK8hf9DnKVv28j9nw==
-  dependencies:
-    tslib "^1.9.0"
+"@angular/core@9.0.0-rc.5":
+  version "9.0.0-rc.5"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-9.0.0-rc.5.tgz#4d6140e3bf14b7be86e2045bf6a657ec7b4ef211"
+  integrity sha512-g9IhWc5znQGNj056Qtk1OnNYDQAIT8ti++xgcAYJ2Z1Yp0Bkb8gL7WexiuwKxmilHmZxnZiRHsPfSlKl0Hxp5g==

-"@angular/forms@7.2.8":
-  version "7.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.8.tgz#adf194088495822d55dcf3e5bf69196dcf19465d"
-  integrity sha512-lbSX4IHFHz/c4e2RHiPpL8MJlzDkCuQEHnqsujDaV2X9o9fApS6+C1X4x7Z2XDKqonmeX+aHQwv9+SLejX6OyQ==
-  dependencies:
-    tslib "^1.9.0"
+"@angular/forms@9.0.0-rc.5":
+  version "9.0.0-rc.5"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-9.0.0-rc.5.tgz#ab8886d865d968ab23b7680e80061c16fef0a5d8"
+  integrity sha512-+K4MHD7EmSbxljKd/+vugyGWUROSy8PAcqV160gCQQbxW9MuYsHJM/BBPaq2H07gE5YHJ/HOSQoepNdXJ3PUSw==

-"@angular/platform-browser-dynamic@7.2.8":
-  version "7.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.8.tgz#e82768900cedfa75bf453263f931a9f90f7aaab2"
-  integrity sha512-nOJt28A5pRn4mdL8y98V7bA6OOdMRjsQAcWCr/isGYF0l1yDC0ijUGWkHuRtj3z1/9tmERN0BLXx+xs1h4JhCQ==
+"@angular/localize@^9.0.0-rc.7":
+  version "9.0.0-rc.7"
+  resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-9.0.0-rc.7.tgz#8819a32309d44a631c102d3c8d064302cfc23f3c"
+  integrity sha512-y03uNKoZSsedY5W2X7NUNcmxm6rsL6dMs2g1NRw0jOmveXjk8N0g7uUgcBQhXJ7LiHtaRcIK+bOq+2JvvTtZlQ==
  dependencies:
-    tslib "^1.9.0"
+    "@babel/core" "^7.5.5"
+    glob "7.1.2"
+    yargs "13.1.0"

-"@angular/platform-browser@7.2.8":
-  version "7.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.8.tgz#11096727b99bf3d7fd82a00a3a468b933c9713bd"
-  integrity sha512-SizCRMc7Or27g2CugcqWnaAikRPfgLgRvb9GFFGpcgoq8CRfOVwkyR5dFZuqN39H+uwtwuTMP5OUYhZcrFNKug==
+"@angular/platform-browser-dynamic@9.0.0-rc.5":
+  version "9.0.0-rc.5"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.0.0-rc.5.tgz#6beb6e5f625df5939b757b80f7f39134e95769f0"
+  integrity sha512-MCDIuwcFlXo4f/ro9NiYcV1t8SBdt22dXjQWWSij+ABlVqrW7Xwl8oNq0q2+HJQIlg+a37Y2svJouUN1kLvZ3A==
+
+"@angular/platform-browser@9.0.0-rc.5":
+  version "9.0.0-rc.5"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-9.0.0-rc.5.tgz#b10dcd5df71c33e7bff48154ae3876de5236eb5e"
+  integrity sha512-omnc9GnVU8THx2YSnJUzrR2Lk2alzao9AhR+I05GOlYgL3HsuttTtTBEzVfvecGLwSBKrdtbPUwWG4NTuuxGTA==
+
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5":
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d"
+  integrity sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==
  dependencies:
-    tslib "^1.9.0"
+    "@babel/highlight" "^7.0.0"

-"@ng-bootstrap/ng-bootstrap@^4.2.2":
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-4.2.2.tgz#a1c3a9576656cb4f793bbc3df56dfbdeb098f2fb"
-  integrity sha512-v8QmC17bv9he5Ep6zutaI9aQ2w/2NqySP0fejOKe7cacKpGUqsLIakpyd2FD7mfZu7pSCCtHYpRWR+h6yq+Ngg==
+"@babel/core@^7.5.5":
+  version "7.7.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.5.tgz#ae1323cd035b5160293307f50647e83f8ba62f7e"
+  integrity sha512-M42+ScN4+1S9iB6f+TL7QBpoQETxbclx+KNoKJABghnKYE+fMzSGqst0BZJc8CpI625bwPwYgUyRvxZ+0mZzpw==
+  dependencies:
+    "@babel/code-frame" "^7.5.5"
+    "@babel/generator" "^7.7.4"
+    "@babel/helpers" "^7.7.4"
+    "@babel/parser" "^7.7.5"
+    "@babel/template" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    json5 "^2.1.0"
+    lodash "^4.17.13"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.4.tgz#db651e2840ca9aa66f327dcec1dc5f5fa9611369"
+  integrity sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==
+  dependencies:
+    "@babel/types" "^7.7.4"
+    jsesc "^2.5.1"
+    lodash "^4.17.13"
+    source-map "^0.5.0"
+
+"@babel/helper-function-name@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz#ab6e041e7135d436d8f0a3eca15de5b67a341a2e"
+  integrity sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.7.4"
+    "@babel/template" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
+"@babel/helper-get-function-arity@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz#cb46348d2f8808e632f0ab048172130e636005f0"
+  integrity sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==
+  dependencies:
+    "@babel/types" "^7.7.4"
+
+"@babel/helper-split-export-declaration@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz#57292af60443c4a3622cf74040ddc28e68336fd8"
+  integrity sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==
+  dependencies:
+    "@babel/types" "^7.7.4"
+
+"@babel/helpers@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.7.4.tgz#62c215b9e6c712dadc15a9a0dcab76c92a940302"
+  integrity sha512-ak5NGZGJ6LV85Q1Zc9gn2n+ayXOizryhjSUBTdu5ih1tlVCJeuQENzc4ItyCVhINVXvIT/ZQ4mheGIsfBkpskg==
+  dependencies:
+    "@babel/template" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
+"@babel/highlight@^7.0.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz#56d11312bd9248fa619591d02472be6e8cb32540"
+  integrity sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.7.4", "@babel/parser@^7.7.5":
+  version "7.7.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.5.tgz#cbf45321619ac12d83363fcf9c94bb67fa646d71"
+  integrity sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==
+
+"@babel/template@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.4.tgz#428a7d9eecffe27deac0a98e23bf8e3675d2a77b"
+  integrity sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/parser" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
+"@babel/traverse@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.4.tgz#9c1e7c60fb679fe4fcfaa42500833333c2058558"
+  integrity sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==
+  dependencies:
+    "@babel/code-frame" "^7.5.5"
+    "@babel/generator" "^7.7.4"
+    "@babel/helper-function-name" "^7.7.4"
+    "@babel/helper-split-export-declaration" "^7.7.4"
+    "@babel/parser" "^7.7.4"
+    "@babel/types" "^7.7.4"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.13"
+
+"@babel/types@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193"
+  integrity sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.17.13"
+    to-fast-properties "^2.0.0"
+
+"@ng-bootstrap/ng-bootstrap@^5.1.4":
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-5.1.4.tgz#1ace4d4a7b80017fb1c55547a5569993b4742b5d"
+  integrity sha512-UtL9GBkAMy0O/0Rkc4DG1WoFDWhAnAdvsQuJ1IFLmlN2v6HAX+E84tgUK0n15WLBhYBXXuhRx0dIW2jafjg1xQ==
  dependencies:
    tslib "^1.9.0"

@@ -151,6 +262,11 @@ ansi-regex@^3.0.0:
  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=

+ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+
 ansi-regex@^5.0.0:
  version "5.0.0"
  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
@@ -384,7 +500,7 @@ caseless@~0.12.0:
  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=

-chalk@^2.0.1:
+chalk@^2.0.0, chalk@^2.0.1:
  version "2.4.2"
  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -569,6 +685,13 @@ console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-
  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=

+convert-source-map@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
+  dependencies:
+    safe-buffer "~5.1.1"
+
 copy-concurrently@^1.0.0:
  version "1.0.5"
  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
@@ -602,6 +725,17 @@ cross-spawn@^5.0.1:
    shebang-command "^1.2.0"
    which "^1.2.9"

+cross-spawn@^6.0.0:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
 crypto-random-string@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
@@ -640,7 +774,7 @@ debug@^3.1.0:
  dependencies:
    ms "^2.1.1"

-debug@^4.1.1:
+debug@^4.1.0, debug@^4.1.1:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -812,6 +946,11 @@ electron-updater@^4.2.0:
    pako "^1.0.10"
    semver "^6.3.0"

+emoji-regex@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+
 emoji-regex@^8.0.0:
  version "8.0.0"
  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -877,6 +1016,11 @@ esprima@^4.0.0:
  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==

+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
 execa@^0.7.0:
  version "0.7.0"
  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
@@ -890,6 +1034,19 @@ execa@^0.7.0:
    signal-exit "^3.0.0"
    strip-eof "^1.0.0"

+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
 expand-template@^2.0.3:
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
@@ -1117,6 +1274,18 @@ github-from-package@0.0.0:
  resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
  integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=

+glob@7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+  integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@^7.0.3, glob@^7.1.1, glob@^7.1.3:
  version "7.1.4"
  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
@@ -1136,6 +1305,11 @@ global-dirs@^0.1.0:
  dependencies:
    ini "^1.3.4"

+globals@^11.1.0:
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
+
 got@^6.7.1:
  version "6.7.1"
  resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
@@ -1314,6 +1488,11 @@ invert-kv@^1.0.0:
  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=

+invert-kv@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
+  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
+
 ip-regex@^2.1.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
@@ -1420,6 +1599,11 @@ isstream@~0.1.2:
  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=

+js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
 js-yaml@3.13.1, js-yaml@^3.13.1:
  version "3.13.1"
  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
@@ -1433,6 +1617,11 @@ jsbn@~0.1.0:
  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=

+jsesc@^2.5.1:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
+
 json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
@@ -1453,6 +1642,13 @@ json-stringify-safe@~5.0.1:
  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=

+json5@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.1.tgz#81b6cb04e9ba496f1c7005d07b4368a2638f90b6"
+  integrity sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==
+  dependencies:
+    minimist "^1.2.0"
+
 jsonfile@^4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -1485,10 +1681,10 @@ keyboardevents-areequal@^0.2.1:
  resolved "https://registry.yarnpkg.com/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz#88191ec738ce9f7591c25e9056de928b40277194"
  integrity sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw==

-keytar@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/keytar/-/keytar-5.2.0.tgz#7543190be98e2a751466096ce3ca1b1a4b8f39fe"
-  integrity sha512-vsIX6n2BgTwzbKOSPIiJ8YduwHlPEE/G5dkmZWXaQK9qiGZMQyhxlFA4O6vrvM5fsXTMgUOrODYAqgpfNSRLDw==
+keytar@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/keytar/-/keytar-5.0.0.tgz#c89b6b7a4608fd7af633d9f8474b1a7eb97cbe6f"
+  integrity sha512-a5UheK59YOlJf9i+2Osaj/kkH6mK0RCHVMtJ84u6ZfbfRIbOJ/H4b5VlOF/LgNHF6s78dRSBzZnvIuPiBKv6wg==
  dependencies:
    nan "2.14.0"
    prebuild-install "5.3.3"
@@ -1517,6 +1713,13 @@ lcid@^1.0.0:
  dependencies:
    invert-kv "^1.0.0"

+lcid@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
+  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
+  dependencies:
+    invert-kv "^2.0.0"
+
 libcipm@^3.0.3:
  version "3.0.3"
  resolved "https://registry.yarnpkg.com/libcipm/-/libcipm-3.0.3.tgz#2e764effe0b90d458790dab3165794c804075ed3"
@@ -1732,6 +1935,11 @@ lodash.without@~4.4.0:
  resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac"
  integrity sha1-PNRXSgC2e643OpS3SHcmQFB7eqw=

+lodash@^4.17.13:
+  version "4.17.15"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
+  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+
 lowercase-keys@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
@@ -1783,6 +1991,13 @@ make-fetch-happen@^4.0.1:
    socks-proxy-agent "^4.0.0"
    ssri "^6.0.0"

+map-age-cleaner@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
+  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
+  dependencies:
+    p-defer "^1.0.0"
+
 meant@~1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/meant/-/meant-1.0.1.tgz#66044fea2f23230ec806fb515efea29c44d2115d"
@@ -1795,6 +2010,15 @@ mem@^1.1.0:
  dependencies:
    mimic-fn "^1.0.0"

+mem@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
+  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
+  dependencies:
+    map-age-cleaner "^0.1.1"
+    mimic-fn "^2.0.0"
+    p-is-promise "^2.0.0"
+
 mime-db@1.40.0:
  version "1.40.0"
  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
@@ -1812,6 +2036,11 @@ mimic-fn@^1.0.0:
  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==

+mimic-fn@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
 mimic-response@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.0.0.tgz#996a51c60adf12cb8a87d7fb8ef24c2f3d5ebb46"
@@ -1918,17 +2147,22 @@ napi-build-utils@^1.0.1:
  resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.1.tgz#1381a0f92c39d66bf19852e7873432fc2123e508"
  integrity sha512-boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA==

-ngx-toastr@^10.2.0:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/ngx-toastr/-/ngx-toastr-10.2.0.tgz#8a79008de0b1c013f90120a53e0355af5762e969"
-  integrity sha512-6ASr5bcvQmtNKb4D2VEsQjCXyROq6GwberBWO0bVt+xcBYPUea4aRTgX8in9apX9buaTafzG+h3HlnIraspoPg==
+ngx-toastr@^11.2.1:
+  version "11.2.1"
+  resolved "https://registry.yarnpkg.com/ngx-toastr/-/ngx-toastr-11.2.1.tgz#130dcb416499f4419b18c39ad9cfea2e7790c7c4"
+  integrity sha512-qLZA+h1lIGLQ1HAJpx5JJ8i87PAZPAN6MnexmrWipSONqrK4fRh+nUKIxqmcckIiD16dgu2O5SNloSJymTKUAw==
  dependencies:
    tslib "^1.9.0"

-node-abi@^2.15.0, node-abi@^2.7.0:
-  version "2.15.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.15.0.tgz#51d55cc711bd9e4a24a572ace13b9231945ccb10"
-  integrity sha512-FeLpTS0F39U7hHZU1srAK4Vx+5AHNVOTP+hxBNQknR/54laTHSFIJkDWDqiquY1LeLUgTfPN7sLPhMubx0PLAg==
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+
+node-abi@^2.13.0, node-abi@^2.7.0:
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.13.0.tgz#e2f2ec444d0aca3ea1b3874b6de41d1665828f63"
+  integrity sha512-9HrZGFVTR5SOu3PZAnAY2hLO36aW1wmA+FDsVkr85BTST32TLCA1H/AEcatVRAsWLyXS3bqUDYCAjq5/QGuSTA==
  dependencies:
    semver "^5.4.1"

@@ -2282,6 +2516,15 @@ os-locale@^2.0.0:
    lcid "^1.0.0"
    mem "^1.1.0"

+os-locale@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
+  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
+  dependencies:
+    execa "^1.0.0"
+    lcid "^2.0.0"
+    mem "^4.0.0"
+
 os-tmpdir@^1.0.0:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -2295,11 +2538,21 @@ osenv@0, osenv@^0.1.4, osenv@^0.1.5:
    os-homedir "^1.0.0"
    os-tmpdir "^1.0.0"

+p-defer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
+
 p-finally@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=

+p-is-promise@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
+  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
+
 p-limit@^1.1.0:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
@@ -2429,7 +2682,7 @@ path-is-inside@^1.0.1, path-is-inside@^1.0.2, path-is-inside@~1.0.2:
  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=

-path-key@^2.0.0:
+path-key@^2.0.0, path-key@^2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
@@ -2777,6 +3030,13 @@ resolve@^1.10.0:
  dependencies:
    path-parse "^1.0.6"

+resolve@^1.3.2:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.0.tgz#6d14c6f9db9f8002071332b600039abf82053f64"
+  integrity sha512-uviWSi5N67j3t3UKFxej1loCH0VZn5XuqdNxoLShPcYPw6cUZn74K1VRj+9myynRX03bxIBEkwlkob/ujLsJVw==
+  dependencies:
+    path-parse "^1.0.6"
+
 retry@^0.10.0:
  version "0.10.1"
  resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
@@ -2801,15 +3061,15 @@ run-queue@^1.0.0, run-queue@^1.0.3:
  dependencies:
    aproba "^1.1.1"

-rxjs-compat@^6.5.4:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.5.4.tgz#03825692af3fe363e04c43f41ff4113d76bbd305"
-  integrity sha512-rkn+lbOHUQOurdd74J/hjmDsG9nFx0z66fvnbs8M95nrtKvNqCKdk7iZqdY51CGmDemTQk+kUPy4s8HVOHtkfA==
+rxjs-compat@^6.5.3:
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.5.3.tgz#18440949b2678bf87a78a754009676b2c49183dc"
+  integrity sha512-BIJX2yovz3TBpjJoAZyls2QYuU6ZiCaZ+U96SmxQpuSP/qDUfiXPKOVLbThBB2WZijNHkdTTJXKRwvv5Y48H7g==

-rxjs@^6.5.4:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c"
-  integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==
+rxjs@^6.5.3:
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"
+  integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==
  dependencies:
    tslib "^1.9.0"

@@ -2938,6 +3198,11 @@ sorted-union-stream@~2.1.3:
    from2 "^1.3.0"
    stream-iterate "^1.1.0"

+source-map@^0.5.0:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+
 spdx-correct@^3.0.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
@@ -3039,6 +3304,15 @@ string-width@^1.0.1:
    is-fullwidth-code-point "^2.0.0"
    strip-ansi "^4.0.0"

+string-width@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+  dependencies:
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.1.0"
+
 string-width@^4.1.0, string-width@^4.2.0:
  version "4.2.0"
  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
@@ -3086,6 +3360,13 @@ strip-ansi@^4.0.0:
  dependencies:
    ansi-regex "^3.0.0"

+strip-ansi@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+  dependencies:
+    ansi-regex "^4.1.0"
+
 strip-ansi@^6.0.0:
  version "6.0.0"
  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
@@ -3202,6 +3483,11 @@ tiny-relative-date@^1.3.0:
  resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07"
  integrity sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A==

+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+
 tough-cookie@~2.4.3:
  version "2.4.3"
  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
@@ -3397,10 +3683,10 @@ windows-blurbehind@^1.0.1:
  resolved "https://registry.yarnpkg.com/windows-blurbehind/-/windows-blurbehind-1.0.1.tgz#ff098713873304e38330b2c54cc41bb369b587b9"
  integrity sha512-1HzHfCiM1ayrbACJu5qE9zELV24uX/tINT6kxaZwLY3rtQAoeav6x9z7LFHWoLaGDN/sYbnK+9Vk0cz7fsk5HQ==

-windows-native-registry@^1.0.17:
-  version "1.0.17"
-  resolved "https://registry.yarnpkg.com/windows-native-registry/-/windows-native-registry-1.0.17.tgz#d8cce48b364703a55c226690431b325114405022"
-  integrity sha512-u9Fp9TyDo5dvhlW6hYBOdHPETtAahXKxo3jeW5EXwNK7qa+nSNopQycN1drtBVWe3jpJXvyKpt9zrjiDd+u4JQ==
+windows-native-registry@^1.0.16:
+  version "1.0.16"
+  resolved "https://registry.yarnpkg.com/windows-native-registry/-/windows-native-registry-1.0.16.tgz#761f21b7dfa6cdb28479cf9bc66b705592e3ae6a"
+  integrity sha512-RROB5VPEafEJLK93vdttfq4BGWaMWI/OHjAE2cqA31eMjmPShD2KaerlhEfUgqa5THsaAbYUK0LQKc4UQTjIMg==
  dependencies:
    nan "^2.14.0"

@@ -3486,6 +3772,14 @@ yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
  integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==

+yargs-parser@^13.0.0:
+  version "13.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
+  integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 yargs-parser@^16.1.0:
  version "16.1.0"
  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-16.1.0.tgz#73747d53ae187e7b8dbe333f95714c76ea00ecf1"
@@ -3501,6 +3795,23 @@ yargs-parser@^9.0.2:
  dependencies:
    camelcase "^4.1.0"

+yargs@13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.1.0.tgz#b2729ce4bfc0c584939719514099d8a916ad2301"
+  integrity sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==
+  dependencies:
+    cliui "^4.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    os-locale "^3.1.0"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.0.0"
+
 yargs@^11.0.0:
  version "11.1.0"
  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
@@ -3519,10 +3830,10 @@ yargs@^11.0.0:
    y18n "^3.2.1"
    yargs-parser "^9.0.2"

-yargs@^15.1.0:
-  version "15.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.1.0.tgz#e111381f5830e863a89550bd4b136bb6a5f37219"
-  integrity sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==
+yargs@^15.0.2:
+  version "15.0.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.0.2.tgz#4248bf218ef050385c4f7e14ebdf425653d13bd3"
+  integrity sha512-GH/X/hYt+x5hOat4LMnCqMd8r5Cv78heOMIJn1hr7QPPBqfeC6p89Y78+WB9yGDvfpCvgasfmWLzNzEioOUD9Q==
  dependencies:
    cliui "^6.0.0"
    decamelize "^1.2.0"
@@ -3536,7 +3847,7 @@ yargs@^15.1.0:
    y18n "^4.0.0"
    yargs-parser "^16.1.0"

-zone.js@^0.8.29:
-  version "0.8.29"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.29.tgz#8dce92aa0dd553b50bc5bfbb90af9986ad845a12"
-  integrity sha512-mla2acNCMkWXBD+c+yeUrBUrzOxYMNFdQ6FGfigGGtEVBPJx07BQeJekjt9DmH1FtZek4E9rE1eRR9qQpxACOQ==
+zone.js@^0.10.2:
+  version "0.10.2"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.10.2.tgz#67ca084b3116fc33fc40435e0d5ea40a207e392e"
+  integrity sha512-UAYfiuvxLN4oyuqhJwd21Uxb4CNawrq6fPS/05Su5L4G+1TN+HVDJMUHNMobVQDFJRir2cLAODXwluaOKB7HFg==
--- a/build/linux/after-install.tpl
+++ b/build/linux/after-install.tpl
@@ -1,7 +1,4 @@
 #!/bin/bash
-cat > '/usr/bin/${executable}' << END
-#!/bin/sh
-'/opt/${productFilename}/${executable}' --no-sandbox $@
-END

-chmod +x '/usr/bin/${executable}'
+# Link to the binary
+ln -sf '/opt/${productFilename}/${executable}' '/usr/bin/${executable}'
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -1,60 +0,0 @@
---
-appId: org.terminus
-productName: Terminus
-compression: normal
-afterSign: "./build/mac/afterSignHook.js"
-files:
- "**/*"
- dist
-extraResources:
- builtin-plugins
- extras
-publish:
- provider: github
-
-win:
-  icon: "./build/windows/icon.ico"
-  artifactName: terminus-${version}-portable.${ext}
-  rfc3161TimeStampServer: http://sha256timestamp.ws.symantec.com/sha256/timestamp
-nsis:
-  oneClick: false
-  artifactName: terminus-${version}-setup.${ext}
-  installerIcon: "./build/windows/icon.ico"
-
-mac:
-  category: public.app-category.video
-  icon: "./build/mac/icon.icns"
-  artifactName: terminus-${version}-macos.${ext}
-  hardenedRuntime: true
-  entitlements: "./build/mac/entitlements.plist"
-  entitlementsInherit: "./build/mac/entitlements.plist"
-  extendInfo:
-    NSRequiresAquaSystemAppearance: false
-pkg:
-  artifactName: terminus-${version}-macos.pkg
-
-linux:
-  category: Utilities
-  icon: "./build/icons"
-  artifactName: terminus-${version}-linux.${ext}
-  executableArgs:
-  - "--no-sandbox"
-snap:
-  plugs:
-  - default
-  - system-files
-  - system-observe
-deb:
-  depends:
-  - gconf2
-  - gconf-service
-  - libnotify4
-  - libsecret-1-0
-  - libappindicator1
-  - libxtst6
-  - libnss3
-  afterInstall: build/linux/after-install.tpl
-rpm:
-  depends:
-  - screen
-  - gnome-python2-gnomekeyring
--- a/package.json
+++ b/package.json
@@ -1,34 +1,38 @@
 {
  "devDependencies": {
-    "@fortawesome/fontawesome-free": "^5.12.1",
+    "@angular/compiler": "9.0.0-rc.5",
+    "@angular/compiler-cli": "9.0.0-rc.5",
+    "@angular/core": "9.0.0-rc.5",
+    "@fortawesome/fontawesome-free": "^5.11.2",
+    "@ngtools/webpack": "9.0.0-rc.5",
    "@sentry/cli": "^1.49.0",
    "@sentry/electron": "^1.0.0",
    "@types/electron-config": "^3.2.2",
    "@types/electron-debug": "^2.1.0",
    "@types/js-yaml": "^3.12.1",
    "@types/node": "12.7.12",
-    "@types/webpack-env": "1.15.0",
-    "@typescript-eslint/eslint-plugin": "^2.13.0",
-    "@typescript-eslint/parser": "^2.19.2",
+    "@types/webpack-env": "1.14.1",
+    "@typescript-eslint/eslint-plugin": "^2.9.0",
+    "@typescript-eslint/parser": "^2.10.0",
    "apply-loader": "2.0.0",
    "awesome-typescript-loader": "^5.0.0",
-    "core-js": "^3.6.4",
-    "cross-env": "7.0.0",
-    "css-loader": "3.4.2",
-    "electron": "^8.0.0",
-    "electron-builder": "22.3.2",
+    "core-js": "^3.4.2",
+    "cross-env": "6.0.3",
+    "css-loader": "3.4.0",
+    "electron": "^7.1.3",
+    "electron-builder": "22.1.0",
    "electron-download": "^4.1.1",
-    "electron-installer-snap": "^5.0.0",
+    "electron-installer-snap": "^4.1.0",
    "electron-notarize": "^0.1.1",
-    "electron-rebuild": "^1.9.0",
-    "eslint": "^6.8.0",
-    "eslint-plugin-import": "^2.20.0",
+    "electron-rebuild": "^1.8.5",
+    "eslint": "^6.7.1",
+    "eslint-plugin-import": "^2.18.2",
    "file-loader": "^5.0.2",
    "graceful-fs": "^4.2.2",
    "html-loader": "0.5.5",
    "json-loader": "0.5.7",
-    "node-abi": "^2.15.0",
-    "node-gyp": "^6.1.0",
+    "node-abi": "^2.12.0",
+    "node-gyp": "^6.0.1",
    "node-sass": "^4.13.0",
    "npmlog": "4.1.2",
    "npx": "^10.2.0",
@@ -42,20 +46,89 @@
    "shelljs": "0.8.3",
    "source-code-pro": "^2.30.2",
    "source-sans-pro": "3.6.0",
-    "style-loader": "^1.1.3",
+    "style-loader": "^1.0.1",
    "svg-inline-loader": "^0.8.0",
    "to-string-loader": "1.1.6",
    "tslib": "^1.10.0",
-    "typedoc": "^0.16.7",
-    "typescript": "^3.7.5",
+    "typedoc": "^0.15.3",
+    "typescript": "^3.7.3",
    "url-loader": "^3.0.0",
    "val-loader": "2.1.0",
-    "webpack": "^5.0.0-beta.12",
+    "webpack": "4",
    "webpack-cli": "^3.3.10",
    "yaml-loader": "0.5.0"
  },
  "resolutions": {
-    "*/node-abi": "^2.14.0"
+    "*/node-abi": "^2.8.0"
+  },
+  "build": {
+    "appId": "org.terminus",
+    "productName": "Terminus",
+    "compression": "normal",
+    "afterSign": "./build/mac/afterSignHook.js",
+    "files": [
+      "**/*",
+      "dist"
+    ],
+    "extraResources": [
+      "builtin-plugins",
+      "extras"
+    ],
+    "win": {
+      "icon": "./build/windows/icon.ico",
+      "artifactName": "terminus-${version}-setup.exe",
+      "rfc3161TimeStampServer": "http://sha256timestamp.ws.symantec.com/sha256/timestamp"
+    },
+    "nsis": {
+      "oneClick": false,
+      "artifactName": "terminus-${version}-setup.${ext}",
+      "installerIcon": "./build/windows/icon.ico"
+    },
+    "publish": [
+      {
+        "provider": "github"
+      }
+    ],
+    "portable": {
+      "artifactName": "terminus-${version}-portable.exe"
+    },
+    "mac": {
+      "category": "public.app-category.video",
+      "icon": "./build/mac/icon.icns",
+      "artifactName": "terminus-${version}-macos.${ext}",
+      "hardenedRuntime": true,
+      "entitlements": "./build/mac/entitlements.plist",
+      "entitlementsInherit": "./build/mac/entitlements.plist",
+      "extendInfo": {
+        "NSRequiresAquaSystemAppearance": false
+      }
+    },
+    "pkg": {
+      "artifactName": "terminus-${version}-macos.pkg"
+    },
+    "linux": {
+      "category": "Utilities",
+      "icon": "./build/icons",
+      "artifactName": "terminus-${version}-linux.${ext}"
+    },
+    "deb": {
+      "depends": [
+        "gconf2",
+        "gconf-service",
+        "libnotify4",
+        "libsecret-1-0",
+        "libappindicator1",
+        "libxtst6",
+        "libnss3"
+      ],
+      "afterInstall": "build/linux/after-install.tpl"
+    },
+    "rpm": {
+      "depends": [
+        "screen",
+        "gnome-python2-gnomekeyring"
+      ]
+    }
  },
  "scripts": {
    "build": "npm run build:typings && webpack --color --config app/webpack.main.config.js && webpack --color --config app/webpack.config.js && webpack --color --config terminus-core/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-terminal/webpack.config.js && webpack --color --config terminus-plugin-manager/webpack.config.js && webpack --color --config terminus-community-color-schemes/webpack.config.js && webpack --color --config terminus-ssh/webpack.config.js",
@@ -64,7 +137,7 @@
    "start": "cross-env TERMINUS_DEV=1 electron app --debug",
    "prod": "cross-env TERMINUS_DEV=1 electron app",
    "docs": "typedoc --out docs/api terminus-core/src && typedoc --out docs/api/terminal --tsconfig terminus-terminal/tsconfig.typings.json terminus-terminal/src && typedoc --out docs/api/settings --tsconfig terminus-settings/tsconfig.typings.json terminus-settings/src",
-    "lint": "eslint --ext ts */src */lib",
+    "lint": "eslint --ext ts */src",
    "postinstall": "node ./scripts/install-deps.js"
  },
  "repository": "eugeny/terminus"
--- a/scripts/build-windows.js
+++ b/scripts/build-windows.js
@@ -7,7 +7,7 @@ const isCI = !!process.env.GITHUB_REF

 builder({
    dir: true,
-    win: ['nsis', 'zip'],
+    win: ['nsis', 'portable'],
    config: {
        extraMetadata: {
            version: vars.version,
--- a/scripts/vars.js
+++ b/scripts/vars.js
@@ -22,8 +22,4 @@ exports.builtinPlugins = [
  'terminus-plugin-manager',
  'terminus-ssh',
 ]
-exports.bundledModules = [
-  '@angular',
-  '@ng-bootstrap',
-]
 exports.electronVersion = electronInfo.version
--- a/terminus-community-color-schemes/package.json
+++ b/terminus-community-color-schemes/package.json
@@ -1,6 +1,6 @@
 {
  "name": "terminus-community-color-schemes",
-  "version": "1.0.99-nightly.0",
+  "version": "1.0.98-nightly.0",
  "description": "Community color schemes for Terminus",
  "keywords": [
    "terminus-builtin-plugin"
--- a/terminus-core/package.json
+++ b/terminus-core/package.json
@@ -1,6 +1,6 @@
 {
  "name": "terminus-core",
-  "version": "1.0.99-nightly.0",
+  "version": "1.0.98-nightly.0",
  "description": "Terminus core",
  "keywords": [
    "terminus-builtin-plugin"
--- a/terminus-core/src/api/index.ts
+++ b/terminus-core/src/api/index.ts
@@ -1,5 +1,4 @@
 export { BaseTabComponent, BaseTabProcess } from '../components/baseTab.component'
-export { TabHeaderComponent } from '../components/tabHeader.component'
 export { SplitTabComponent, SplitContainer } from '../components/splitTab.component'
 export { TabRecoveryProvider, RecoveredTab } from './tabRecovery'
 export { ToolbarButtonProvider, ToolbarButton } from './toolbarButtonProvider'
@@ -19,4 +18,3 @@ export { HostAppService, Platform } from '../services/hostApp.service'
 export { ShellIntegrationService } from '../services/shellIntegration.service'
 export { ThemesService } from '../services/themes.service'
 export { TabsService } from '../services/tabs.service'
-export * from '../utils'
--- a/terminus-core/src/components/appRoot.component.pug
+++ b/terminus-core/src/components/appRoot.component.pug
@@ -10,8 +10,8 @@ title-bar(
        .inset.background(*ngIf='hostApp.platform == Platform.macOS && config.store.appearance.frame == "thin" && config.store.appearance.tabsLocation == "top"')
        .tabs(
            dnd-sortable-container,
-            [sortableData]='app.tabs',
        )
+            //- [sortableData]='app.tabs',
            tab-header(
                *ngFor='let tab of app.tabs; let idx = index',
                dnd-sortable,
@@ -38,7 +38,7 @@ title-bar(
                button.btn.btn-secondary.btn-tab-bar(
                    [title]='button.title',
                    (click)='button.click && button.click()',
-                    [fastHtmlBind]='button.icon',
+                    [innerHTML]='sanitizeIcon(button.icon)',
                    ngbDropdownToggle,
                )
                div(*ngIf='button.submenu', ngbDropdownMenu)
@@ -49,7 +49,7 @@ title-bar(
                    )
                        .icon-wrapper(
                            *ngIf='hasIcons(button.submenuItems)',
-                            [fastHtmlBind]='item.icon'
+                            [innerHTML]='sanitizeIcon(item.icon)'
                        )
                        div([class.ml-3]='hasIcons(button.submenuItems)') {{item.title}}

@@ -64,7 +64,7 @@ title-bar(
                button.btn.btn-secondary.btn-tab-bar(
                    [title]='button.title',
                    (click)='button.click && button.click()',
-                    [fastHtmlBind]='button.icon',
+                    [innerHTML]='sanitizeIcon(button.icon)',
                    ngbDropdownToggle,
                )
                div(*ngIf='button.submenu', ngbDropdownMenu)
@@ -75,7 +75,7 @@ title-bar(
                    )
                        .icon-wrapper(
                            *ngIf='hasIcons(button.submenuItems)',
-                            [fastHtmlBind]='item.icon'
+                            [innerHTML]='sanitizeIcon(item.icon)'
                        )
                        div([class.ml-3]='hasIcons(button.submenuItems)') {{item.title}}

@@ -83,7 +83,7 @@ title-bar(
                *ngIf='updatesAvailable',
                title='Update available - Click to install',
                (click)='updateApp()',
-                [fastHtmlBind]='updateIcon'
+                [innerHTML]='sanitizeIcon(updateIcon)'
            )

        window-controls.background(
--- a/terminus-core/src/components/appRoot.component.scss
+++ b/terminus-core/src/components/appRoot.component.scss
@@ -64,7 +64,6 @@ $tab-border-radius: 4px;
    &>.drag-space {
        min-width: 1px;
        flex: 1 0 1%;
-        margin-top: 2px; // for window resizing
        -webkit-app-region: drag;

        &.persistent {
--- a/terminus-core/src/components/appRoot.component.ts
+++ b/terminus-core/src/components/appRoot.component.ts
@@ -1,5 +1,6 @@
 import { Component, Inject, Input, HostListener, HostBinding } from '@angular/core'
 import { trigger, style, animate, transition, state } from '@angular/animations'
+import { DomSanitizer } from '@angular/platform-browser'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'

 import { ElectronService } from '../services/electron.service'
@@ -19,8 +20,8 @@ import { AppService, ToolbarButton, ToolbarButtonProvider } from '../api'
 /** @hidden */
@Component({
    selector: 'app-root',
-    template: require('./appRoot.component.pug'),
-    styles: [require('./appRoot.component.scss')],
+    templateUrl: './appRoot.component.pug',
+    styleUrls: ['./appRoot.component.scss'],
    animations: [
        trigger('animateTab', [
            state('in', style({
@@ -74,6 +75,7 @@ export class AppRootComponent {
        public hostApp: HostAppService,
        public config: ConfigService,
        public app: AppService,
+        private domSanitizer: DomSanitizer,
        @Inject(ToolbarButtonProvider) private toolbarButtonProviders: ToolbarButtonProvider[],
        log: LogService,
        ngbModal: NgbModal,
@@ -107,12 +109,6 @@ export class AppRootComponent {
                if (hotkey === 'previous-tab') {
                    this.app.previousTab()
                }
-                if (hotkey === 'move-tab-left') {
-                    this.app.moveSelectedTabLeft()
-                }
-                if (hotkey === 'move-tab-right') {
-                    this.app.moveSelectedTabRight()
-                }
            }
            if (hotkey === 'toggle-fullscreen') {
                this.hostApp.toggleFullscreen()
@@ -190,7 +186,6 @@ export class AppRootComponent {
            if (this.config.store.appearance.dock === 'off') {
                // not docked, visible
                setTimeout(() => {
-                    this.hostApp.getWindow().show()
                    this.hostApp.getWindow().focus()
                })
            } else {
@@ -259,6 +254,10 @@ export class AppRootComponent {
        return submenuItems.some(x => !!x.icon)
    }

+    sanitizeIcon (icon: string): any {
+        return this.domSanitizer.bypassSecurityTrustHtml(icon || '')
+    }
+
    private getToolbarButtons (aboveZero: boolean): ToolbarButton[] {
        let buttons: ToolbarButton[] = []
        this.config.enabledServices(this.toolbarButtonProviders).forEach(provider => {
--- a/terminus-core/src/components/baseTab.component.ts
+++ b/terminus-core/src/components/baseTab.component.ts
@@ -38,7 +38,7 @@ export abstract class BaseTabComponent {
     */
    color: string|null = null

-    hasFocus = false
+    protected hasFocus = false

    /**
     * Ping this if your recovery state has been changed and you want
--- a/terminus-core/src/components/renameTabModal.component.ts
+++ b/terminus-core/src/components/renameTabModal.component.ts
@@ -4,7 +4,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 /** @hidden */
@Component({
    selector: 'rename-tab-modal',
-    template: require('./renameTabModal.component.pug'),
+    templateUrl: './renameTabModal.component.pug',
 })
 export class RenameTabModalComponent {
    @Input() value: string
--- a/terminus-core/src/components/safeModeModal.component.ts
+++ b/terminus-core/src/components/safeModeModal.component.ts
@@ -3,7 +3,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'

 /** @hidden */
@Component({
-    template: require('./safeModeModal.component.pug'),
+    templateUrl: './safeModeModal.component.pug',
 })
 export class SafeModeModalComponent {
    @Input() error: Error
--- a/terminus-core/src/components/splitTab.component.scss
+++ b/terminus-core/src/components/splitTab.component.scss
@@ -3,24 +3,3 @@
    position: relative;
    flex: auto;
 }
-
-::ng-deep split-tab > .child {
-    position: absolute;
-    transition: 0.125s all;
-    opacity: .75;
-
-    &.focused {
-        opacity: 1;
-    }
-
-    &.minimized {
-        opacity: .1;
-    }
-
-    &.maximized {
-        z-index: 2;
-        box-shadow: rgba(0, 0, 0, 0.25) 0px 0px 30px;
-        backdrop-filter: blur(10px);
-        border-radius: 10px;
-    }
-}
--- a/terminus-core/src/components/splitTab.component.ts
+++ b/terminus-core/src/components/splitTab.component.ts
@@ -138,11 +138,9 @@ export interface SplitSpannerInfo {
            (change)='onSpannerAdjusted(spanner)'
        ></split-tab-spanner>
    `,
-    styles: [require('./splitTab.component.scss')],
+    styleUrls: ['./splitTab.component.scss'],
 })
 export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDestroy {
-    static DIRECTIONS: SplitDirection[] = ['t', 'r', 'b', 'l']
-
    /** @hidden */
    @ViewChild('vc', { read: ViewContainerRef }) viewContainer: ViewContainerRef

@@ -158,7 +156,6 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
    _spanners: SplitSpannerInfo[] = []

    private focusedTab: BaseTabComponent
-    private maximizedTab: BaseTabComponent|null = null
    private hotkeysSubscription: Subscription
    private viewRefs: Map<BaseTabComponent, EmbeddedViewRef<any>> = new Map()

@@ -229,13 +226,6 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
                case 'pane-nav-down':
                    this.navigate('b')
                    break
-                case 'pane-maximize':
-                    if (this.maximizedTab) {
-                        this.maximize(null)
-                    } else if (this.getAllTabs().length > 1) {
-                        this.maximize(this.focusedTab)
-                    }
-                    break
                case 'close-pane':
                    this.removeTab(this.focusedTab)
                    break
@@ -271,10 +261,6 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
        return this.focusedTab
    }

-    getMaximizedTab (): BaseTabComponent|null {
-        return this.maximizedTab
-    }
-
    focus (tab: BaseTabComponent) {
        this.focusedTab = tab
        for (const x of this.getAllTabs()) {
@@ -286,15 +272,6 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
            tab.emitFocused()
            this.focusChanged.next(tab)
        }
-
-        if (this.maximizedTab !== tab) {
-            this.maximizedTab = null
-        }
-        this.layout()
-    }
-
-    maximize (tab: BaseTabComponent|null) {
-        this.maximizedTab = tab
        this.layout()
    }

@@ -459,13 +436,6 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
        this.splitAdjusted.next(spanner)
    }

-    destroy () {
-        super.destroy()
-        for (const x of this.getAllTabs()) {
-            x.destroy()
-        }
-    }
-
    private attachTabView (tab: BaseTabComponent) {
        const ref = this.viewContainer.insert(tab.hostView) as EmbeddedViewRef<any> // eslint-disable-line @typescript-eslint/no-unnecessary-type-assertion
        this.viewRefs.set(tab, ref)
@@ -516,21 +486,13 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
                this.layoutInternal(child, childX, childY, childW, childH)
            } else {
                const element = this.viewRefs.get(child)!.rootNodes[0]
-                element.classList.toggle('child', true)
-                element.classList.toggle('maximized', child === this.maximizedTab)
-                element.classList.toggle('minimized', this.maximizedTab && child !== this.maximizedTab)
-                element.classList.toggle('focused', child === this.focusedTab)
+                element.style.position = 'absolute'
                element.style.left = `${childX}%`
                element.style.top = `${childY}%`
                element.style.width = `${childW}%`
                element.style.height = `${childH}%`

-                if (child === this.maximizedTab) {
-                    element.style.left = '5%'
-                    element.style.top = '5%'
-                    element.style.width = '90%'
-                    element.style.height = '90%'
-                }
+                element.style.opacity = child === this.focusedTab ? 1 : 0.75
            }
            offset += sizes[i]

@@ -564,10 +526,6 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
                }
            }
        }
-        while (root.ratios.length < root.children.length) {
-            root.ratios.push(1)
-        }
-        root.normalize()
    }
 }

--- a/terminus-core/src/components/splitTabSpanner.component.ts
+++ b/terminus-core/src/components/splitTabSpanner.component.ts
@@ -5,7 +5,7 @@ import { SplitContainer } from './splitTab.component'
@Component({
    selector: 'split-tab-spanner',
    template: '',
-    styles: [require('./splitTabSpanner.component.scss')],
+    styleUrls: ['./splitTabSpanner.component.scss'],
 })
 export class SplitTabSpannerComponent {
    @Input() container: SplitContainer
@@ -16,17 +16,13 @@ export class SplitTabSpannerComponent {
    @HostBinding('class.v') isVertical = true
    @HostBinding('style.left') cssLeft: string
    @HostBinding('style.top') cssTop: string
-    @HostBinding('style.width') cssWidth: string | null
-    @HostBinding('style.height') cssHeight: string | null
+    @HostBinding('style.width') cssWidth: string
+    @HostBinding('style.height') cssHeight: string
    private marginOffset = -5

    constructor (private element: ElementRef) { }

    ngAfterViewInit () {
-        this.element.nativeElement.addEventListener('dblclick', () => {
-            this.reset()
-        })
-
        this.element.nativeElement.addEventListener('mousedown', (e: MouseEvent) => {
            this.isActive = true
            const start = this.isVertical ? e.pageY : e.pageX
@@ -53,16 +49,14 @@ export class SplitTabSpannerComponent {
                diff = Math.max(diff, -this.container.ratios[this.index - 1] + 0.1)
                diff = Math.min(diff, this.container.ratios[this.index] - 0.1)

-                if (diff) {
-                    this.container.ratios[this.index - 1] += diff
-                    this.container.ratios[this.index] -= diff
-                    this.change.emit()
-                }
+                this.container.ratios[this.index - 1] += diff
+                this.container.ratios[this.index] -= diff
+                this.change.emit()
            }

-            document.addEventListener('mouseup', offHandler, { passive: true })
+            document.addEventListener('mouseup', offHandler)
            this.element.nativeElement.parentElement.addEventListener('mousemove', dragHandler)
-        }, { passive: true })
+        })
    }

    ngOnChanges () {
@@ -85,17 +79,10 @@ export class SplitTabSpannerComponent {
        }
    }

-    reset () {
-        const ratio = (this.container.ratios[this.index - 1] + this.container.ratios[this.index]) / 2
-        this.container.ratios[this.index - 1] = ratio
-        this.container.ratios[this.index] = ratio
-        this.change.emit()
-    }
-
    private setDimensions (x: number, y: number, w: number, h: number) {
        this.cssLeft = `${x}%`
        this.cssTop = `${y}%`
-        this.cssWidth = w ? `${w}%` : null
-        this.cssHeight = h ? `${h}%` : null
+        this.cssWidth = w ? `${w}%` : 'initial'
+        this.cssHeight = h ? `${h}%` : 'initial'
    }
 }
--- a/terminus-core/src/components/startPage.component.ts
+++ b/terminus-core/src/components/startPage.component.ts
@@ -7,8 +7,8 @@ import { ToolbarButton, ToolbarButtonProvider } from '../api'
 /** @hidden */
@Component({
    selector: 'start-page',
-    template: require('./startPage.component.pug'),
-    styles: [require('./startPage.component.scss')],
+    templateUrl: './startPage.component.pug',
+    styleUrls: ['./startPage.component.scss'],
 })
 export class StartPageComponent {
    version: string
--- a/terminus-core/src/components/tabBody.component.ts
+++ b/terminus-core/src/components/tabBody.component.ts
@@ -10,9 +10,9 @@ import { BaseTabComponent } from '../components/baseTab.component'
        </perfect-scrollbar-->
        <ng-template #placeholder></ng-template>
    `,
-    styles: [
-        require('./tabBody.component.scss'),
-        require('./tabBody.deep.component.css'),
+    styleUrls: [
+        './tabBody.component.scss',
+        './tabBody.deep.component.css',
    ],
 })
 export class TabBodyComponent implements OnChanges {
--- a/terminus-core/src/components/tabHeader.component.scss
+++ b/terminus-core/src/components/tabHeader.component.scss
@@ -20,7 +20,7 @@ $tabs-height: 38px;
        cursor: -webkit-grab;

        margin-left: 10px;
-        width: 22px;
+        width: 20px;
        border-radius: 10px;
        text-align: center;
        transition: 0.25s all;
--- a/terminus-core/src/components/tabHeader.component.ts
+++ b/terminus-core/src/components/tabHeader.component.ts
@@ -17,8 +17,8 @@ export interface SortableComponentProxy {
 /** @hidden */
@Component({
    selector: 'tab-header',
-    template: require('./tabHeader.component.pug'),
-    styles: [require('./tabHeader.component.scss')],
+    templateUrl: './tabHeader.component.pug',
+    styleUrls: ['./tabHeader.component.scss'],
 })
 export class TabHeaderComponent {
    @Input() index: number
--- a/terminus-core/src/components/titleBar.component.ts
+++ b/terminus-core/src/components/titleBar.component.ts
@@ -1,9 +1,12 @@
 import { Component } from '@angular/core'
+import { HostAppService } from '../services/hostApp.service'

 /** @hidden */
@Component({
    selector: 'title-bar',
-    template: require('./titleBar.component.pug'),
-    styles: [require('./titleBar.component.scss')],
+    templateUrl: './titleBar.component.pug',
+    styleUrls: ['./titleBar.component.scss'],
 })
-export class TitleBarComponent { } // eslint-disable-line @typescript-eslint/no-extraneous-class
+export class TitleBarComponent {
+    constructor (public hostApp: HostAppService) { }
+}
--- a/terminus-core/src/components/toggle.component.ts
+++ b/terminus-core/src/components/toggle.component.ts
@@ -11,7 +11,7 @@ import { CheckboxComponent } from './checkbox.component'
      <label class="custom-control-label"></label>
    </div>
    `,
-    styles: [require('./toggle.component.scss')],
+    styleUrls: ['./toggle.component.scss'],
    providers: [
        { provide: NG_VALUE_ACCESSOR, useExisting: ToggleComponent, multi: true },
    ],
--- a/terminus-core/src/components/welcomeTab.component.ts
+++ b/terminus-core/src/components/welcomeTab.component.ts
@@ -6,8 +6,8 @@ import { AppService } from '../services/app.service'
 /** @hidden */
@Component({
    selector: 'welcome-page',
-    template: require('./welcomeTab.component.pug'),
-    styles: [require('./welcomeTab.component.scss')],
+    templateUrl: './welcomeTab.component.pug',
+    styleUrls: ['./welcomeTab.component.scss'],
 })
 export class WelcomeTabComponent extends BaseTabComponent {
    constructor (
--- a/terminus-core/src/components/windowControls.component.ts
+++ b/terminus-core/src/components/windowControls.component.ts
@@ -5,8 +5,8 @@ import { AppService } from '../services/app.service'
 /** @hidden */
@Component({
    selector: 'window-controls',
-    template: require('./windowControls.component.pug'),
-    styles: [require('./windowControls.component.scss')],
+    templateUrl: './windowControls.component.pug',
+    styleUrls: ['./windowControls.component.scss'],
 })
 export class WindowControlsComponent {
    constructor (public hostApp: HostAppService, public app: AppService) { }
--- a/terminus-core/src/configDefaults.linux.yaml
+++ b/terminus-core/src/configDefaults.linux.yaml
@@ -16,10 +16,6 @@ hotkeys:
  previous-tab:
    - 'Ctrl-Shift-Left'
    - 'Ctrl-Shift-Tab'
-  move-tab-left:
-    - 'Ctrl-Shift-PageUp'
-  move-tab-right:
-    - 'Ctrl-Shift-PageDown'
  tab-1:
    - 'Alt-1'
  tab-2:
@@ -54,7 +50,5 @@ hotkeys:
    - 'Ctrl-Alt-Up'
  pane-nav-left:
    - 'Ctrl-Alt-Left'
-  pane-maximize:
-    - 'Ctrl-Alt-Enter'
  close-pane: []
 pluginBlacklist: ['ssh']
--- a/terminus-core/src/configDefaults.macos.yaml
+++ b/terminus-core/src/configDefaults.macos.yaml
@@ -14,10 +14,6 @@ hotkeys:
    - 'Ctrl-Tab'
  previous-tab:
    - 'Ctrl-Shift-Tab'
-  move-tab-left:
-    - '⌘-Shift-Left'
-  move-tab-right:
-    - '⌘-Shift-Right'
  tab-1:
    - '⌘-1'
  tab-2:
@@ -52,8 +48,6 @@ hotkeys:
    - '⌘-⌥-Up'
  pane-nav-left:
    - '⌘-⌥-Left'
-  pane-maximize:
-    - '⌘-⌥-Enter'
  close-pane:
    - '⌘-Shift-W'
 pluginBlacklist: ['ssh']
--- a/terminus-core/src/configDefaults.windows.yaml
+++ b/terminus-core/src/configDefaults.windows.yaml
@@ -5,7 +5,6 @@ hotkeys:
    - 'Ctrl+Space'
  toggle-fullscreen:
    - 'F11'
-    - 'Alt-Enter'
  close-tab:
    - 'Ctrl-Shift-W'
  toggle-last-tab: []
@@ -17,10 +16,6 @@ hotkeys:
  previous-tab:
    - 'Ctrl-Shift-Left'
    - 'Ctrl-Shift-Tab'
-  move-tab-left:
-    - 'Ctrl-Shift-PageUp'
-  move-tab-right:
-    - 'Ctrl-Shift-PageDown'
  tab-1:
    - 'Alt-1'
  tab-2:
@@ -55,7 +50,5 @@ hotkeys:
    - 'Ctrl-Alt-Up'
  pane-nav-left:
    - 'Ctrl-Alt-Left'
-  pane-maximize:
-    - 'Ctrl-Alt-Enter'
  close-pane: []
 pluginBlacklist: []
--- a/terminus-core/src/configDefaults.yaml
+++ b/terminus-core/src/configDefaults.yaml
@@ -8,7 +8,7 @@ appearance:
  frame: thin
  css: '/* * { color: blue !important; } */'
  opacity: 1.0
-  vibrancy: true
+  vibrancy: false
  vibrancyType: 'blur'
 enableAnalytics: true
 enableWelcomeTab: true
--- a/terminus-core/src/directives/fastHtmlBind.directive.ts
+++ b/terminus-core/src/directives/fastHtmlBind.directive.ts
@@ -1,14 +0,0 @@
-import { Directive, Input, ElementRef, OnChanges } from '@angular/core'
-
-/** @hidden */
-@Directive({
-    selector: '[fastHtmlBind]',
-})
-export class FastHtmlBindDirective implements OnChanges {
-    @Input() fastHtmlBind: string
-    constructor (private el: ElementRef) { }
-
-    ngOnChanges () {
-        this.el.nativeElement.innerHTML = this.fastHtmlBind || ''
-    }
-}
--- a/terminus-core/src/hotkeys.ts
+++ b/terminus-core/src/hotkeys.ts
@@ -37,14 +37,6 @@ export class AppHotkeyProvider extends HotkeyProvider {
            id: 'previous-tab',
            name: 'Previous tab',
        },
-        {
-            id: 'move-tab-left',
-            name: 'Move tab to the left',
-        },
-        {
-            id: 'move-tab-right',
-            name: 'Move tab to the right',
-        },
        {
            id: 'tab-1',
            name: 'Tab 1',
@@ -101,10 +93,6 @@ export class AppHotkeyProvider extends HotkeyProvider {
            id: 'split-top',
            name: 'Split to the top',
        },
-        {
-            id: 'pane-maximize',
-            name: 'Maximize the active pane',
-        },
        {
            id: 'pane-nav-up',
            name: 'Focus the pane above',
--- a/terminus-core/src/index.ts
+++ b/terminus-core/src/index.ts
@@ -1,10 +1,11 @@
-import { NgModule, ModuleWithProviders } from '@angular/core'
+import { NgModule } from '@angular/core'
 import { BrowserModule } from '@angular/platform-browser'
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'
 import { FormsModule } from '@angular/forms'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { PerfectScrollbarModule, PERFECT_SCROLLBAR_CONFIG } from 'ngx-perfect-scrollbar'
-import { DndModule } from 'ng2-dnd'
+// import { DndModule } from 'ng2-dnd'

 import { AppRootComponent } from './components/appRoot.component'
 import { CheckboxComponent } from './components/checkbox.component'
@@ -21,12 +22,11 @@ import { SplitTabSpannerComponent } from './components/splitTabSpanner.component
 import { WelcomeTabComponent } from './components/welcomeTab.component'

 import { AutofocusDirective } from './directives/autofocus.directive'
-import { FastHtmlBindDirective } from './directives/fastHtmlBind.directive'

 import { HotkeyProvider } from './api/hotkeyProvider'
 import { ConfigProvider } from './api/configProvider'
 import { Theme } from './api/theme'
-import { TabContextMenuItemProvider } from './api/tabContextMenuProvider'
+// import { TabContextMenuItemProvider } from './api/tabContextMenuProvider'
 import { TabRecoveryProvider } from './api/tabRecovery'

 import { AppService } from './services/app.service'
@@ -35,7 +35,7 @@ import { ConfigService } from './services/config.service'
 import { StandardTheme, StandardCompactTheme, PaperTheme } from './theme'
 import { CoreConfigProvider } from './config'
 import { AppHotkeyProvider } from './hotkeys'
-import { TaskCompletionContextMenu, CommonOptionsContextMenu, CloseContextMenu } from './tabContextMenu'
+// import { TaskCompletionContextMenu, CommonOptionsContextMenu, CloseContextMenu } from './tabContextMenu'

 import 'perfect-scrollbar/css/perfect-scrollbar.css'
 import 'ng2-dnd/bundles/style.css'
@@ -52,9 +52,9 @@ const PROVIDERS = [
    { provide: Theme, useClass: StandardCompactTheme, multi: true },
    { provide: Theme, useClass: PaperTheme, multi: true },
    { provide: ConfigProvider, useClass: CoreConfigProvider, multi: true },
-    { provide: TabContextMenuItemProvider, useClass: CommonOptionsContextMenu, multi: true },
-    { provide: TabContextMenuItemProvider, useClass: CloseContextMenu, multi: true },
-    { provide: TabContextMenuItemProvider, useClass: TaskCompletionContextMenu, multi: true },
+    // { provide: TabContextMenuItemProvider, useClass: CommonOptionsContextMenu, multi: true },
+    // { provide: TabContextMenuItemProvider, useClass: CloseContextMenu, multi: true },
+    // { provide: TabContextMenuItemProvider, useClass: TaskCompletionContextMenu, multi: true },
    { provide: TabRecoveryProvider, useClass: SplitTabRecoveryProvider, multi: true },
    { provide: PERFECT_SCROLLBAR_CONFIG, useValue: { suppressScrollX: true } },
 ]
@@ -65,10 +65,11 @@ const PROVIDERS = [
        BrowserModule,
        BrowserAnimationsModule,
        FormsModule,
-        NgbModule.forRoot(),
+        NgbModule,
        PerfectScrollbarModule,
-        DndModule.forRoot(),
+        // DndModule,
    ],
+    providers: PROVIDERS,
    declarations: [
        AppRootComponent as any,
        CheckboxComponent,
@@ -81,7 +82,6 @@ const PROVIDERS = [
        RenameTabModalComponent,
        SafeModeModalComponent,
        AutofocusDirective,
-        FastHtmlBindDirective,
        SplitTabComponent,
        SplitTabSpannerComponent,
        WelcomeTabComponent,
@@ -98,7 +98,7 @@ const PROVIDERS = [
        AutofocusDirective,
    ],
 })
-export default class AppModule { // eslint-disable-line @typescript-eslint/no-extraneous-class
+export class AppModule { // eslint-disable-line @typescript-eslint/no-extraneous-class
    constructor (app: AppService, config: ConfigService) {
        app.ready$.subscribe(() => {
            if (config.store.enableWelcomeTab) {
@@ -106,18 +106,17 @@ export default class AppModule { // eslint-disable-line @typescript-eslint/no-ex
            }
        })
    }
-
-    static forRoot (): ModuleWithProviders {
-        return {
-            ngModule: AppModule,
-            providers: PROVIDERS,
-        }
-    }
 }

+export default AppModule
+
 export { AppRootComponent as bootstrap }
 export * from './api'

 // Deprecations
 export { ToolbarButton as IToolbarButton } from './api'
 export { HotkeyDescription as IHotkeyDescription } from './api'
+
+export function fakeBootstrap () {
+    return platformBrowserDynamic().bootstrapModule(AppModule)
+}
--- a/terminus-core/src/services/app.service.ts
+++ b/terminus-core/src/services/app.service.ts
@@ -83,10 +83,6 @@ export class AppService {
                this.startTabStorage()
            }
        }
-
-        hostApp.windowFocused$.subscribe(() => {
-            this._activeTab?.emitFocused()
-        })
    }

    startTabStorage () {
@@ -98,13 +94,8 @@ export class AppService {
        }, 30000)
    }

-    addTabRaw (tab: BaseTabComponent, index: number|null = null) {
-        if (index !== null) {
-            this.tabs.splice(index, 0, tab)
-        } else {
-            this.tabs.push(tab)
-        }
-
+    addTabRaw (tab: BaseTabComponent) {
+        this.tabs.push(tab)
        this.selectTab(tab)
        this.tabsChanged.next()
        this.tabOpened.next(tab)
@@ -130,11 +121,6 @@ export class AppService {
            this.tabsChanged.next()
            this.tabClosed.next(tab)
        })
-
-        if (tab instanceof SplitTabComponent) {
-            tab.tabAdded$.subscribe(() => this.emitTabsChanged())
-            tab.tabRemoved$.subscribe(() => this.emitTabsChanged())
-        }
    }

    /**
@@ -183,17 +169,6 @@ export class AppService {
        }
    }

-    getParentTab (tab: BaseTabComponent): SplitTabComponent|null {
-        for (const topLevelTab of this.tabs) {
-            if (topLevelTab instanceof SplitTabComponent) {
-                if (topLevelTab.getAllTabs().includes(tab)) {
-                    return topLevelTab
-                }
-            }
-        }
-        return null
-    }
-
    /** Switches between the current tab and the previously active one */
    toggleLastTab () {
        if (!this.lastTabIndex || this.lastTabIndex >= this.tabs.length) {
@@ -224,35 +199,6 @@ export class AppService {
        }
    }

-    moveSelectedTabLeft () {
-        if (this.tabs.length > 1) {
-            const tabIndex = this.tabs.indexOf(this._activeTab)
-            if (tabIndex > 0) {
-                this.swapTabs(this._activeTab, this.tabs[tabIndex - 1])
-            } else if (this.config.store.appearance.cycleTabs) {
-                this.swapTabs(this._activeTab, this.tabs[this.tabs.length - 1])
-            }
-        }
-    }
-
-    moveSelectedTabRight () {
-        if (this.tabs.length > 1) {
-            const tabIndex = this.tabs.indexOf(this._activeTab)
-            if (tabIndex < this.tabs.length - 1) {
-                this.swapTabs(this._activeTab, this.tabs[tabIndex + 1])
-            } else if (this.config.store.appearance.cycleTabs) {
-                this.swapTabs(this._activeTab, this.tabs[0])
-            }
-        }
-    }
-
-    swapTabs (a: BaseTabComponent, b: BaseTabComponent) {
-        const i1 = this.tabs.indexOf(a)
-        const i2 = this.tabs.indexOf(b)
-        this.tabs[i1] = b
-        this.tabs[i2] = a
-    }
-
    /** @hidden */
    emitTabsChanged () {
        this.tabsChanged.next()
@@ -271,7 +217,7 @@ export class AppService {
    async duplicateTab (tab: BaseTabComponent) {
        const dup = await this.tabsService.duplicate(tab)
        if (dup) {
-            this.addTabRaw(dup, this.tabs.indexOf(tab) + 1)
+            this.addTabRaw(dup)
        }
    }

--- a/terminus-core/src/services/config.service.ts
+++ b/terminus-core/src/services/config.service.ts
@@ -125,22 +125,7 @@ export class ConfigService {
    }

    getDefaults () {
-        const cleanup = o => {
-            if (o instanceof Array) {
-                return o.map(cleanup)
-            } else if (o instanceof Object) {
-                const r = {}
-                for (const k of Object.keys(o)) {
-                    if (k !== '__nonStructural') {
-                        r[k] = cleanup(o[k])
-                    }
-                }
-                return r
-            } else {
-                return o
-            }
-        }
-        return cleanup(this.defaults)
+        return this.defaults
    }

    load (): void {
--- a/terminus-core/src/services/homeBase.service.ts
+++ b/terminus-core/src/services/homeBase.service.ts
@@ -30,14 +30,9 @@ export class HomeBaseService {
        let body = `Version: ${this.appVersion}\n`
        body += `Platform: ${os.platform()} ${os.release()}\n`
        const label = {
-            aix: 'OS: IBM AIX',
-            android: 'OS: Android',
            darwin: 'OS: macOS',
-            freebsd: 'OS: FreeBSD',
+            windows: 'OS: Windows',
            linux: 'OS: Linux',
-            openbsd: 'OS: OpenBSD',
-            sunos: 'OS: Solaris',
-            win32: 'OS: Windows',
        }[os.platform()]
        const plugins = (window as any).installedPlugins.filter(x => !x.isBuiltin).map(x => x.name)
        body += `Plugins: ${plugins.join(', ') || 'none'}\n\n`
--- a/terminus-core/src/services/hostApp.service.ts
+++ b/terminus-core/src/services/hostApp.service.ts
@@ -4,7 +4,6 @@ import { Observable, Subject } from 'rxjs'
 import { Injectable, NgZone, EventEmitter } from '@angular/core'
 import { ElectronService } from './electron.service'
 import { Logger, LogService } from './log.service'
-import { isWindowsBuild, WIN_BUILD_FLUENT_BG_MOVE_BUG_FIXED, WIN_BUILD_FLUENT_BG_SUPPORTED } from '../utils'

 export enum Platform {
    Linux, macOS, Windows,
@@ -40,7 +39,6 @@ export class HostAppService {
    private configChangeBroadcast = new Subject<void>()
    private windowCloseRequest = new Subject<void>()
    private windowMoved = new Subject<void>()
-    private windowFocused = new Subject<void>()
    private displayMetricsChanged = new Subject<void>()
    private logger: Logger
    private windowId: number
@@ -87,8 +85,6 @@ export class HostAppService {

    get windowMoved$ (): Observable<void> { return this.windowMoved }

-    get windowFocused$ (): Observable<void> { return this.windowFocused }
-
    get displayMetricsChanged$ (): Observable<void> { return this.displayMetricsChanged }

    private constructor (
@@ -132,10 +128,6 @@ export class HostAppService {
            this.zone.run(() => this.windowMoved.next())
        })

-        electron.ipcRenderer.on('host:window-focused', () => {
-            this.zone.run(() => this.windowFocused.next())
-        })
-
        electron.ipcRenderer.on('host:display-metrics-changed', () => {
            this.zone.run(() => this.displayMetricsChanged.next())
        })
@@ -165,14 +157,6 @@ export class HostAppService {
        electron.ipcRenderer.on('host:config-change', () => this.zone.run(() => {
            this.configChangeBroadcast.next()
        }))
-
-
-        if (
-            isWindowsBuild(WIN_BUILD_FLUENT_BG_SUPPORTED) &&
-            !isWindowsBuild(WIN_BUILD_FLUENT_BG_MOVE_BUG_FIXED)
-        ) {
-            electron.ipcRenderer.send('window-set-disable-vibrancy-while-dragging', true)
-        }
    }

    /**
@@ -228,12 +212,14 @@ export class HostAppService {
     *
     * @param type `null`, or `fluent` when supported (Windowd only)
     */
-    setVibrancy (enable: boolean, type: string|null) {
-        if (!isWindowsBuild(WIN_BUILD_FLUENT_BG_SUPPORTED)) {
-            type = null
-        }
+    setVibrancy (enable: boolean, type: string) {
        document.body.classList.toggle('vibrant', enable)
-        this.electron.ipcRenderer.send('window-set-vibrancy', enable, type)
+        if (this.platform === Platform.macOS) {
+            this.getWindow().setVibrancy(enable ? 'dark' : null as any) // electron issue 20269
+        }
+        if (this.platform === Platform.Windows) {
+            this.electron.ipcRenderer.send('window-set-vibrancy', enable, type)
+        }
    }

    setTitle (title: string) {
--- a/terminus-core/src/services/hotkeys.service.ts
+++ b/terminus-core/src/services/hotkeys.service.ts
@@ -1,5 +1,4 @@
 import { Injectable, Inject, NgZone, EventEmitter } from '@angular/core'
-import { Observable, Subject } from 'rxjs'
 import { HotkeyDescription, HotkeyProvider } from '../api/hotkeyProvider'
 import { stringifyKeySequence } from './hotkeys.util'
 import { ConfigService } from '../services/config.service'
@@ -21,17 +20,8 @@ interface EventBufferEntry {
@Injectable({ providedIn: 'root' })
 export class HotkeysService {
    key = new EventEmitter<KeyboardEvent>()
-
-    /** @hidden */
    matchedHotkey = new EventEmitter<string>()
-
-    /**
-     * Fired for each recognized hotkey
-     */
-    get hotkey$ (): Observable<string> { return this._hotkey }
-
    globalHotkey = new EventEmitter<void>()
-    private _hotkey = new Subject<string>()
    private currentKeystrokes: EventBufferEntry[] = []
    private disabledLevel = 0
    private hotkeyDescriptions: HotkeyDescription[] = []
@@ -59,9 +49,6 @@ export class HotkeysService {
        this.getHotkeyDescriptions().then(hotkeys => {
            this.hotkeyDescriptions = hotkeys
        })
-
-        // deprecated
-        this.hotkey$.subscribe(h => this.matchedHotkey.emit(h))
    }

    /**
@@ -84,7 +71,7 @@ export class HotkeysService {
                const matched = this.getCurrentFullyMatchedHotkey()
                if (matched) {
                    console.log('Matched hotkey', matched)
-                    this._hotkey.next(matched)
+                    this.matchedHotkey.emit(matched)
                    this.clearCurrentKeystrokes()
                }
            })
--- a/terminus-core/src/services/shellIntegration.service.ts
+++ b/terminus-core/src/services/shellIntegration.service.ts
@@ -8,7 +8,7 @@ import { HostAppService, Platform } from './hostApp.service'
 /* eslint-disable block-scoped-var */

 try {
-    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires, no-var
+    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires
 } catch (_) { }

@Injectable({ providedIn: 'root' })
@@ -18,18 +18,11 @@ export class ShellIntegrationService {
    private automatorWorkflowsDestination: string
    private registryKeys = [
        {
-            path: 'Software\\Classes\\Directory\\Background\\shell\\Terminus',
-            value: 'Open Terminus here',
+            path: 'Software\\Classes\\Directory\\Background\\shell\\Open Terminus here',
            command: 'open "%V"',
        },
        {
-            path: 'SOFTWARE\\Classes\\Directory\\shell\\Terminus',
-            value: 'Open Terminus here',
-            command: 'open "%V"',
-        },
-        {
-            path: 'Software\\Classes\\*\\shell\\Terminus',
-            value: 'Paste path into Terminus',
+            path: 'Software\\Classes\\*\\shell\\Paste path into Terminus',
            command: 'paste "%V"',
        },
    ]
@@ -68,17 +61,9 @@ export class ShellIntegrationService {
            for (const registryKey of this.registryKeys) {
                wnr.createRegistryKey(wnr.HK.CU, registryKey.path)
                wnr.createRegistryKey(wnr.HK.CU, registryKey.path + '\\command')
-                wnr.setRegistryValue(wnr.HK.CU, registryKey.path, '', wnr.REG.SZ, registryKey.value)
                wnr.setRegistryValue(wnr.HK.CU, registryKey.path, 'Icon', wnr.REG.SZ, exe)
                wnr.setRegistryValue(wnr.HK.CU, registryKey.path + '\\command', '', wnr.REG.SZ, exe + ' ' + registryKey.command)
            }
-
-            if(wnr.getRegistryKey(wnr.HK.CU, 'Software\\Classes\\Directory\\Background\\shell\\Open Terminus here')) {
-                wnr.deleteRegistryKey(wnr.HK.CU, 'Software\\Classes\\Directory\\Background\\shell\\Open Terminus here')
-            }
-            if(wnr.getRegistryKey(wnr.HK.CU, 'Software\\Classes\\*\\shell\\Paste path into Terminus')) {
-                wnr.deleteRegistryKey(wnr.HK.CU, 'Software\\Classes\\*\\shell\\Paste path into Terminus')
-            }
        }
    }

--- a/terminus-core/src/services/tabRecovery.service.ts
+++ b/terminus-core/src/services/tabRecovery.service.ts
@@ -21,18 +21,7 @@ export class TabRecoveryService {
        window.localStorage.tabsRecovery = JSON.stringify(
            await Promise.all(
                tabs
-                    .map(tab => {
-                        let token = tab.getRecoveryToken()
-                        if (token) {
-                            token = token.then(r => {
-                                if (r) {
-                                    r.tabColor = tab.color
-                                }
-                                return r
-                            })
-                        }
-                        return token
-                    })
+                    .map(tab => tab.getRecoveryToken())
                    .filter(token => !!token)
            )
        )
@@ -42,9 +31,7 @@ export class TabRecoveryService {
        for (const provider of this.config.enabledServices(this.tabRecoveryProviders)) {
            try {
                const tab = await provider.recover(token)
-                if (tab !== null) {
-                    tab.options = tab.options || {}
-                    tab.options.color = token.tabColor || null
+                if (tab) {
                    return tab
                }
            } catch (error) {
--- a/terminus-core/src/services/updater.service.ts
+++ b/terminus-core/src/services/updater.service.ts
@@ -8,7 +8,6 @@ import { Injectable } from '@angular/core'
 import { Logger, LogService } from './log.service'
 import { ElectronService } from './electron.service'
 import { ConfigService } from './config.service'
-import { AppUpdater } from 'electron-updater'

 const UPDATES_URL = 'https://api.github.com/repos/eugeny/terminus/releases/latest'

@@ -19,27 +18,21 @@ export class UpdaterService {
    private downloaded: Promise<boolean>
    private electronUpdaterAvailable = true
    private updateURL: string
-    private autoUpdater: AppUpdater
+    private autoUpdater

    constructor (
        log: LogService,
        private electron: ElectronService,
-        private config: ConfigService,
+        config: ConfigService,
    ) {
        this.logger = log.create('updater')

-        if (process.platform === 'linux') {
-            this.electronUpdaterAvailable = false
-            return
-        }
-
        this.autoUpdater = electron.remote.require('electron-updater').autoUpdater

        this.autoUpdater.autoInstallOnAppQuit = !!config.store.enableAutomaticUpdates

        this.autoUpdater.on('update-available', () => {
            this.logger.info('Update available')
-            this.autoUpdater.downloadUpdate()
        })
        this.autoUpdater.once('update-not-available', () => {
            this.logger.info('No updates')
@@ -49,8 +42,9 @@ export class UpdaterService {
            this.autoUpdater.once('update-downloaded', () => resolve(true))
        })

-        if (config.store.enableAutomaticUpdates && this.electronUpdaterAvailable && !process.env.TERMINUS_DEV) {
-            this.logger.debug('Checking for updates')
+        this.logger.debug('Checking for updates')
+
+        if (this.electronUpdaterAvailable && !process.env.TERMINUS_DEV) {
            try {
                this.autoUpdater.checkForUpdates()
            } catch (e) {
@@ -61,9 +55,6 @@ export class UpdaterService {
    }

    async check (): Promise<boolean> {
-        if (!this.config.store.enableAutomaticUpdates) {
-            return false
-        }
        if (!this.electronUpdaterAvailable) {
            this.logger.debug('Checking for updates through fallback method.')
            const response = await axios.get(UPDATES_URL)
--- a/terminus-core/src/tabContextMenu.ts
+++ b/terminus-core/src/tabContextMenu.ts
@@ -1,12 +1,11 @@
 import { Injectable, NgZone } from '@angular/core'
-import { Subscription } from 'rxjs'
 import { AppService } from './services/app.service'
 import { BaseTabComponent } from './components/baseTab.component'
 import { TabHeaderComponent } from './components/tabHeader.component'
 import { TabContextMenuItemProvider } from './api/tabContextMenuProvider'

 /** @hidden */
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class CloseContextMenu extends TabContextMenuItemProvider {
    weight = -5

@@ -17,49 +16,39 @@ export class CloseContextMenu extends TabContextMenuItemProvider {
        super()
    }

-    async getItems (tab: BaseTabComponent, tabHeader?: TabHeaderComponent): Promise<Electron.MenuItemConstructorOptions[]> {
-        let items = [
+    async getItems (tab: BaseTabComponent): Promise<Electron.MenuItemConstructorOptions[]> {
+        return [
            {
                label: 'Close',
                click: () => this.zone.run(() => {
-                    if (this.app.tabs.includes(tab)) {
-                        this.app.closeTab(tab, true)
-                    } else {
-                        tab.destroy()
+                    this.app.closeTab(tab, true)
+                }),
+            },
+            {
+                label: 'Close other tabs',
+                click: () => this.zone.run(() => {
+                    for (const t of this.app.tabs.filter(x => x !== tab)) {
+                        this.app.closeTab(t, true)
+                    }
+                }),
+            },
+            {
+                label: 'Close tabs to the right',
+                click: () => this.zone.run(() => {
+                    for (const t of this.app.tabs.slice(this.app.tabs.indexOf(tab) + 1)) {
+                        this.app.closeTab(t, true)
+                    }
+                }),
+            },
+            {
+                label: 'Close tabs to the left',
+                click: () => this.zone.run(() => {
+                    for (const t of this.app.tabs.slice(0, this.app.tabs.indexOf(tab))) {
+                        this.app.closeTab(t, true)
                    }
                }),
            },
        ]
-        if (tabHeader) {
-            items = [
-                ...items,
-                {
-                    label: 'Close other tabs',
-                    click: () => this.zone.run(() => {
-                        for (const t of this.app.tabs.filter(x => x !== tab)) {
-                            this.app.closeTab(t, true)
-                        }
-                    }),
-                },
-                {
-                    label: 'Close tabs to the right',
-                    click: () => this.zone.run(() => {
-                        for (const t of this.app.tabs.slice(this.app.tabs.indexOf(tab) + 1)) {
-                            this.app.closeTab(t, true)
-                        }
-                    }),
-                },
-                {
-                    label: 'Close tabs to the left',
-                    click: () => this.zone.run(() => {
-                        for (const t of this.app.tabs.slice(0, this.app.tabs.indexOf(tab))) {
-                            this.app.closeTab(t, true)
-                        }
-                    }),
-                },
-            ]
-        }
-        return items
    }
 }

@@ -74,7 +63,7 @@ const COLORS = [
 ]

 /** @hidden */
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class CommonOptionsContextMenu extends TabContextMenuItemProvider {
    weight = -1

@@ -86,36 +75,33 @@ export class CommonOptionsContextMenu extends TabContextMenuItemProvider {
    }

    async getItems (tab: BaseTabComponent, tabHeader?: TabHeaderComponent): Promise<Electron.MenuItemConstructorOptions[]> {
-        if (tabHeader) {
-            return [
-                {
-                    label: 'Rename',
-                    click: () => this.zone.run(() => tabHeader?.showRenameTabModal()),
-                },
-                {
-                    label: 'Duplicate',
-                    click: () => this.zone.run(() => this.app.duplicateTab(tab)),
-                },
-                {
-                    label: 'Color',
-                    sublabel: COLORS.find(x => x.value === tab.color)!.name,
-                    submenu: COLORS.map(color => ({
-                        label: color.name,
-                        type: 'radio',
-                        checked: tab.color === color.value,
-                        click: () => this.zone.run(() => {
-                            tab.color = color.value
-                        }),
-                    })) as Electron.MenuItemConstructorOptions[],
-                },
-            ]
-        }
-        return []
+        return [
+            {
+                label: 'Rename',
+                click: () => this.zone.run(() => tabHeader?.showRenameTabModal()),
+            },
+            {
+                label: 'Duplicate',
+                click: () => this.zone.run(() => this.app.duplicateTab(tab)),
+            },
+            {
+                label: 'Color',
+                sublabel: COLORS.find(x => x.value === tab.color)!.name,
+                submenu: COLORS.map(color => ({
+                    label: color.name,
+                    type: 'radio',
+                    checked: tab.color === color.value,
+                    click: () => this.zone.run(() => {
+                        tab.color = color.value
+                    }),
+                })) as Electron.MenuItemConstructorOptions[],
+            },
+        ]
    }
 }

 /** @hidden */
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class TaskCompletionContextMenu extends TabContextMenuItemProvider {
    constructor (
        private app: AppService,
@@ -126,61 +112,36 @@ export class TaskCompletionContextMenu extends TabContextMenuItemProvider {

    async getItems (tab: BaseTabComponent): Promise<Electron.MenuItemConstructorOptions[]> {
        const process = await tab.getCurrentProcess()
-        let items: Electron.MenuItemConstructorOptions[] = []
-
-        const extTab: (BaseTabComponent & { __completionNotificationEnabled?: boolean, __outputNotificationSubscription?: Subscription|null }) = tab
-
        if (process) {
-            items.push({
-                id: 'process-name',
-                enabled: false,
-                label: 'Current process: ' + process.name,
-            })
-            items.push({
-                label: 'Notify when done',
-                type: 'checkbox',
-                checked: extTab.__completionNotificationEnabled,
-                click: () => this.zone.run(() => {
-                    extTab.__completionNotificationEnabled = !extTab.__completionNotificationEnabled
+            return [
+                {
+                    id: 'process-name',
+                    enabled: false,
+                    label: 'Current process: ' + process.name,
+                },
+                {
+                    label: 'Notify when done',
+                    type: 'checkbox',
+                    checked: (tab as any).__completionNotificationEnabled,
+                    click: () => this.zone.run(() => {
+                        (tab as any).__completionNotificationEnabled = !(tab as any).__completionNotificationEnabled

-                    if (extTab.__completionNotificationEnabled) {
-                        this.app.observeTabCompletion(tab).subscribe(() => {
-                            new Notification('Process completed', {
-                                body: process.name,
-                            }).addEventListener('click', () => {
-                                this.app.selectTab(tab)
-                            })
-                            extTab.__completionNotificationEnabled = false
-                        })
-                    } else {
-                        this.app.stopObservingTabCompletion(tab)
-                    }
-                }),
-            })
-        }
-        items.push({
-            label: 'Notify on activity',
-            type: 'checkbox',
-            checked: !!extTab.__outputNotificationSubscription,
-            click: () => this.zone.run(() => {
-                if (extTab.__outputNotificationSubscription) {
-                    extTab.__outputNotificationSubscription.unsubscribe()
-                    extTab.__outputNotificationSubscription = null
-                } else {
-                    extTab.__outputNotificationSubscription = tab.activity$.subscribe(active => {
-                        if (extTab.__outputNotificationSubscription && active) {
-                            extTab.__outputNotificationSubscription.unsubscribe()
-                            extTab.__outputNotificationSubscription = null
-                            new Notification('Tab activity', {
-                                body: tab.title,
-                            }).addEventListener('click', () => {
-                                this.app.selectTab(tab)
+                        if ((tab as any).__completionNotificationEnabled) {
+                            this.app.observeTabCompletion(tab).subscribe(() => {
+                                new Notification('Process completed', {
+                                    body: process.name,
+                                }).addEventListener('click', () => {
+                                    this.app.selectTab(tab)
+                                })
+                                ;(tab as any).__completionNotificationEnabled = false
                            })
+                        } else {
+                            this.app.stopObservingTabCompletion(tab)
                        }
-                    })
-                }
-            }),
-        })
-        return items
+                    }),
+                },
+            ]
+        }
+        return []
    }
 }
--- a/terminus-core/src/theme.compact.scss
+++ b/terminus-core/src/theme.compact.scss
@@ -16,8 +16,4 @@ app-root {
    terminaltab .content {
        margin: 5px !important;
    }
-
-    ssh-tab .content {
-        margin: 5px !important;
-    }
 }
--- a/terminus-core/src/theme.vars.scss
+++ b/terminus-core/src/theme.vars.scss
@@ -142,7 +142,7 @@ $nav-tabs-link-active-border-color: #eee;
 $navbar-padding-y: 0;
 $navbar-padding-x: 0;

-$dropdown-bg: $content-bg-solid;
+$dropdown-bg: $table-bg;
 $dropdown-color: $body-color;
 $dropdown-border-width: 1px;
 $dropdown-box-shadow: 0 .5rem 1rem rgba($black,.175);
--- a/terminus-core/tsconfig.json
+++ b/terminus-core/tsconfig.json
@@ -2,6 +2,9 @@
  "extends": "../tsconfig.json",
  "exclude": ["node_modules", "dist"],
  "compilerOptions": {
-    "baseUrl": "src"
+    "baseUrl": "src",
+    "paths": {
+      "*": ["../../app/node_modules/*"]
+    }
  }
 }
--- a/terminus-core/webpack.config.js
+++ b/terminus-core/webpack.config.js
@@ -1,10 +1,11 @@
 const path = require('path')
+const { AngularCompilerPlugin } = require('@ngtools/webpack')

 module.exports = {
    target: 'node',
    entry: 'src/index.ts',
    context: __dirname,
-    devtool: 'eval-cheap-module-source-map',
+    devtool: 'cheap-module-source-map',
    output: {
        path: path.resolve(__dirname, 'dist'),
        filename: 'index.js',
@@ -23,22 +24,26 @@ module.exports = {
    module: {
        rules: [
            {
-                test: /\.ts$/,
-                use: {
-                    loader: 'awesome-typescript-loader',
-                    options: {
-                        configFileName: path.resolve(__dirname, 'tsconfig.json'),
-                        typeRoots: [
-                            path.resolve(__dirname, 'node_modules/@types'),
-                            path.resolve(__dirname, '../node_modules/@types'),
-                        ],
-                        paths: {
-                            "terminus-*": [path.resolve(__dirname, '../terminus-*')],
-                            "*": [path.resolve(__dirname, '../app/node_modules/*')],
-                        },
-                    },
-                },
+                test: /(?:\.ngfactory\.js|\.ngfactory|\.ngstyle\.js|\.ts)$/,
+                loader: '@ngtools/webpack',
            },
+            // {
+            //     test: /\.ts$/,
+            //     use: {
+            //         loader: 'awesome-typescript-loader',
+            //         options: {
+            //             configFileName: path.resolve(__dirname, 'tsconfig.json'),
+            //             typeRoots: [
+            //                 path.resolve(__dirname, 'node_modules/@types'),
+            //                 path.resolve(__dirname, '../node_modules/@types'),
+            //             ],
+            //             paths: {
+            //                 "terminus-*": [path.resolve(__dirname, '../terminus-*')],
+            //                 "*": [path.resolve(__dirname, '../app/node_modules/*')],
+            //             },
+            //         },
+            //     },
+            // },
            { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] },
            { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] },
            { test: /\.css$/, use: ['to-string-loader', 'css-loader'], include: /component\.css/ },
@@ -57,4 +62,12 @@ module.exports = {
        /^@angular/,
        /^@ng-bootstrap/,
    ],
+    plugins: [
+        new AngularCompilerPlugin({
+            tsConfigPath: path.resolve(__dirname, 'tsconfig.json'),
+            entryModule: './terminus-core/src/index#AppModule',
+            sourceMap: true,
+            directTemplateLoading: true,
+        }),
+    ],
 }
--- a/terminus-core/yarn.lock
+++ b/terminus-core/yarn.lock
@@ -46,16 +46,17 @@ async@^2.6.1:
    lodash "^4.17.11"

 axios@^0.19.0:
-  version "0.19.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
-  integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz#8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8"
+  integrity sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==
  dependencies:
    follow-redirects "1.5.10"
+    is-buffer "^2.0.2"

 bootstrap@^4.1.3:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.4.1.tgz#8582960eea0c5cd2bede84d8b0baf3789c3e8b01"
-  integrity sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA==
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
+  integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==

 builder-util-runtime@8.4.0:
  version "8.4.0"
@@ -117,9 +118,9 @@ colorspace@1.1.x:
    text-hex "1.0.x"

 core-js@^3.1.2:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647"
-  integrity sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.4.2.tgz#ee2b1a60b50388d8ddcda8cdb44a92c7a9ea76df"
+  integrity sha512-bUTfqFWtNKWp73oNIfRkqwYZJeNT3lstzZcAkhhiuvDraRSgOH1/+F9ZklbpR4zpdKuo4cpXN8tKP7s61yjX+g==

 core-util-is@~1.0.0:
  version "1.0.2"
@@ -253,6 +254,11 @@ is-arrayish@^0.3.1:
  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==

+is-buffer@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
+  integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
+
 is-stream@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -460,9 +466,9 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=

 uuid@^3.3.2:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
+  integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==

 winston-transport@^4.3.0:
  version "4.3.0"
--- a/terminus-plugin-manager/package.json
+++ b/terminus-plugin-manager/package.json
@@ -1,6 +1,6 @@
 {
  "name": "terminus-plugin-manager",
-  "version": "1.0.99-nightly.0",
+  "version": "1.0.98-nightly.0",
  "description": "Terminus' plugin manager",
  "keywords": [
    "terminus-builtin-plugin"
@@ -20,7 +20,7 @@
    "@types/semver": "^6.0.0",
    "axios": "^0.19.0",
    "mz": "^2.6.0",
-    "semver": "^7.1.1"
+    "semver": "^6.1.0"
  },
  "peerDependencies": {
    "@angular/common": "^7",
--- a/terminus-plugin-manager/src/services/pluginManager.service.ts
+++ b/terminus-plugin-manager/src/services/pluginManager.service.ts
@@ -8,10 +8,6 @@ const NAME_PREFIX = 'terminus-'
 const KEYWORD = 'terminus-plugin'
 const OFFICIAL_NPM_ACCOUNT = 'eugenepankov'

-const BLACKLIST = [
-    'terminus-shell-selector', // superseded by profiles
-]
-
 export interface PluginInfo {
    name: string
    description: string
@@ -79,7 +75,6 @@ export class PluginManagerService {
                isOfficial: item.package.publisher.username === OFFICIAL_NPM_ACCOUNT,
            }))),
            map(plugins => plugins.filter(x => x.packageName.startsWith(NAME_PREFIX))),
-            map(plugins => plugins.filter(x => !BLACKLIST.includes(x.packageName))),
        )
    }

--- a/terminus-plugin-manager/yarn.lock
+++ b/terminus-plugin-manager/yarn.lock
@@ -13,11 +13,12 @@ any-promise@^1.0.0:
  integrity sha1-q8av7tzqUugJzcA3au0845Y10X8=

 axios@^0.19.0:
-  version "0.19.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
-  integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz#8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8"
+  integrity sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==
  dependencies:
    follow-redirects "1.5.10"
+    is-buffer "^2.0.2"

 debug@=3.1.0:
  version "3.1.0"
@@ -33,6 +34,11 @@ follow-redirects@1.5.10:
  dependencies:
    debug "=3.1.0"

+is-buffer@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
+  integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
+
 ms@2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -52,10 +58,10 @@ object-assign@^4.0.1:
  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=

-semver@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.1.tgz#29104598a197d6cbe4733eeecbe968f7b43a9667"
-  integrity sha512-WfuG+fl6eh3eZ2qAf6goB7nhiCd7NPXhmyFxigB/TOkQyeLP8w8GsVehvtGNtnNmyboz4TgeK40B1Kbql/8c5A==
+semver@^6.1.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==

 thenify-all@^1.0.0:
  version "1.6.0"
--- a/terminus-settings/package.json
+++ b/terminus-settings/package.json
@@ -1,6 +1,6 @@
 {
  "name": "terminus-settings",
-  "version": "1.0.99-nightly.0",
+  "version": "1.0.98-nightly.0",
  "description": "Terminus terminal settings page",
  "keywords": [
    "terminus-builtin-plugin"
--- a/terminus-settings/src/components/settingsTab.component.ts
+++ b/terminus-settings/src/components/settingsTab.component.ts
@@ -1,4 +1,5 @@
 import * as yaml from 'js-yaml'
+import * as os from 'os'
 import { Subscription } from 'rxjs'
 import { Component, Inject, Input, HostBinding, NgZone } from '@angular/core'
 import {
@@ -13,8 +14,6 @@ import {
    Platform,
    HomeBaseService,
    ShellIntegrationService,
-    isWindowsBuild,
-    WIN_BUILD_FLUENT_BG_SUPPORTED,
 } from 'terminus-core'

 import { SettingsTabProvider } from '../api'
@@ -82,7 +81,9 @@ export class SettingsTabComponent extends BaseTabComponent {
            this.hotkeyDescriptions = descriptions
        })

-        this.isFluentVibrancySupported = isWindowsBuild(WIN_BUILD_FLUENT_BG_SUPPORTED)
+        this.isFluentVibrancySupported = hostApp.platform === Platform.Windows
+            && parseFloat(os.release()) >= 10
+            && parseInt(os.release().split('.')[2]) >= 17063
    }

    async ngOnInit () {
@@ -98,6 +99,10 @@ export class SettingsTabComponent extends BaseTabComponent {
        this.isShellIntegrationInstalled = await this.shellIntegration.isInstalled()
    }

+    async getRecoveryToken (): Promise<any> {
+        return null
+    }
+
    ngOnDestroy () {
        this.configSubscription.unsubscribe()
        this.config.save()
--- a/terminus-settings/src/index.ts
+++ b/terminus-settings/src/index.ts
@@ -3,7 +3,7 @@ import { BrowserModule } from '@angular/platform-browser'
 import { FormsModule } from '@angular/forms'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'

-import TerminusCorePlugin, { ToolbarButtonProvider, HotkeyProvider, ConfigProvider } from 'terminus-core'
+import TerminusCorePlugin, { ToolbarButtonProvider, TabRecoveryProvider, HotkeyProvider, ConfigProvider } from 'terminus-core'

 import { HotkeyInputModalComponent } from './components/hotkeyInputModal.component'
 import { MultiHotkeyInputComponent } from './components/multiHotkeyInput.component'
@@ -11,6 +11,7 @@ import { SettingsTabComponent } from './components/settingsTab.component'
 import { SettingsTabBodyComponent } from './components/settingsTabBody.component'

 import { ButtonProvider } from './buttonProvider'
+import { RecoveryProvider } from './recoveryProvider'
 import { SettingsHotkeyProvider } from './hotkeys'
 import { SettingsConfigProvider } from './config'

@@ -24,6 +25,7 @@ import { SettingsConfigProvider } from './config'
    ],
    providers: [
        { provide: ToolbarButtonProvider, useClass: ButtonProvider, multi: true },
+        { provide: TabRecoveryProvider, useClass: RecoveryProvider, multi: true },
        { provide: ConfigProvider, useClass: SettingsConfigProvider, multi: true },
        { provide: HotkeyProvider, useClass: SettingsHotkeyProvider, multi: true },
    ],
--- a/terminus-settings/src/recoveryProvider.ts
+++ b/terminus-settings/src/recoveryProvider.ts
@@ -0,0 +1,15 @@
+import { Injectable } from '@angular/core'
+import { TabRecoveryProvider, RecoveredTab } from 'terminus-core'
+
+import { SettingsTabComponent } from './components/settingsTab.component'
+
+/** @hidden */
+@Injectable()
+export class RecoveryProvider extends TabRecoveryProvider {
+    async recover (recoveryToken: any): Promise<RecoveredTab|null> {
+        if (recoveryToken && recoveryToken.type === 'app:settings') {
+            return { type: SettingsTabComponent }
+        }
+        return null
+    }
+}
--- a/terminus-ssh/package.json
+++ b/terminus-ssh/package.json
@@ -1,6 +1,6 @@
 {
  "name": "terminus-ssh",
-  "version": "1.0.99-nightly.0",
+  "version": "1.0.98-nightly.0",
  "description": "SSH connection manager for Terminus",
  "keywords": [
    "terminus-builtin-plugin"
@@ -19,11 +19,8 @@
  "devDependencies": {
    "@types/node": "12.7.3",
    "@types/ssh2": "^0.5.35",
-    "ansi-colors": "^4.1.1",
-    "cli-spinner": "^0.2.10",
    "ssh2": "^0.8.2",
    "ssh2-streams": "^0.4.2",
-    "sshpk": "^1.16.1",
    "terminus-terminal": "^1.0.98-nightly.0"
  },
  "peerDependencies": {
--- a/terminus-ssh/src/api.ts
+++ b/terminus-ssh/src/api.ts
@@ -1,4 +1,3 @@
-import colors from 'ansi-colors'
 import { BaseSession } from 'terminus-terminal'
 import { Server, Socket, createServer, createConnection } from 'net'
 import { Client, ClientChannel } from 'ssh2'
@@ -31,9 +30,6 @@ export interface SSHConnection {
    keepaliveInterval?: number
    keepaliveCountMax?: number
    readyTimeout?: number
-    color?: string
-    x11?: boolean
-    skipBanner?: boolean

    algorithms?: {[t: string]: string[]}
 }
@@ -92,9 +88,18 @@ export class SSHSession extends BaseSession {
        this.open = true

        try {
-            this.shell = await this.openShellChannel({ x11: this.connection.x11 })
+            try {
+                this.shell = await this.openShellChannel({ x11: true })
+            } catch (e) {
+                if (e.toString().includes('Unable to request X11')) {
+                    this.logger.debug('X11 forwarding rejected, trying without')
+                    this.shell = await this.openShellChannel({})
+                } else {
+                    throw e
+                }
+            }
        } catch (err) {
-            this.emitServiceMessage(colors.bgRed.black(' X ') + ` Remote rejected opening a shell channel: ${err}`)
+            this.emitServiceMessage(`Remote rejected opening a shell channel: ${err}`)
        }

        this.shell.on('greeting', greeting => {
@@ -107,7 +112,7 @@ export class SSHSession extends BaseSession {

        this.shell.on('data', data => {
            const dataString = data.toString()
-            this.emitOutput(data)
+            this.emitOutput(dataString)

            if (this.scripts) {
                let found = false
@@ -161,13 +166,13 @@ export class SSHSession extends BaseSession {
            this.logger.info(`Incoming forwarded connection: (remote) ${details.srcIP}:${details.srcPort} -> (local) ${details.destIP}:${details.destPort}`)
            const forward = this.forwardedPorts.find(x => x.port === details.destPort)
            if (!forward) {
-                this.emitServiceMessage(colors.bgRed.black(' X ') + ` Rejected incoming forwarded connection for unrecognized port ${details.destPort}`)
+                this.emitServiceMessage(`Rejected incoming forwarded connection for unrecognized port ${details.destPort}`)
                return reject()
            }
            const socket = new Socket()
            socket.connect(forward.targetPort, forward.targetAddress)
            socket.on('error', e => {
-                this.emitServiceMessage(colors.bgRed.black(' X ') + ` Could not forward the remote connection to ${forward.targetAddress}:${forward.targetPort}: ${e}`)
+                this.emitServiceMessage(`Could not forward the remote connection to ${forward.targetAddress}:${forward.targetPort}: ${e}`)
                reject()
            })
            socket.on('connect', () => {
@@ -197,7 +202,7 @@ export class SSHSession extends BaseSession {
                socket.connect(xPort, xHost)
            }
            socket.on('error', e => {
-                this.emitServiceMessage(colors.bgRed.black(' X ') + ` Could not connect to the X server ${xHost}:${xPort}: ${e}`)
+                this.emitServiceMessage(`Could not connect to the X server ${xHost}:${xPort}: ${e}`)
                reject()
            })
            socket.on('connect', () => {
@@ -233,7 +238,7 @@ export class SSHSession extends BaseSession {
                    fw.targetPort,
                    (err, stream) => {
                        if (err) {
-                            this.emitServiceMessage(colors.bgRed.black(' X ') + ` Remote has rejected the forwaded connection via ${fw}: ${err}`)
+                            this.emitServiceMessage(`Remote has rejected the forwaded connection via ${fw}: ${err}`)
                            socket.destroy()
                            return
                        }
@@ -248,10 +253,10 @@ export class SSHSession extends BaseSession {
                    }
                )
            }).then(() => {
-                this.emitServiceMessage(colors.bgGreen.black(' -> ') + ` Forwaded ${fw}`)
+                this.emitServiceMessage(`Forwaded ${fw}`)
                this.forwardedPorts.push(fw)
            }).catch(e => {
-                this.emitServiceMessage(colors.bgRed.black(' X ') + ` Failed to forward port ${fw}: ${e}`)
+                this.emitServiceMessage(`Failed to forward port ${fw}: ${e}`)
                throw e
            })
        }
@@ -259,13 +264,13 @@ export class SSHSession extends BaseSession {
            await new Promise((resolve, reject) => {
                this.ssh.forwardIn(fw.host, fw.port, err => {
                    if (err) {
-                        this.emitServiceMessage(colors.bgRed.black(' X ') + ` Remote rejected port forwarding for ${fw}: ${err}`)
+                        this.emitServiceMessage(`Remote rejected port forwarding for ${fw}: ${err}`)
                        return reject(err)
                    }
                    resolve()
                })
            })
-            this.emitServiceMessage(colors.bgGreen.black(' <- ') + ` Forwaded ${fw}`)
+            this.emitServiceMessage(`Forwaded ${fw}`)
            this.forwardedPorts.push(fw)
        }
    }
--- a/terminus-ssh/src/components/editConnectionModal.component.pug
+++ b/terminus-ssh/src/components/editConnectionModal.component.pug
@@ -70,83 +70,49 @@
        ngb-tab(id='advanced')
            ng-template(ngbTabTitle) Advanced
            ng-template(ngbTabContent)
-                .form-line
-                    .header
-                        .title X11 forwarding
-                    toggle([(ngModel)]='connection.x11')
-
-                .form-line
-                    .header
-                        .title Tab color
-                    input.form-control(
-                        type='text',
-                        autofocus,
-                        [(ngModel)]='connection.color',
-                        placeholder='#000000'
-                    )
-
-                .form-line
-                    .header
-                        .title Skip MoTD/banner
-                    toggle([(ngModel)]='connection.skipBanner')
-
-                .form-line
-                    .header
-                        .title Keep Alive Interval (Milliseconds)
+                .form-group
+                    label Keep Alive Interval (Milliseconds)
                    input.form-control(
                        type='number',
                        placeholder='0',
                        [(ngModel)]='connection.keepaliveInterval',
                    )

-                .form-line
-                    .header
-                        .title Max Keep Alive Count
+                .form-group
+                    label Max Keep Alive Count
                    input.form-control(
                        type='number',
                        placeholder='3',
                        [(ngModel)]='connection.keepaliveCountMax',
                    )

-                .form-line
-                    .header
-                        .title Ready Timeout (Milliseconds)
+                .form-group
+                    label Ready Timeout (Milliseconds)
                    input.form-control(
                        type='number',
                        placeholder='20000',
                        [(ngModel)]='connection.readyTimeout',
                    )

-        ngb-tab(id='ciphers')
-            ng-template(ngbTabTitle) Ciphers
-            ng-template(ngbTabContent)
-                .form-line.align-items-start
-                    .header
-                        .title Ciphers
-                    .w-50
-                        div(*ngFor='let alg of supportedAlgorithms.cipher')
-                            checkbox([text]='alg', [(ngModel)]='algorithms.cipher[alg]')
+                .form-group
+                    label Ciphers
+                    div(*ngFor='let alg of supportedAlgorithms.cipher')
+                        checkbox([text]='alg', [(ngModel)]='algorithms.cipher[alg]')

-                .form-line.align-items-start
-                    .header
-                        .title Key exchange
-                    .w-50
-                        div(*ngFor='let alg of supportedAlgorithms.kex')
-                            checkbox([text]='alg', [(ngModel)]='algorithms.kex[alg]')
+                .form-group
+                    label Key exchange
+                    div(*ngFor='let alg of supportedAlgorithms.kex')
+                        checkbox([text]='alg', [(ngModel)]='algorithms.kex[alg]')

-                .form-line.align-items-start
-                    .header
-                        .title HMAC
-                    .w-50
-                        div(*ngFor='let alg of supportedAlgorithms.hmac')
-                            checkbox([text]='alg', [(ngModel)]='algorithms.hmac[alg]')
+                .form-group
+                    label HMAC
+                    div(*ngFor='let alg of supportedAlgorithms.hmac')
+                        checkbox([text]='alg', [(ngModel)]='algorithms.hmac[alg]')

-                .form-line.align-items-start
-                    .header
-                        .title Host key
-                    .w-50
-                        div(*ngFor='let alg of supportedAlgorithms.serverHostKey')
-                            checkbox([text]='alg', [(ngModel)]='algorithms.serverHostKey[alg]')
+                .form-group
+                    label Host key
+                    div(*ngFor='let alg of supportedAlgorithms.serverHostKey')
+                        checkbox([text]='alg', [(ngModel)]='algorithms.serverHostKey[alg]')


        ngb-tab(id='scripts')
--- a/terminus-ssh/src/components/editConnectionModal.component.ts
+++ b/terminus-ssh/src/components/editConnectionModal.component.ts
@@ -82,11 +82,10 @@ export class EditConnectionModalComponent {
        this.electron.dialog.showOpenDialog(
            this.hostApp.getWindow(),
            {
-                defaultPath: this.connection.privateKey,
                title: 'Select private key',
            }
        ).then(result => {
-            if (!result.canceled) {
+            if (result.filePaths) {
                this.connection.privateKey = result.filePaths[0]
            }
        })
--- a/terminus-ssh/src/components/promptModal.component.ts
+++ b/terminus-ssh/src/components/promptModal.component.ts
@@ -6,6 +6,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
    template: require('./promptModal.component.pug'),
 })
 export class PromptModalComponent {
+    @Input() prompt: string
    @Input() value: string
    @Input() password: boolean
    @Input() remember: boolean
--- a/terminus-ssh/src/components/sshSettingsTab.component.ts
+++ b/terminus-ssh/src/components/sshSettingsTab.component.ts
@@ -1,7 +1,6 @@
 import { Component } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { ConfigService, ElectronService, HostAppService } from 'terminus-core'
-import { PasswordStorageService } from '../services/passwordStorage.service'
 import { SSHConnection, SSHConnectionGroup } from '../api'
 import { EditConnectionModalComponent } from './editConnectionModal.component'
 import { PromptModalComponent } from './promptModal.component'
@@ -20,7 +19,6 @@ export class SSHSettingsTabComponent {
        private electron: ElectronService,
        private hostApp: HostAppService,
        private ngbModal: NgbModal,
-        private passwordStorage: PasswordStorageService,
    ) {
        this.connections = this.config.store.ssh.connections
        this.refresh()
@@ -67,7 +65,6 @@ export class SSHSettingsTabComponent {
            }
        )).response === 1) {
            this.connections = this.connections.filter(x => x !== connection)
-            this.passwordStorage.deletePassword(connection)
            this.config.store.ssh.connections = this.connections
            this.config.save()
            this.refresh()
--- a/terminus-ssh/src/components/sshTab.component.pug
+++ b/terminus-ssh/src/components/sshTab.component.pug
@@ -1,15 +1,3 @@
-.ssh-tab-toolbar
-    .btn.btn-outline-secondary.reveal-button
-        i.fas.fa-ellipsis-h
-    .toolbar(*ngIf='session', [class.show]='!session.open')
-        i.fas.fa-circle.text-success.mr-2(*ngIf='session.open')
-        i.fas.fa-circle.text-danger.mr-2(*ngIf='!session.open')
-        strong.mr-auto(*ngIf='session') {{session.connection.user}}@{{session.connection.host}}:{{session.connection.port}}
-
-        button.btn.btn-secondary((click)='showPortForwarding()', *ngIf='session.open')
-            i.fas.fa-plug
-            span Ports
-
-        button.btn.btn-info((click)='reconnect()', *ngIf='!session.open')
-            i.fas.fa-reload
-            span Reconnect
+button.btn.btn-outline-secondary((click)='showPortForwarding()')
+    i.fas.fa-plug
+    span Ports
--- a/terminus-ssh/src/components/sshTab.component.scss
+++ b/terminus-ssh/src/components/sshTab.component.scss
@@ -13,59 +13,10 @@
        margin: 15px;
    }

-    .ssh-tab-toolbar {
+    &> button {
        position: absolute;
-        top: 0;
-        left: 0;
-        right: 0;
+        bottom: 20px;
+        right: 40px;
        z-index: 4;
-        pointer-events: none;
-
-        .reveal-button {
-            position: absolute;
-            top: 10px;
-            right: 30px;
-            border-radius: 50%;
-            width: 35px;
-            padding: 0;
-            height: 35px;
-            line-height: 35px;
-            transition: 0.125s opacity;
-            opacity: .5;
-            pointer-events: all;
-        }
-
-        &:hover .reveal-button {
-            opacity: 0;
-        }
-
-        &:hover .toolbar {
-            opacity: 1;
-        }
-
-        .toolbar {
-            opacity: 0;
-            background: rgba(0, 0, 0, .75);
-            padding: 10px 20px;
-            transition: 0.25s opacity;
-            display: flex;
-            align-items: center;
-            z-index: 1;
-            will-change: transform;
-
-            &>* {
-                pointer-events: all;
-            }
-        }
-
-        &.show {
-            .reveal-button {
-                opacity: 0;
-            }
-
-            .toolbar {
-                opacity: 1;
-            }
-        }
    }
 }
--- a/terminus-ssh/src/components/sshTab.component.ts
+++ b/terminus-ssh/src/components/sshTab.component.ts
@@ -1,5 +1,3 @@
-import colors from 'ansi-colors'
-import { Spinner } from 'cli-spinner'
 import { Component } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { first } from 'rxjs/operators'
@@ -10,7 +8,6 @@ import { SSHPortForwardingModalComponent } from './sshPortForwardingModal.compon

 /** @hidden */
@Component({
-    selector: 'ssh-tab',
    template: BaseTerminalTabComponent.template + require<string>('./sshTab.component.pug'),
    styles: [require('./sshTab.component.scss'), ...BaseTerminalTabComponent.styles],
    animations: BaseTerminalTabComponent.animations,
@@ -45,32 +42,23 @@ export class SSHTabComponent extends BaseTerminalTabComponent {

        this.session = this.ssh.createSession(this.connection)
        this.session.serviceMessage$.subscribe(msg => {
-            this.write('\r\n' + colors.black.bgWhite(' SSH ') + ' ' + msg + '\r\n')
+            this.write(`\r\n[SSH] ${msg}\r\n`)
            this.session.resize(this.size.columns, this.size.rows)
        })
        this.attachSessionHandlers()
        this.write(`Connecting to ${this.connection.host}`)
-
-        const spinner = new Spinner({
-            text: 'Connecting',
-            stream: {
-                write: x => this.write(x),
-            },
-        })
-        spinner.setSpinnerString(6)
-        spinner.start()
-
+        const interval = setInterval(() => this.write('.'), 500)
        try {
            await this.ssh.connectSession(this.session, (message: string) => {
-                spinner.stop(true)
-                this.write(message + '\r\n')
-                spinner.start()
+                this.write('\r\n' + message)
            })
-            spinner.stop(true)
        } catch (e) {
-            spinner.stop(true)
-            this.write(colors.black.bgRed(' X ') + ' ' + colors.red(e.message) + '\r\n')
+            this.write('\r\n')
+            this.write(e.message)
            return
+        } finally {
+            clearInterval(interval)
+            this.write('\r\n')
        }
        await this.session.start()
        this.session.resize(this.size.columns, this.size.rows)
@@ -80,7 +68,6 @@ export class SSHTabComponent extends BaseTerminalTabComponent {
        return {
            type: 'app:ssh-tab',
            connection: this.connection,
-            savedState: this.frontend?.saveState(),
        }
    }

@@ -88,8 +75,4 @@ export class SSHTabComponent extends BaseTerminalTabComponent {
        const modal = this.ngbModal.open(SSHPortForwardingModalComponent).componentInstance as SSHPortForwardingModalComponent
        modal.session = this.session
    }
-
-    reconnect () {
-        this.initializeSession()
-    }
 }
--- a/terminus-ssh/src/recoveryProvider.ts
+++ b/terminus-ssh/src/recoveryProvider.ts
@@ -10,10 +10,7 @@ export class RecoveryProvider extends TabRecoveryProvider {
        if (recoveryToken && recoveryToken.type === 'app:ssh-tab') {
            return {
                type: SSHTabComponent,
-                options: {
-                    connection: recoveryToken.connection,
-                    savedState: recoveryToken.savedState,
-                },
+                options: { connection: recoveryToken.connection },
            }
        }
        return null
--- a/terminus-ssh/src/services/ssh.service.ts
+++ b/terminus-ssh/src/services/ssh.service.ts
@@ -1,10 +1,8 @@
-import colors from 'ansi-colors'
 import { Injectable, NgZone } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { Client } from 'ssh2'
 import * as fs from 'mz/fs'
 import * as path from 'path'
-import * as sshpk from 'sshpk'
 import { ToastrService } from 'ngx-toastr'
 import { AppService, HostAppService, Platform, Logger, LogService } from 'terminus-core'
 import { SSHConnection, SSHSession } from '../api'
@@ -14,7 +12,7 @@ import { PasswordStorageService } from './passwordStorage.service'
 import { SSH2Stream } from 'ssh2-streams'

 try {
-    var windowsProcessTreeNative = require('windows-process-tree/build/Release/windows_process_tree.node') // eslint-disable-line @typescript-eslint/no-var-requires, no-var
+    var windowsProcessTreeNative = require('windows-process-tree/build/Release/windows_process_tree.node') // eslint-disable-line @typescript-eslint/no-var-requires
 } catch { }

@Injectable({ providedIn: 'root' })
@@ -34,14 +32,10 @@ export class SSHService {
    }

    async openTab (connection: SSHConnection): Promise<SSHTabComponent> {
-        const tab = this.zone.run(() => this.app.openNewTab(
+        return this.zone.run(() => this.app.openNewTab(
            SSHTabComponent,
            { connection }
        ) as SSHTabComponent)
-        if (connection.color) {
-            (this.app.getParentTab(tab) || tab).color = connection.color
-        }
-        return tab
    }

    createSession (connection: SSHConnection): SSHSession {
@@ -52,6 +46,7 @@ export class SSHService {

    async connectSession (session: SSHSession, logCallback?: (s: any) => void): Promise<void> {
        let privateKey: string|null = null
+        let privateKeyPassphrase: string|null = null
        let privateKeyPath = session.connection.privateKey

        if (!logCallback) {
@@ -66,46 +61,38 @@ export class SSHService {
        if (!privateKeyPath) {
            const userKeyPath = path.join(process.env.HOME as string, '.ssh', 'id_rsa')
            if (await fs.exists(userKeyPath)) {
-                log('Using user\'s default private key')
+                log(`Using user's default private key: ${userKeyPath}`)
                privateKeyPath = userKeyPath
            }
        }

        if (privateKeyPath) {
-            log('Loading private key from ' + colors.bgWhite.blackBright(' ' + privateKeyPath + ' '))
            try {
                privateKey = (await fs.readFile(privateKeyPath)).toString()
            } catch (error) {
-                log(colors.bgRed.black(' X ') + 'Could not read the private key file')
+                log('Could not read the private key file')
                this.toastr.error('Could not read the private key file')
            }

            if (privateKey) {
-                let parsedKey: any = null
-                try {
-                    parsedKey = sshpk.parsePrivateKey(privateKey, 'auto')
-                } catch (e) {
-                    if (e instanceof sshpk.KeyEncryptedError) {
-                        const modal = this.ngbModal.open(PromptModalComponent)
-                        log(colors.bgYellow.yellow.black(' ! ') + ' Key requires passphrase')
-                        modal.componentInstance.prompt = 'Private key passphrase'
-                        modal.componentInstance.password = true
-                        let passphrase = ''
-                        try {
-                            const result  = await modal.result
-                            passphrase = result?.value
-                        } catch (e) { }
-                        parsedKey = sshpk.parsePrivateKey(
-                            privateKey,
-                            'auto',
-                            { passphrase: passphrase }
-                        )
-                    } else {
-                        throw e
-                    }
-                }
+                log(`Loading private key from ${privateKeyPath}`)

-                privateKey = parsedKey!.toString('pem')
+                let encrypted = privateKey.includes('ENCRYPTED')
+                if (privateKeyPath.toLowerCase().endsWith('.ppk')) {
+                    encrypted = encrypted || privateKey.includes('Encryption:') && !privateKey.includes('Encryption: none')
+                }
+                if (encrypted) {
+                    const modal = this.ngbModal.open(PromptModalComponent)
+                    log('Key requires passphrase')
+                    modal.componentInstance.prompt = 'Private key passphrase'
+                    modal.componentInstance.password = true
+                    try {
+                        const result  = await modal.result
+                        if (result) {
+                            privateKeyPassphrase = result.value
+                        }
+                    } catch (e) { }
+                }
            }
        }

@@ -134,7 +121,7 @@ export class SSHService {
                })
            })
            ssh.on('keyboard-interactive', (name, instructions, instructionsLang, prompts, finish) => this.zone.run(async () => {
-                log(colors.bgBlackBright(' ') + ` Keyboard-interactive auth requested: ${name}`)
+                log(`Keyboard-interactive auth requested: ${name}`)
                this.logger.info('Keyboard-interactive auth:', name, instructions, instructionsLang)
                const results: string[] = []
                for (const prompt of prompts) {
@@ -148,15 +135,11 @@ export class SSHService {
            }))

            ssh.on('greeting', greeting => {
-                if (!session.connection.skipBanner) {
-                    log('Greeting: ' + greeting)
-                }
+                log('Greeting: ' + greeting)
            })

            ssh.on('banner', banner => {
-                if (!session.connection.skipBanner) {
-                    log(banner)
-                }
+                log('Banner: \n' + banner)
            })

            let agent: string|null = null
@@ -180,6 +163,7 @@ export class SSHService {
                    username: session.connection.user,
                    password: session.connection.privateKey ? undefined : '',
                    privateKey: privateKey || undefined,
+                    passphrase: privateKeyPassphrase || undefined,
                    tryKeyboard: true,
                    agent: agent || undefined,
                    agentForward: !!agent,
@@ -187,8 +171,7 @@ export class SSHService {
                    keepaliveCountMax: session.connection.keepaliveCountMax,
                    readyTimeout: session.connection.readyTimeout,
                    hostVerifier: digest => {
-                        log(colors.bgWhite(' ') + ' Host key fingerprint:')
-                        log(colors.bgWhite(' ') + ' ' + colors.black.bgWhite(' SHA256 ') + colors.bgBlackBright(' ' + digest + ' '))
+                        log('SHA256 fingerprint: ' + digest)
                        return true
                    },
                    hostHash: 'sha256' as any,
@@ -226,7 +209,7 @@ export class SSHService {
                        if (result.remember) {
                            savedPassword = result.value
                        }
-                        return result.value
+                        return await result.value
                    }
                    return ''
                } catch (_) {
--- a/terminus-ssh/yarn.lock
+++ b/terminus-ssh/yarn.lock
@@ -20,70 +20,28 @@
    "@types/node" "*"

 "@types/ssh2@^0.5.35":
-  version "0.5.40"
-  resolved "https://registry.yarnpkg.com/@types/ssh2/-/ssh2-0.5.40.tgz#b65465897f40c67e66e630b1f059f13a1ea7f1fa"
-  integrity sha512-Yrs2vFIirdscR+xY4leiUosHTClRbVBiFLlm5gA0JMZMjbCulHKO3qcgMqATElrquiZal5sSHoXMk4t8DzDawA==
+  version "0.5.39"
+  resolved "https://registry.yarnpkg.com/@types/ssh2/-/ssh2-0.5.39.tgz#e39ab7e38fc01337f66237ed6c42237ef3e58e3b"
+  integrity sha512-MtX4tr6Jtdn/JPVsQytjB/NBeOd7JfCyf/l79KOdkUYL+r4GXUXcySX1n8W4O61fnQdljTBXEPJJ2dhnGhi2xg==
  dependencies:
    "@types/node" "*"
    "@types/ssh2-streams" "*"

-ansi-colors@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
-asn1@~0.2.0, asn1@~0.2.3:
+asn1@~0.2.0:
  version "0.2.4"
  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
  dependencies:
    safer-buffer "~2.1.0"

-assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-
-bcrypt-pbkdf@^1.0.0, bcrypt-pbkdf@^1.0.2:
+bcrypt-pbkdf@^1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
  dependencies:
    tweetnacl "^0.14.3"

-cli-spinner@^0.2.10:
-  version "0.2.10"
-  resolved "https://registry.yarnpkg.com/cli-spinner/-/cli-spinner-0.2.10.tgz#f7d617a36f5c47a7bc6353c697fc9338ff782a47"
-  integrity sha512-U0sSQ+JJvSLi1pAYuJykwiA8Dsr15uHEy85iCJ6A+0DjVxivr3d+N2Wjvodeg89uP5K6TswFkKBfAD7B3YSn/Q==
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
-  dependencies:
-    assert-plus "^1.0.0"
-
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
-  dependencies:
-    assert-plus "^1.0.0"
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
-
-safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+safer-buffer@~2.1.0:
  version "2.1.2"
  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -104,21 +62,6 @@ ssh2@^0.8.2:
  dependencies:
    ssh2-streams "~0.4.8"

-sshpk@^1.16.1:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
-  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
 streamsearch@~0.1.2:
  version "0.1.2"
  resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a"
@@ -129,7 +72,7 @@ terminus-terminal@^1.0.98-nightly.0:
  resolved "https://registry.yarnpkg.com/terminus-terminal/-/terminus-terminal-1.0.98-nightly.0.tgz#10df71b0a81adf76a076fb21a91c859dd2f8bef7"
  integrity sha512-JLxkeoQkORcfe6cRW6BJF5ZPSbvKA8IWUAb7fzBONVmNfRKj2Mq/uYPy76UXsdmb9F1n+rYIg+DShNp57asMKA==

-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+tweetnacl@^0.14.3:
  version "0.14.5"
  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
--- a/terminus-terminal/package.json
+++ b/terminus-terminal/package.json
@@ -1,6 +1,6 @@
 {
  "name": "terminus-terminal",
-  "version": "1.0.99-nightly.0",
+  "version": "1.0.98-nightly.0",
  "description": "Terminus' terminal emulation core",
  "keywords": [
    "terminus-builtin-plugin"
@@ -19,23 +19,19 @@
  "devDependencies": {
    "@types/deep-equal": "^1.0.0",
    "@types/slug": "^0.9.1",
-    "ansi-colors": "^4.1.1",
    "dataurl": "0.1.0",
    "deep-equal": "1.1.0",
    "hterm-umdjs": "1.4.1",
    "mz": "^2.6.0",
    "ps-node": "^0.1.6",
    "runes": "^0.4.2",
-    "slug": "^2.0.0",
+    "slug": "^1.1.0",
    "uuid": "^3.3.2",
-    "xterm": "^4.4.0-beta.15",
+    "xterm": "4.3.0",
    "xterm-addon-fit": "^0.4.0-beta2",
    "xterm-addon-ligatures": "^0.2.1",
-    "xterm-addon-search": "^0.5.0",
-    "xterm-addon-serialize": "^0.1.1",
-    "xterm-addon-unicode11": "^0.1.1",
-    "xterm-addon-webgl": "^0.6.0-beta.2",
-    "zmodem.js": "^0.1.9"
+    "xterm-addon-search": "^0.4.0",
+    "xterm-addon-webgl": "^0.4.0"
  },
  "peerDependencies": {
    "@angular/animations": "^7",
--- a/terminus-terminal/src/api/baseTerminalTab.component.ts
+++ b/terminus-terminal/src/api/baseTerminalTab.component.ts
@@ -1,10 +1,9 @@
 import { Observable, Subject, Subscription } from 'rxjs'
 import { first } from 'rxjs/operators'
 import { ToastrService } from 'ngx-toastr'
-import colors from 'ansi-colors'
 import { NgZone, OnInit, OnDestroy, Inject, Injector, Optional, ViewChild, HostBinding, Input, ElementRef } from '@angular/core'
 import { trigger, transition, style, animate, AnimationTriggerMetadata } from '@angular/animations'
-import { AppService, ConfigService, BaseTabComponent, ElectronService, HostAppService, HotkeysService, Platform, LogService, Logger, TabContextMenuItemProvider } from 'terminus-core'
+import { AppService, ConfigService, BaseTabComponent, ElectronService, HostAppService, HotkeysService, Platform, LogService, Logger } from 'terminus-core'

 import { BaseSession, SessionsService } from '../services/sessions.service'
 import { TerminalFrontendService } from '../services/terminalFrontend.service'
@@ -12,6 +11,7 @@ import { TerminalFrontendService } from '../services/terminalFrontend.service'
 import { Frontend } from '../frontends/frontend'
 import { ResizeEvent } from './interfaces'
 import { TerminalDecorator } from './decorator'
+import { TerminalContextMenuItemProvider } from './contextMenuProvider'


 /** @hidden */
@@ -35,8 +35,6 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
    ])]

    session: BaseSession
-    savedState: any
-
    @Input() zoom = 0

    @Input() showSearchPanel = false
@@ -58,11 +56,6 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
    frontendReady = new Subject<void>()
    size: ResizeEvent

-    /**
-     * Enables normall passthrough from session output to terminal input
-     */
-    enablePassthrough = true
-
    protected logger: Logger
    protected output = new Subject<string>()
    private sessionCloseSubscription: Subscription
@@ -90,7 +83,7 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
        @Inject(ToastrService) protected toastr: ToastrServiceProxy,
        protected log: LogService,
        @Optional() @Inject(TerminalDecorator) protected decorators: TerminalDecorator[],
-        @Optional() @Inject(TabContextMenuItemProvider) protected contextMenuProviders: TabContextMenuItemProvider[],
+        @Optional() @Inject(TerminalContextMenuItemProvider) protected contextMenuProviders: TerminalContextMenuItemProvider[],
    ) {
        super()
        this.logger = log.create('baseTerminalTab')
@@ -174,14 +167,6 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
            this.size = { columns, rows }
            this.frontendReady.next()

-            this.config.enabledServices(this.decorators).forEach(decorator => {
-                try {
-                    decorator.attach(this)
-                } catch (e) {
-                    this.logger.warn('Decorator attach() throws', e)
-                }
-            })
-
            setTimeout(() => {
                this.session.resize(columns, rows)
            }, 1000)
@@ -189,13 +174,6 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
            this.session.releaseInitialDataBuffer()
        })

-        if (this.savedState) {
-            this.frontend.restoreState(this.savedState)
-            this.frontend.write('\r\n\r\n')
-            this.frontend.write(colors.bgWhite.black(' * ') + colors.bgBlackBright.white(' History restored '))
-            this.frontend.write('\r\n\r\n')
-        }
-
        setImmediate(() => {
            if (this.hasFocus) {
                this.frontend.attach(this.content.nativeElement)
@@ -212,6 +190,14 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit

        this.configure()

+        this.config.enabledServices(this.decorators).forEach((decorator) => {
+            try {
+                decorator.attach(this)
+            } catch (e) {
+                this.logger.warn('Decorator attach() throws', e)
+            }
+        })
+
        setTimeout(() => {
            this.output.subscribe(() => {
                this.displayActivity()
@@ -262,7 +248,7 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
            const percentage = percentageMatch[3] ? parseFloat(percentageMatch[2]) : parseInt(percentageMatch[2])
            if (percentage > 0 && percentage <= 100) {
                this.setProgress(percentage)
-                // this.logger.debug('Detected progress:', percentage)
+                this.logger.debug('Detected progress:', percentage)
            }
        } else {
            this.setProgress(null)
@@ -367,9 +353,7 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
            this.frontend.mouseEvent$.subscribe(async event => {
                if (event.type === 'mousedown') {
                    if (event.which === 2) {
-                        if (this.config.store.terminal.pasteOnMiddleClick) {
-                            this.paste()
-                        }
+                        this.paste()
                        event.preventDefault()
                        event.stopPropagation()
                        return
@@ -424,12 +408,10 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
    protected attachSessionHandlers () {
        // this.session.output$.bufferTime(10).subscribe((datas) => {
        this.session.output$.subscribe(data => {
-            if (this.enablePassthrough) {
-                this.zone.run(() => {
-                    this.output.next(data)
-                    this.write(data)
-                })
-            }
+            this.zone.run(() => {
+                this.output.next(data)
+                this.write(data)
+            })
        })

        this.sessionCloseSubscription = this.session.closed$.subscribe(() => {
--- a/terminus-terminal/src/api/contextMenuProvider.ts
+++ b/terminus-terminal/src/api/contextMenuProvider.ts
@@ -2,7 +2,6 @@ import { BaseTerminalTabComponent } from './baseTerminalTab.component'

 /**
 * Extend to add more terminal context menu items
- * @deprecated
 */
 export abstract class TerminalContextMenuItemProvider {
    weight: number
--- a/terminus-terminal/src/api/decorator.ts
+++ b/terminus-terminal/src/api/decorator.ts
@@ -1,35 +1,16 @@
-import { Subscription } from 'rxjs'
 import { BaseTerminalTabComponent } from './baseTerminalTab.component'

 /**
 * Extend to automatically run actions on new terminals
 */
 export abstract class TerminalDecorator {
-    private smartSubscriptions = new Map<BaseTerminalTabComponent, Subscription[]>()
-
    /**
     * Called when a new terminal tab starts
     */
    attach (terminal: BaseTerminalTabComponent): void { } // eslint-disable-line

    /**
-     * Called before a terminal tab is destroyed.
-     * Make sure to call super()
+     * Called before a terminal tab is destroyed
     */
-    detach (terminal: BaseTerminalTabComponent): void {
-        for (const s of this.smartSubscriptions.get(terminal) || []) {
-            s.unsubscribe()
-        }
-        this.smartSubscriptions.delete(terminal)
-    }
-
-    /**
-     * Automatically cancel @subscription once detached from @terminal
-     */
-    protected subscribeUntilDetached (terminal: BaseTerminalTabComponent, subscription: Subscription) {
-        if (!this.smartSubscriptions.has(terminal)) {
-            this.smartSubscriptions.set(terminal, [])
-        }
-        this.smartSubscriptions.get(terminal)?.push(subscription)
-    }
+    detach (terminal: BaseTerminalTabComponent): void { } // eslint-disable-line
 }
--- a/terminus-terminal/src/api/interfaces.ts
+++ b/terminus-terminal/src/api/interfaces.ts
@@ -16,9 +16,8 @@ export interface SessionOptions {
 }

 export interface Profile {
-    name: string
-    color?: string
-    sessionOptions: SessionOptions
+    name: string,
+    sessionOptions: SessionOptions,
    isBuiltin?: boolean
    icon?: string
 }
--- a/terminus-terminal/src/bufferizedPTY.js
+++ b/terminus-terminal/src/bufferizedPTY.js
@@ -8,7 +8,7 @@ module.exports = function patchPTYModule (mod) {
  mod.spawn = (file, args, opt) => {
    let terminal = oldSpawn(file, args, opt)
    let timeout = null
-    let buffer = Buffer.from('')
+    let buffer = ''
    let lastFlush = 0
    let nextTimeout = 0

@@ -19,11 +19,11 @@ module.exports = function patchPTYModule (mod) {
    const maxWindow = 100

    function flush () {
-        if (buffer.length) {
+        if (buffer) {
            terminal.emit('data-buffered', buffer)
        }
        lastFlush = Date.now()
-        buffer = Buffer.from('')
+        buffer = ''
    }

    function reschedule () {
@@ -38,15 +38,12 @@ module.exports = function patchPTYModule (mod) {
    }

    terminal.on('data', data => {
-        if (typeof data === 'string') {
-            data = Buffer.from(data)
-        }
-        buffer = Buffer.concat([buffer, data])
+        buffer += data
        if (Date.now() - lastFlush > maxWindow) {
            // Taking too much time buffering, flush to keep things interactive
            flush()
        } else {
-            if (Date.now() > nextTimeout - maxWindow / 10) {
+            if (Date.now() > nextTimeout - (maxWindow / 10)) {
                // Extend the window if it's expiring
                reschedule()
            }
--- a/terminus-terminal/src/components/appearanceSettingsTab.component.ts
+++ b/terminus-terminal/src/components/appearanceSettingsTab.component.ts
@@ -5,9 +5,10 @@ import deepEqual from 'deep-equal'
 const fontManager = require('fontmanager-redux') // eslint-disable-line

 import { Component, Inject } from '@angular/core'
-import { ConfigService, HostAppService, Platform, ElectronService, getCSSFontFamily } from 'terminus-core'
+import { ConfigService, HostAppService, Platform, ElectronService } from 'terminus-core'
 import { TerminalColorSchemeProvider } from '../api/colorSchemeProvider'
 import { TerminalColorScheme } from '../api/interfaces'
+import { getCSSFontFamily } from '../utils'

 /** @hidden */
@Component({
--- a/terminus-terminal/src/components/editProfileModal.component.pug
+++ b/terminus-terminal/src/components/editProfileModal.component.pug
@@ -53,15 +53,6 @@
            [(model)]='profile.sessionOptions.env',
        )

-    .form-group
-        label Tab color
-        input.form-control(
-            type='text',
-            autofocus,
-            [(ngModel)]='profile.color',
-            placeholder='#000000'
-        )
-
 .modal-footer
    button.btn.btn-outline-primary((click)='save()') Save
    button.btn.btn-outline-danger((click)='cancel()') Cancel
--- a/terminus-terminal/src/components/shellSettingsTab.component.ts
+++ b/terminus-terminal/src/components/shellSettingsTab.component.ts
@@ -2,10 +2,11 @@ import slug from 'slug'
 import { Component } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { Subscription } from 'rxjs'
-import { ConfigService, ElectronService, HostAppService, Platform, WIN_BUILD_CONPTY_SUPPORTED, WIN_BUILD_CONPTY_STABLE, isWindowsBuild } from 'terminus-core'
+import { ConfigService, ElectronService, HostAppService, Platform } from 'terminus-core'
 import { EditProfileModalComponent } from './editProfileModal.component'
 import { Shell, Profile } from '../api/interfaces'
 import { TerminalService } from '../services/terminal.service'
+import { WIN_BUILD_CONPTY_SUPPORTED, WIN_BUILD_CONPTY_STABLE, isWindowsBuild } from '../utils'

 /** @hidden */
@Component({
--- a/terminus-terminal/src/components/terminalSettingsTab.component.pug
+++ b/terminus-terminal/src/components/terminalSettingsTab.component.pug
@@ -42,13 +42,6 @@ h3.mb-3 Terminal
        (ngModelChange)='config.save()',
        ngbRadioGroup
    )
-        label.btn.btn-secondary(ngbButtonLabel)
-            input(
-                type='radio',
-                ngbButton,
-                value='off'
-            )
-            | Off
        label.btn.btn-secondary(ngbButtonLabel)
            input(
                type='radio',
@@ -64,15 +57,6 @@ h3.mb-3 Terminal
            )
            | Paste
            
-.form-line
-    .header
-        .title Paste on middle-click
-            
-    toggle(
-        [(ngModel)]='config.store.terminal.pasteOnMiddleClick',
-        (ngModelChange)='config.save()',
-    )
-
 .form-line
    .header
        .title Auto-open a terminal on app start
--- a/terminus-terminal/src/components/terminalTab.component.ts
+++ b/terminus-terminal/src/components/terminalTab.component.ts
@@ -1,10 +1,11 @@
 import { Component, Input } from '@angular/core'
 import { Subscription } from 'rxjs'
 import { first } from 'rxjs/operators'
-import { BaseTabProcess, WIN_BUILD_CONPTY_SUPPORTED, isWindowsBuild } from 'terminus-core'
+import { BaseTabProcess } from 'terminus-core'
 import { BaseTerminalTabComponent } from '../api/baseTerminalTab.component'
 import { SessionOptions } from '../api/interfaces'
 import { Session } from '../services/sessions.service'
+import { WIN_BUILD_CONPTY_SUPPORTED, isWindowsBuild } from '../utils'

 /** @hidden */
@Component({
@@ -64,7 +65,6 @@ export class TerminalTabComponent extends BaseTerminalTabComponent {
                ...this.sessionOptions,
                cwd: cwd || this.sessionOptions.cwd,
            },
-            savedState: this.frontend?.saveState(),
        }
    }

--- a/terminus-terminal/src/config.ts
+++ b/terminus-terminal/src/config.ts
@@ -25,7 +25,6 @@ export class TerminalConfigProvider extends ConfigProvider {
            cursorBlink: true,
            customShell: '',
            rightClick: 'menu',
-            pasteOnMiddleClick: true,
            copyOnSelect: false,
            scrollOnInput: true,
            workingDirectory: '',
@@ -114,7 +113,6 @@ export class TerminalConfigProvider extends ConfigProvider {
                shell: 'clink',
                profile: 'cmd-clink',
                rightClick: 'paste',
-                pasteOnMiddleClick: false,
                copyOnSelect: true,
            },
            hotkeys: {
--- a/terminus-terminal/src/contextMenu.ts
+++ b/terminus-terminal/src/contextMenu.ts
@@ -0,0 +1,98 @@
+import { NgZone, Injectable } from '@angular/core'
+import { ToastrService } from 'ngx-toastr'
+import { ConfigService } from 'terminus-core'
+import { UACService } from './services/uac.service'
+import { TerminalService } from './services/terminal.service'
+import { TerminalContextMenuItemProvider } from './api/contextMenuProvider'
+import { BaseTerminalTabComponent } from './api/baseTerminalTab.component'
+
+/** @hidden */
+@Injectable()
+export class NewTabContextMenu extends TerminalContextMenuItemProvider {
+    weight = 0
+
+    constructor (
+        public config: ConfigService,
+        private zone: NgZone,
+        private terminalService: TerminalService,
+        private uac: UACService,
+    ) {
+        super()
+    }
+
+    async getItems (tab: BaseTerminalTabComponent): Promise<Electron.MenuItemConstructorOptions[]> {
+        const profiles = await this.terminalService.getProfiles()
+
+        const items: Electron.MenuItemConstructorOptions[] = [
+            {
+                label: 'New terminal',
+                click: () => this.zone.run(() => {
+                    this.terminalService.openTabWithOptions((tab as any).sessionOptions)
+                }),
+            },
+            {
+                label: 'New with profile',
+                submenu: profiles.map(profile => ({
+                    label: profile.name,
+                    click: () => this.zone.run(async () => {
+                        const workingDirectory = this.config.store.terminal.alwaysUseWorkingDirectory === true ?
+                            this.config.store.terminal.workingDirectory : await tab.session.getWorkingDirectory()
+                        await this.terminalService.openTab(profile, workingDirectory)
+                    }),
+                })),
+            },
+        ]
+
+        if (this.uac.isAvailable) {
+            items.push({
+                label: 'New admin tab',
+                submenu: profiles.map(profile => ({
+                    label: profile.name,
+                    click: () => this.zone.run(async () => {
+                        this.terminalService.openTabWithOptions({
+                            ...profile.sessionOptions,
+                            runAsAdministrator: true,
+                        })
+                    }),
+                })),
+            })
+        }
+
+        return items
+    }
+}
+
+/** @hidden */
+@Injectable()
+export class CopyPasteContextMenu extends TerminalContextMenuItemProvider {
+    weight = 1
+
+    constructor (
+        private zone: NgZone,
+        private toastr: ToastrService,
+    ) {
+        super()
+    }
+
+    async getItems (tab: BaseTerminalTabComponent): Promise<Electron.MenuItemConstructorOptions[]> {
+        return [
+            {
+                label: 'Copy',
+                click: () => {
+                    this.zone.run(() => {
+                        setTimeout(() => {
+                            tab.frontend.copySelection()
+                            this.toastr.info('Copied')
+                        })
+                    })
+                },
+            },
+            {
+                label: 'Paste',
+                click: () => {
+                    this.zone.run(() => tab.paste())
+                },
+            },
+        ]
+    }
+}
--- a/terminus-terminal/src/features/debug.ts
+++ b/terminus-terminal/src/features/debug.ts
@@ -1,69 +0,0 @@
-import * as fs from 'fs'
-import { Injectable } from '@angular/core'
-import { TerminalDecorator } from '../api/decorator'
-import { TerminalTabComponent } from '../components/terminalTab.component'
-import { ElectronService, HostAppService } from 'terminus-core'
-
-/** @hidden */
-@Injectable()
-export class DebugDecorator extends TerminalDecorator {
-    constructor (
-        private electron: ElectronService,
-        private hostApp: HostAppService,
-    ) {
-        super()
-    }
-
-    attach (terminal: TerminalTabComponent): void {
-        terminal.content.nativeElement.addEventListener('keyup', e => {
-            if (e.which === 49 && e.ctrlKey && e.shiftKey && e.altKey) {
-                this.doSaveOutput(terminal)
-            }
-            if (e.which === 50 && e.ctrlKey && e.shiftKey && e.altKey) {
-                this.doLoadInput(terminal)
-            }
-            if (e.which === 51 && e.ctrlKey && e.shiftKey && e.altKey) {
-                this.doCopyOutput(terminal)
-            }
-            if (e.which === 52 && e.ctrlKey && e.shiftKey && e.altKey) {
-                this.doPasteOutput(terminal)
-            }
-        })
-    }
-
-    async doSaveOutput (terminal: TerminalTabComponent) {
-        const result = await this.electron.dialog.showSaveDialog(
-            this.hostApp.getWindow(),
-            {
-                defaultPath: 'output.txt',
-            },
-        )
-        if (result.filePath) {
-            fs.writeFileSync(result.filePath, terminal.frontend.saveState())
-        }
-    }
-
-    async doCopyOutput (terminal: TerminalTabComponent) {
-        const data = '```' + JSON.stringify(terminal.frontend.saveState()) + '```'
-        this.electron.clipboard.writeText(data)
-    }
-
-    async doLoadInput (terminal: TerminalTabComponent) {
-        const result = await this.electron.dialog.showOpenDialog(
-            this.hostApp.getWindow(),
-            {
-                buttonLabel: 'Load',
-                properties: ['openFile', 'treatPackageAsDirectory'],
-            },
-        )
-        if (result.filePaths.length) {
-            const data = fs.readFileSync(result.filePaths[0])
-            terminal.frontend.restoreState(data)
-        }
-    }
-
-    async doPasteOutput (terminal: TerminalTabComponent) {
-        const data = JSON.parse(this.electron.clipboard.readText())
-        terminal.frontend.restoreState(data)
-    }
-}
--- a/Show More
+++ b/Show More