Bump @types/node from 12.7.8 to 12.7.12 in /app (#1604 )

Bump @types/node from 12.7.8 to 12.7.12 in /app
2025-08-18 23:31:51 +00:00 · 2019-10-14 21:15:45 -07:00 · 2019-10-15 04:15:33 +00:00 · 2019-10-14 21:14:05 -07:00 · 2019-10-14 21:13:57 -07:00 · 2019-10-14 21:13:44 -07:00
84 changed files with 999 additions and 693 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -207,6 +207,15 @@
      "contributions": [
        "code"
      ]
+    },
+    {
+      "login": "ckaczor",
+      "name": "Chris Kaczor",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/180906?v=4",
+      "profile": "https://chriskaczor.com",
+      "contributions": [
+        "code"
+      ]
    }
  ],
  "contributorsPerLine": 7,
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -45,7 +45,8 @@ rules:
  - error
  - never
  block-scoped-var: error
-  brace-style:
+  brace-style: off
+  '@typescript-eslint/brace-style':
  - error
  - 1tbs
  - allowSingleLine: true
@@ -91,3 +92,5 @@ rules:
  - error
  - single
  - allowTemplateLiterals: true
+  '@typescript-eslint/no-non-null-assertion': off
+  '@typescript-eslint/no-unnecessary-condition': off
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,7 +1,7 @@
 # Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
+daysUntilStale: 180
 # Number of days of inactivity before a stale issue is closed
-daysUntilClose: 14
+daysUntilClose: 90
 # Issues with these labels will never be considered stale
 exemptLabels:
  - "T: Enhancement"
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -17,6 +17,11 @@ jobs:
      run: |
        eval $(ssh-agent -s)
        ssh-add <(echo "$DOCS_PRIVATE_KEY")
+        yarn cache clean
+        cd app
+        yarn
+        cd ..
+        rm app/node_modules/.yarn-integrity
        yarn
        yarn run docs
        rsync -e "ssh -o StrictHostKeyChecking=no" -arv docs/api/ root@ajenti.org:/srv/terminus-docs/
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,26 @@
+name: Lint
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: macOS-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+
+    - name: Installing Node
+      uses: actions/setup-node@v1
+      with:
+        version: 10
+
+    - name: Install deps
+      run: |
+        npm i -g yarn@1.19.1
+        cd app
+        yarn
+        cd ..
+        rm app/node_modules/.yarn-integrity
+        yarn
+
+    - name: Lint
+      run: yarn run lint
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -15,15 +15,13 @@ jobs:

    - name: Install deps
      run: |
+        npm i -g yarn@1.19.1
        cd app
        yarn
        cd ..
        rm app/node_modules/.yarn-integrity
        yarn

-    - name: Lint
-      run: yarn run lint
-
    - name: Build native deps
      run: scripts/build-native.js

--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -15,15 +15,13 @@ jobs:

    - name: Install deps
      run: |
+        sudo npm i -g yarn@1.19.1
        cd app
        yarn
        cd ..
        rm app/node_modules/.yarn-integrity
        yarn

-    - name: Lint
-      run: yarn run lint
-
    - name: Build native deps
      run: scripts/build-native.js

@@ -36,14 +34,21 @@ jobs:
    - name: Prepackage plugins
      run: scripts/prepackage-plugins.js

-    - name: Build packages
+    - name: Build and sign packages
      run: scripts/build-macos.js
+      if: github.repository == 'Eugeny/terminus' && github.event_name == 'push'
      env:
        DEBUG: electron-builder,electron-builder:*
        GH_TOKEN: ${{ secrets.GH_TOKEN }}
        CSC_LINK: ${{ secrets.CSC_LINK }}
        CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}

+    - name: Build packages without signing
+      run: scripts/build-macos.js
+      if: github.repository != 'Eugeny/terminus' || github.event_name != 'push'
+      env:
+        DEBUG: electron-builder,electron-builder:*
+
    - name: Package artifacts
      run: |
        mkdir artifact-pkg
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -16,17 +16,24 @@ jobs:
    - name: Build
      shell: powershell
      run: |
-        yarn add -D electron@6.0.7
+        npm i -g yarn@1.19.1
        yarn
        node scripts/build-native.js
        yarn run build
        node scripts/prepackage-plugins.js
-        node scripts/build-windows.js
+
+    - name: Build and sign packages
+      run: node scripts/build-windows.js
+      if: github.repository == 'Eugeny/terminus' && github.event_name == 'push'
      env:
        GH_TOKEN: ${{ secrets.GH_TOKEN }}
        WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }}
        WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }}

+    - name: Build packages without signing
+      run: node scripts/build-windows.js
+      if: github.repository != 'Eugeny/terminus' || github.event_name != 'push'
+
    - name: Package artifacts
      run: |
        mkdir artifact-setup
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -0,0 +1,14 @@
+pull_request_rules:
+  - name: automatic merge on CI success and review
+    conditions:
+    - "status-success=Windows Build / Build"
+    - "status-success=macOS Build / Build"
+    - "status-success=Linux Build / Build"
+    - "status-success=continuous-integration/appveyor/pr"
+    - "#approved-reviews-by>=1"
+    - "#changes-requested-reviews-by=0"
+    - base=master
+    actions:
+      merge:
+        method: merge
+        strict: true
--- a/README.md
+++ b/README.md
@@ -97,6 +97,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
  </tr>
  <tr>
    <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>
  </tr>
 </table>

--- a/app/package.json
+++ b/app/package.json
@@ -26,7 +26,7 @@
    "electron-debug": "^3.0.1",
    "electron-is-dev": "1.1.0",
    "electron-updater": "^4.0.6",
-    "fontmanager-redux": "0.3.3",
+    "fontmanager-redux": "0.4.0",
    "js-yaml": "3.13.1",
    "keytar": "4.13.0",
    "mz": "^2.7.0",
@@ -36,7 +36,7 @@
    "path": "0.12.7",
    "rxjs": "^6.5.3",
    "rxjs-compat": "^6.5.3",
-    "yargs": "^14.0.0",
+    "yargs": "^14.2.0",
    "zone.js": "^0.8.29"
  },
  "optionalDependencies": {
@@ -48,7 +48,7 @@
  },
  "devDependencies": {
    "@types/mz": "0.0.32",
-    "@types/node": "^12.7.4",
+    "@types/node": "^12.7.12",
    "node-abi": "^2.11.0"
  }
 }
--- a/app/src/entry.ts
+++ b/app/src/entry.ts
@@ -19,7 +19,7 @@ location.hash = ''
 ;(process as any).enablePromiseAPI = true

 if (process.platform === 'win32' && !('HOME' in process.env)) {
-    process.env.HOME = process.env.HOMEDRIVE + process.env.HOMEPATH
+    process.env.HOME = `${process.env.HOMEDRIVE}${process.env.HOMEPATH}`
 }

 if (isDev) {
--- a/app/src/plugins.ts
+++ b/app/src/plugins.ts
@@ -156,7 +156,9 @@ export async function findPlugins (): Promise<PluginInfo[]> {
        }
    }

-    (window as any).installedPlugins = foundPlugins
+    foundPlugins.sort((a, b) => a.name > b.name ? 1 : -1)
+
+    ;(window as any).installedPlugins = foundPlugins
    return foundPlugins
 }

--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -65,16 +65,21 @@
  dependencies:
    "@types/node" "*"

-"@types/node@*", "@types/node@^12.7.4":
-  version "12.7.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.4.tgz#64db61e0359eb5a8d99b55e05c729f130a678b04"
-  integrity sha512-W0+n1Y+gK/8G2P/piTkBBN38Qc5Q1ZSO6B5H3QmPCUewaiXOo2GCAWZ4ElZCcNhjJuBSUSLGFUJnmlCn5+nxOQ==
+"@types/node@*", "@types/node@^12.7.12":
+  version "12.7.12"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.12.tgz#7c6c571cc2f3f3ac4a59a5f2bd48f5bdbc8653cc"
+  integrity sha512-KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ==

 "@types/node@^10.12.18":
  version "10.12.18"
  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.18.tgz#1d3ca764718915584fcd9f6344621b7672665c67"
  integrity sha512-fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==

+"@types/semver@^6.0.1":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-6.0.2.tgz#5e8b09f0e4af53034b1d0fb9977a277847836205"
+  integrity sha512-G1Ggy7/9Nsa1Jt2yiBR2riEuyK2DFNnqow6R7cromXPMNynackRY1vqFTLz/gwnef1LHokbXThcPhqMRjUbkpQ==
+
 JSONStream@^1.3.4, JSONStream@^1.3.5:
  version "1.3.5"
  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
@@ -192,9 +197,9 @@ are-we-there-yet@~1.1.2:
    readable-stream "^2.0.6"

 argparse@^1.0.7:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
-  integrity sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
  dependencies:
    sprintf-js "~1.0.2"

@@ -268,23 +273,11 @@ block-stream@*:
  dependencies:
    inherits "~2.0.0"

-bluebird-lst@^1.0.6, bluebird-lst@^1.0.7:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.8.tgz#61b572e8b3eb57e0fff676a0e54566d93597e6a4"
-  integrity sha512-InUDOaBaIjIobOa3O4YRAbFgff907uTJZXW0m0rhk3zhVZ4GvsmdCLEAKC1CTWTtUWCM8iWTTfFX9N/xQR/etw==
-  dependencies:
-    bluebird "^3.5.4"
-
 bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.3:
  version "3.5.5"
  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
  integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==

-bluebird@^3.5.4:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714"
-  integrity sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==
-
 boxen@^1.2.1:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
@@ -329,14 +322,12 @@ buffer-from@^1.0.0:
  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==

-builder-util-runtime@~8.1.0:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.1.1.tgz#f2f6fc43e33d26892bd491667fc746ad69bccc50"
-  integrity sha512-+ieS4PMB33vVE2S3ZNWBEQJ1zKmAs/agrBdh7XadE1lKLjrH4aXYuOh9OOGdxqIRldhlhNBaF+yKMMEFOdNVig==
+builder-util-runtime@8.3.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.3.0.tgz#f5fac9139af6facf42a21fbe4d3aebed88fda33e"
+  integrity sha512-CSOdsYqf4RXIHh1HANPbrZHlZ9JQJXSuDDloblZPcWQVN62inyYoTQuSmY3KrgefME2Sv3Kn2MxHvbGQHRf8Iw==
  dependencies:
-    bluebird-lst "^1.0.6"
    debug "^4.1.1"
-    fs-extra-p "^7.0.0"
    sax "^1.2.4"

 builtins@^1.0.3:
@@ -802,19 +793,18 @@ electron-localshortcut@^3.1.0:
    keyboardevents-areequal "^0.2.1"

 electron-updater@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.0.6.tgz#9c4f495ae0e80bf4425e3e1b801c5ed2ab933c2d"
-  integrity sha512-JPGLME6fxJcHG8hX7HWFl6Aew6iVm0DkcrENreKa5SUJCHG+uUaAhxDGDt+YGcNkyx1uJ6eBGMvFxDTLUv67pg==
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.1.2.tgz#46a6e62cc8d0c7d935db7aff83207da2a21ff788"
+  integrity sha512-4Sk8IW0LfOilDz+WAB/gEDmX7+FUFRbKHGN1zGjehPilnd6H9cmjgBHK6Xzq/FLq/uOHGJ6GX/9tsF+jr7CvnA==
  dependencies:
-    bluebird-lst "^1.0.6"
-    builder-util-runtime "~8.1.0"
-    fs-extra-p "^7.0.0"
-    js-yaml "^3.12.0"
-    lazy-val "^1.0.3"
+    "@types/semver" "^6.0.1"
+    builder-util-runtime "8.3.0"
+    fs-extra "^8.1.0"
+    js-yaml "^3.13.1"
+    lazy-val "^1.0.4"
    lodash.isequal "^4.5.0"
-    pako "^1.0.7"
-    semver "^5.6.0"
-    source-map-support "^0.5.9"
+    pako "^1.0.10"
+    semver "^6.2.0"

 emoji-regex@^7.0.1:
  version "7.0.3"
@@ -949,10 +939,10 @@ flush-write-stream@^1.0.0:
    inherits "^2.0.3"
    readable-stream "^2.3.6"

-fontmanager-redux@0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/fontmanager-redux/-/fontmanager-redux-0.3.3.tgz#39f3493332d1694ef3bd1652ee11d66ae3e4f495"
-  integrity sha512-n7bz3J+8gHn1+bEsIwdNlZ+wYsof3JPijHW/HQ+0oYA/zVTAuryXYgBrIKboNymJmYnabACoLB0p4tv/vMPGMA==
+fontmanager-redux@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/fontmanager-redux/-/fontmanager-redux-0.4.0.tgz#f4c8232a2e2adc6e996a9d4516ab522d1a5da067"
+  integrity sha512-ZXo6KsOfU0+kvyKz49fpe1T+XIvFuWliQSSjLhMnDDlWIBCpIKN1fwTRIgY9guwzKMVym6uKXbeeqwpqVU1+Vg==

 forever-agent@~0.6.1:
  version "0.6.1"
@@ -989,20 +979,12 @@ fs-constants@^1.0.0:
  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==

-fs-extra-p@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-7.0.1.tgz#4eec0b6dfa150fa90f6ddd773b4fb1d55cad54e3"
-  integrity sha512-yhd2OV0HnHt2oitlp+X9hl2ReX4X/7kQeL7/72qzPHTZj5eUPGzAKOvEglU02Fa1OeG2rSy/aKB4WGVaLiF8tw==
+fs-extra@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
  dependencies:
-    bluebird-lst "^1.0.7"
-    fs-extra "^7.0.1"
-
-fs-extra@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
-  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
-  dependencies:
-    graceful-fs "^4.1.2"
+    graceful-fs "^4.2.0"
    jsonfile "^4.0.0"
    universalify "^0.1.0"

@@ -1150,11 +1132,16 @@ got@^6.7.1:
    unzip-response "^2.0.1"
    url-parse-lax "^1.0.0"

-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15:
  version "4.1.15"
  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==

+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
+  integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
+
 har-schema@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -1407,7 +1394,7 @@ isstream@~0.1.2:
  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=

-js-yaml@3.13.1, js-yaml@^3.12.0:
+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"
  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -1492,7 +1479,7 @@ lazy-property@~1.0.0:
  resolved "https://registry.yarnpkg.com/lazy-property/-/lazy-property-1.0.0.tgz#84ddc4b370679ba8bd4cdcfa4c06b43d57111147"
  integrity sha1-hN3Es3Bnm6i9TNz6TAa0PVcREUc=

-lazy-val@^1.0.3:
+lazy-val@^1.0.4:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz#882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65"
  integrity sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q==
@@ -1869,16 +1856,11 @@ ms@2.0.0:
  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=

-ms@^2.0.0:
+ms@^2.0.0, ms@^2.1.1:
  version "2.1.2"
  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==

-ms@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
-
 mute-stream@~0.0.4:
  version "0.0.8"
  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
@@ -2366,7 +2348,7 @@ pacote@^9.1.0, pacote@^9.2.3, pacote@^9.5.0:
    unique-filename "^1.1.1"
    which "^1.3.1"

-pako@^1.0.7:
+pako@^1.0.10:
  version "1.0.10"
  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
  integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
@@ -2810,11 +2792,21 @@ semver-diff@^2.0.0:
  dependencies:
    semver "^5.0.3"

-"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1:
  version "5.7.0"
  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==

+semver@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+semver@^6.2.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
 semver@~5.3.0:
  version "5.3.0"
  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -2908,19 +2900,6 @@ sorted-union-stream@~2.1.3:
    from2 "^1.3.0"
    stream-iterate "^1.1.0"

-source-map-support@^0.5.9:
-  version "0.5.12"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
-  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map@^0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
 spdx-correct@^3.0.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
@@ -3476,10 +3455,10 @@ 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.1.1:
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
-  integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
+yargs-parser@^15.0.0:
+  version "15.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.0.tgz#cdd7a97490ec836195f59f3f4dbe5ea9e8f75f08"
+  integrity sha512-xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ==
  dependencies:
    camelcase "^5.0.0"
    decamelize "^1.2.0"
@@ -3509,10 +3488,10 @@ yargs@^11.0.0:
    y18n "^3.2.1"
    yargs-parser "^9.0.2"

-yargs@^14.0.0:
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.0.0.tgz#ba4cacc802b3c0b3e36a9e791723763d57a85066"
-  integrity sha512-ssa5JuRjMeZEUjg7bEL99AwpitxU/zWGAGpdj0di41pOEmJti8NR6kyUIJBkR78DTYNPZOU08luUo0GTHuB+ow==
+yargs@^14.2.0:
+  version "14.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.0.tgz#f116a9242c4ed8668790b40759b4906c276e76c3"
+  integrity sha512-/is78VKbKs70bVZH7w4YaZea6xcJWOAwkhbR0CFuZBmYtfTYF0xjGJF43AYd8g2Uii1yJwmS5GR2vBmrc32sbg==
  dependencies:
    cliui "^5.0.0"
    decamelize "^1.2.0"
@@ -3524,7 +3503,7 @@ yargs@^14.0.0:
    string-width "^3.0.0"
    which-module "^2.0.0"
    y18n "^4.0.0"
-    yargs-parser "^13.1.1"
+    yargs-parser "^15.0.0"

 zone.js@^0.8.29:
  version "0.8.29"
--- a/package.json
+++ b/package.json
@@ -1,30 +1,30 @@
 {
  "devDependencies": {
-    "@fortawesome/fontawesome-free": "^5.10.2",
+    "@fortawesome/fontawesome-free": "^5.11.2",
    "@types/electron-config": "^3.2.2",
    "@types/electron-debug": "^2.1.0",
    "@types/js-yaml": "^3.12.1",
-    "@types/node": "^12.7.4",
+    "@types/node": "^12.7.12",
    "@types/webpack-env": "1.13.9",
-    "@typescript-eslint/eslint-plugin": "^2.1.0",
-    "@typescript-eslint/parser": "^2.1.0",
+    "@typescript-eslint/eslint-plugin": "^2.3.1",
+    "@typescript-eslint/parser": "^2.3.1",
    "apply-loader": "2.0.0",
    "awesome-typescript-loader": "^5.0.0",
-    "core-js": "^3.2.0",
-    "cross-env": "5.2.1",
+    "core-js": "^3.3.2",
+    "cross-env": "6.0.3",
    "css-loader": "3.2.0",
-    "electron": "^6.0.8",
+    "electron": "^6.0.12",
    "electron-builder": "^21.2.0",
    "electron-installer-snap": "^4.0.0",
    "electron-notarize": "^0.1.1",
    "electron-rebuild": "^1.8.5",
-    "eslint": "^6.3.0",
+    "eslint": "^6.5.1",
    "file-loader": "^4.1.0",
    "graceful-fs": "^4.2.2",
    "html-loader": "0.5.5",
    "json-loader": "0.5.7",
    "node-abi": "^2.11.0",
-    "node-gyp": "^5.0.3",
+    "node-gyp": "^6.0.0",
    "node-sass": "^4.12.0",
    "npmlog": "4.1.2",
    "npx": "^10.2.0",
@@ -44,11 +44,11 @@
    "to-string-loader": "1.1.5",
    "tslib": "^1.10.0",
    "typedoc": "^0.15.0",
-    "typescript": "^3.6.2",
-    "url-loader": "^2.1.0",
+    "typescript": "^3.6.4",
+    "url-loader": "^2.2.0",
    "val-loader": "1.1.1",
-    "webpack": "^4.39.3",
-    "webpack-cli": "^3.3.8",
+    "webpack": "^4.41.1",
+    "webpack-cli": "^3.3.9",
    "yaml-loader": "0.5.0"
  },
  "resolutions": {
--- 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.83-nightly.0",
+  "version": "1.0.92-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.83-nightly.4",
+  "version": "1.0.92-nightly.0",
  "description": "Terminus core",
  "keywords": [
    "terminus-builtin-plugin"
@@ -23,12 +23,12 @@
    "axios": "^0.19.0",
    "bootstrap": "^4.1.3",
    "core-js": "^3.1.2",
-    "deepmerge": "^3.2.0",
+    "deepmerge": "^4.1.1",
    "electron-updater": "^4.0.6",
    "js-yaml": "^3.9.0",
    "mixpanel": "^0.10.2",
    "ng2-dnd": "^5.0.2",
-    "ngx-perfect-scrollbar": "^6.0.0",
+    "ngx-perfect-scrollbar": "^8.0.0",
    "shell-escape": "^0.2.0",
    "uuid": "^3.3.2",
    "winston": "^3.2.1"
--- a/terminus-core/src/api/tabRecovery.ts
+++ b/terminus-core/src/api/tabRecovery.ts
@@ -34,5 +34,5 @@ export abstract class TabRecoveryProvider {
     * @returns [[RecoveredTab]] descriptor containing tab type and component inputs
     *          or `null` if this token is from a different tab type or is not supported
     */
-    abstract async recover (recoveryToken: any): Promise<RecoveredTab | null>
+    abstract async recover (recoveryToken: any): Promise<RecoveredTab|null>
 }
--- a/terminus-core/src/api/toolbarButtonProvider.ts
+++ b/terminus-core/src/api/toolbarButtonProvider.ts
@@ -5,7 +5,7 @@ export interface ToolbarButton {
    /**
     * Raw SVG icon code
     */
-    icon: string
+    icon?: string

    title: string

--- a/terminus-core/src/components/appRoot.component.ts
+++ b/terminus-core/src/components/appRoot.component.ts
@@ -144,7 +144,7 @@ export class AppRootComponent {
        config.changed$.subscribe(() => this.updateVibrancy())
        this.updateVibrancy()

-        let lastProgress = null
+        let lastProgress: number|null = null
        this.app.tabOpened$.subscribe(tab => {
            this.unsortedTabs.push(tab)
            tab.progress$.subscribe(progress => {
@@ -258,7 +258,7 @@ export class AppRootComponent {
            buttons = buttons.concat(provider.provide())
        })
        return buttons
-            .filter(button => button.weight > 0 === aboveZero)
+            .filter(button => (button.weight || 0) > 0 === aboveZero)
            .sort((a: ToolbarButton, b: ToolbarButton) => (a.weight || 0) - (b.weight || 0))
    }

--- a/terminus-core/src/components/baseTab.component.ts
+++ b/terminus-core/src/components/baseTab.component.ts
@@ -36,7 +36,7 @@ export abstract class BaseTabComponent {
    /**
     * CSS color override for the tab's header
     */
-    color: string = null
+    color: string|null = null

    protected hasFocus = false

@@ -50,14 +50,14 @@ export abstract class BaseTabComponent {
    private titleChange = new Subject<string>()
    private focused = new Subject<void>()
    private blurred = new Subject<void>()
-    private progress = new Subject<number>()
+    private progress = new Subject<number|null>()
    private activity = new Subject<boolean>()
    private destroyed = new Subject<void>()

    get focused$ (): Observable<void> { return this.focused }
    get blurred$ (): Observable<void> { return this.blurred }
    get titleChange$ (): Observable<string> { return this.titleChange }
-    get progress$ (): Observable<number> { return this.progress }
+    get progress$ (): Observable<number|null> { return this.progress }
    get activity$ (): Observable<boolean> { return this.activity }
    get destroyed$ (): Observable<void> { return this.destroyed }
    get recoveryStateChangedHint$ (): Observable<void> { return this.recoveryStateChangedHint }
@@ -83,7 +83,7 @@ export abstract class BaseTabComponent {
     *
     * @param  {type} progress: value between 0 and 1, or `null` to remove
     */
-    setProgress (progress: number) {
+    setProgress (progress: number|null) {
        this.progress.next(progress)
        if (progress) {
            if (this.progressClearTimeout) {
@@ -125,7 +125,7 @@ export abstract class BaseTabComponent {
    /**
     * Override this to enable task completion notifications for the tab
     */
-    async getCurrentProcess (): Promise<BaseTabProcess> {
+    async getCurrentProcess (): Promise<BaseTabProcess|null> {
        return null
    }

--- a/terminus-core/src/components/splitTab.component.ts
+++ b/terminus-core/src/components/splitTab.component.ts
@@ -33,8 +33,8 @@ export class SplitContainer {
    /**
     * @return Flat list of all tabs inside this container
     */
-    getAllTabs () {
-        let r = []
+    getAllTabs (): BaseTabComponent[] {
+        let r: BaseTabComponent[] = []
        for (const child of this.children) {
            if (child instanceof SplitContainer) {
                r = r.concat(child.getAllTabs())
@@ -94,7 +94,7 @@ export class SplitContainer {
    }

    async serialize () {
-        const children = []
+        const children: any[] = []
        for (const child of this.children) {
            if (child instanceof SplitContainer) {
                children.push(await child.serialize())
@@ -292,9 +292,9 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
    /**
     * Inserts a new `tab` to the `side` of the `relative` tab
     */
-    addTab (tab: BaseTabComponent, relative: BaseTabComponent, side: SplitDirection) {
-        let target = this.getParentOf(relative) || this.root
-        let insertIndex = target.children.indexOf(relative)
+    addTab (tab: BaseTabComponent, relative: BaseTabComponent|null, side: SplitDirection) {
+        let target = (relative ? this.getParentOf(relative) : null) || this.root
+        let insertIndex = relative ? target.children.indexOf(relative) : -1

        if (
            target.orientation === 'v' && ['l', 'r'].includes(side) ||
@@ -302,7 +302,7 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
        ) {
            const newContainer = new SplitContainer()
            newContainer.orientation = target.orientation === 'v' ? 'h' : 'v'
-            newContainer.children = [relative]
+            newContainer.children = relative ? [relative] : []
            newContainer.ratios = [1]
            target.children[insertIndex] = newContainer
            target = newContainer
@@ -333,6 +333,9 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes

    removeTab (tab: BaseTabComponent) {
        const parent = this.getParentOf(tab)
+        if (!parent) {
+            return
+        }
        const index = parent.children.indexOf(tab)
        parent.ratios.splice(index, 1)
        parent.children.splice(index, 1)
@@ -356,11 +359,18 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
    navigate (dir: SplitDirection) {
        let rel: BaseTabComponent | SplitContainer = this.focusedTab
        let parent = this.getParentOf(rel)
+        if (!parent) {
+            return
+        }
+
        const orientation = ['l', 'r'].includes(dir) ? 'h' : 'v'

        while (parent !== this.root && parent.orientation !== orientation) {
            rel = parent
            parent = this.getParentOf(rel)
+            if (!parent) {
+                return
+            }
        }

        if (parent.orientation !== orientation) {
@@ -381,13 +391,15 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes

    async splitTab (tab: BaseTabComponent, dir: SplitDirection) {
        const newTab = await this.tabsService.duplicate(tab)
-        this.addTab(newTab, tab, dir)
+        if (newTab) {
+            this.addTab(newTab, tab, dir)
+        }
    }

    /**
     * @returns the immediate parent of `tab`
     */
-    getParentOf (tab: BaseTabComponent | SplitContainer, root?: SplitContainer): SplitContainer {
+    getParentOf (tab: BaseTabComponent | SplitContainer, root?: SplitContainer): SplitContainer|null {
        root = root || this.root
        for (const child of root.children) {
            if (child instanceof SplitContainer) {
@@ -414,8 +426,8 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
    }

    /** @hidden */
-    async getCurrentProcess (): Promise<BaseTabProcess> {
-        return (await Promise.all(this.getAllTabs().map(x => x.getCurrentProcess()))).find(x => !!x)
+    async getCurrentProcess (): Promise<BaseTabProcess|null> {
+        return (await Promise.all(this.getAllTabs().map(x => x.getCurrentProcess()))).find(x => !!x) || null
    }

    /** @hidden */
@@ -443,8 +455,10 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes

    private detachTabView (tab: BaseTabComponent) {
        const ref = this.viewRefs.get(tab)
-        this.viewRefs.delete(tab)
-        this.viewContainer.remove(this.viewContainer.indexOf(ref))
+        if (ref) {
+            this.viewRefs.delete(tab)
+            this.viewContainer.remove(this.viewContainer.indexOf(ref))
+        }
    }

    private layout () {
@@ -471,7 +485,7 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
            if (child instanceof SplitContainer) {
                this.layoutInternal(child, childX, childY, childW, childH)
            } else {
-                const element = this.viewRefs.get(child).rootNodes[0]
+                const element = this.viewRefs.get(child)!.rootNodes[0]
                element.style.position = 'absolute'
                element.style.left = `${childX}%`
                element.style.top = `${childY}%`
@@ -518,7 +532,7 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
 /** @hidden */
@Injectable()
 export class SplitTabRecoveryProvider extends TabRecoveryProvider {
-    async recover (recoveryToken: any): Promise<RecoveredTab> {
+    async recover (recoveryToken: any): Promise<RecoveredTab|null> {
        if (recoveryToken && recoveryToken.type === 'app:split-tab') {
            return {
                type: SplitTabComponent,
--- a/terminus-core/src/components/splitTabSpanner.component.ts
+++ b/terminus-core/src/components/splitTabSpanner.component.ts
@@ -67,13 +67,13 @@ export class SplitTabSpannerComponent {
                this.container.x,
                this.container.y + this.container.h * this.container.getOffsetRatio(this.index),
                this.container.w,
-                null
+                0
            )
        } else {
            this.setDimensions(
                this.container.x + this.container.w * this.container.getOffsetRatio(this.index),
                this.container.y,
-                null,
+                0,
                this.container.h
            )
        }
@@ -82,7 +82,7 @@ export class SplitTabSpannerComponent {
    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/tabHeader.component.ts
+++ b/terminus-core/src/components/tabHeader.component.ts
@@ -25,7 +25,7 @@ export class TabHeaderComponent {
    @Input() @HostBinding('class.active') active: boolean
    @Input() @HostBinding('class.has-activity') hasActivity: boolean
    @Input() tab: BaseTabComponent
-    @Input() progress: number
+    @Input() progress: number|null
    @ViewChild('handle') handle: ElementRef

    private constructor (
@@ -78,12 +78,21 @@ export class TabHeaderComponent {
        this.showRenameTabModal()
    }

-    @HostListener('auxclick', ['$event']) async onAuxClick ($event: MouseEvent) {
+    @HostListener('mousedown', ['$event']) async onMouseDown ($event: MouseEvent) {
+        if ($event.which === 2) {
+            $event.preventDefault()
+        }
+    }
+
+    @HostListener('mouseup', ['$event']) async onMouseUp ($event: MouseEvent) {
        if ($event.which === 2) {
            this.app.closeTab(this.tab, true)
        }
+    }
+
+    @HostListener('auxclick', ['$event']) async onAuxClick ($event: MouseEvent) {
        if ($event.which === 3) {
-            event.preventDefault()
+            $event.preventDefault()

            const contextMenu = this.electron.remote.Menu.buildFromTemplate(await this.buildContextMenu())

--- a/terminus-core/src/components/windowControls.component.ts
+++ b/terminus-core/src/components/windowControls.component.ts
@@ -12,6 +12,8 @@ export class WindowControlsComponent {
    constructor (public hostApp: HostAppService, public app: AppService) { }

    async closeWindow () {
-        await this.app.closeAllTabs() && this.hostApp.closeWindow()
+        if (await this.app.closeAllTabs()) {
+            this.hostApp.closeWindow()
+        }
    }
 }
--- a/terminus-core/src/services/app.service.ts
+++ b/terminus-core/src/services/app.service.ts
@@ -25,14 +25,14 @@ class CompletionObserver {

    async tick () {
        if (!await this.tab.getCurrentProcess()) {
-            this.done.next(null)
+            this.done.next()
            this.stop()
        }
    }

    stop () {
        clearInterval(this.interval)
-        this.destroyed.next(null)
+        this.destroyed.next()
        this.destroyed.complete()
        this.done.complete()
    }
@@ -71,20 +71,29 @@ export class AppService {
        private tabsService: TabsService,
    ) {
        if (hostApp.getWindow().id === 1) {
-            this.tabRecovery.recoverTabs().then(tabs => {
-                for (const tab of tabs) {
-                    this.openNewTabRaw(tab.type, tab.options)
-                }
-                this.tabsChanged$.subscribe(() => {
-                    tabRecovery.saveTabs(this.tabs)
+            if (config.store.terminal.recoverTabs) {
+                this.tabRecovery.recoverTabs().then(tabs => {
+                    for (const tab of tabs) {
+                        this.openNewTabRaw(tab.type, tab.options)
+                    }
+                    this.startTabStorage()
                })
-                setInterval(() => {
-                    tabRecovery.saveTabs(this.tabs)
-                }, 30000)
-            })
+            } else {
+                /** Continue to store the tabs even if the setting is currently off */
+                this.startTabStorage()
+            }
        }
    }

+    startTabStorage() {
+        this.tabsChanged$.subscribe(() => {
+            this.tabRecovery.saveTabs(this.tabs)
+        })
+        setInterval(() => {
+            this.tabRecovery.saveTabs(this.tabs)
+        }, 30000)
+    }
+
    addTabRaw (tab: BaseTabComponent) {
        this.tabs.push(tab)
        this.selectTab(tab)
@@ -144,7 +153,7 @@ export class AppService {
        if (this.tabs.includes(this._activeTab)) {
            this.lastTabIndex = this.tabs.indexOf(this._activeTab)
        } else {
-            this.lastTabIndex = null
+            this.lastTabIndex = 0
        }
        if (this._activeTab) {
            this._activeTab.clearActivity()
@@ -229,7 +238,7 @@ export class AppService {

    /** @hidden */
    emitReady () {
-        this.ready.next(null)
+        this.ready.next()
        this.ready.complete()
        this.hostApp.emitReady()
    }
@@ -246,7 +255,7 @@ export class AppService {
            })
            this.completionObservers.set(tab, observer)
        }
-        return this.completionObservers.get(tab).done$
+        return this.completionObservers.get(tab)!.done$
    }

    stopObservingTabCompletion (tab: BaseTabComponent) {
--- a/terminus-core/src/services/config.service.ts
+++ b/terminus-core/src/services/config.service.ts
@@ -95,7 +95,7 @@ export class ConfigService {
    private changed = new Subject<void>()
    private _store: any
    private defaults: any
-    private servicesCache: { [id: string]: Function[] } = null
+    private servicesCache: { [id: string]: Function[] }|null = null

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

@@ -170,7 +170,7 @@ export class ConfigService {
     *
     * @typeparam T Base provider type
     */
-    enabledServices<T> (services: T[]): T[] {
+    enabledServices<T extends object> (services: T[]): T[] {
        if (!this.servicesCache) {
            this.servicesCache = {}
            const ngModule = window['rootModule'].ngInjectorDef
--- a/terminus-core/src/services/hostApp.service.ts
+++ b/terminus-core/src/services/hostApp.service.ts
@@ -215,7 +215,7 @@ export class HostAppService {
    setVibrancy (enable: boolean, type: string) {
        document.body.classList.toggle('vibrant', enable)
        if (this.platform === Platform.macOS) {
-            this.getWindow().setVibrancy(enable ? 'dark' : null)
+            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)
--- a/terminus-core/src/services/hotkeys.service.ts
+++ b/terminus-core/src/services/hotkeys.service.ts
@@ -93,7 +93,7 @@ export class HotkeysService {
        return stringifyKeySequence(this.currentKeystrokes.map(x => x.event))
    }

-    getCurrentFullyMatchedHotkey (): string {
+    getCurrentFullyMatchedHotkey (): string|null {
        const currentStrokes = this.getCurrentKeystrokes()
        const config = this.getHotkeysConfig()
        for (const id in config) {
@@ -116,7 +116,7 @@ export class HotkeysService {
    getCurrentPartiallyMatchedHotkeys (): PartialHotkeyMatch[] {
        const currentStrokes = this.getCurrentKeystrokes()
        const config = this.getHotkeysConfig()
-        const result = []
+        const result: PartialHotkeyMatch[] = []
        for (const id in config) {
            for (const sequence of config[id]) {
                for (let matchLength = Math.min(currentStrokes.length, sequence.length); matchLength > 0; matchLength--) {
--- a/terminus-core/src/services/hotkeys.util.ts
+++ b/terminus-core/src/services/hotkeys.util.ts
@@ -15,7 +15,7 @@ export function stringifyKeySequence (events: KeyboardEvent[]): string[] {
    events = events.slice()

    while (events.length > 0) {
-        const event = events.shift()
+        const event = events.shift()!
        if ((event as any).event === 'keydown') {
            const itemKeys: string[] = []
            if (event.ctrlKey) {
--- a/terminus-core/src/services/shellIntegration.service.ts
+++ b/terminus-core/src/services/shellIntegration.service.ts
@@ -37,7 +37,7 @@ export class ShellIntegrationService {
                'extras',
                'automator-workflows',
            )
-            this.automatorWorkflowsDestination = path.join(process.env.HOME, 'Library', 'Services')
+            this.automatorWorkflowsDestination = path.join(process.env.HOME as string, 'Library', 'Services')
        }
        this.updatePaths()
    }
--- a/terminus-core/src/services/tabRecovery.service.ts
+++ b/terminus-core/src/services/tabRecovery.service.ts
@@ -27,7 +27,7 @@ export class TabRecoveryService {
        )
    }

-    async recoverTab (token: any): Promise<RecoveredTab> {
+    async recoverTab (token: any): Promise<RecoveredTab|null> {
        for (const provider of this.config.enabledServices(this.tabRecoveryProviders)) {
            try {
                const tab = await provider.recover(token)
--- a/terminus-core/src/services/tabs.service.ts
+++ b/terminus-core/src/services/tabs.service.ts
@@ -29,7 +29,7 @@ export class TabsService {
    /**
     * Duplicates an existing tab instance (using the tab recovery system)
     */
-    async duplicate (tab: BaseTabComponent): Promise<BaseTabComponent> {
+    async duplicate (tab: BaseTabComponent): Promise<BaseTabComponent|null> {
        const token = await tab.getRecoveryToken()
        if (!token) {
            return null
--- a/terminus-core/src/services/themes.service.ts
+++ b/terminus-core/src/services/themes.service.ts
@@ -4,7 +4,7 @@ import { Theme } from '../api/theme'

@Injectable({ providedIn: 'root' })
 export class ThemesService {
-    private styleElement: HTMLElement = null
+    private styleElement: HTMLElement|null = null

    /** @hidden */
    constructor (
@@ -17,22 +17,22 @@ export class ThemesService {
        })
    }

-    findTheme (name: string): Theme {
-        return this.config.enabledServices(this.themes).find(x => x.name === name)
+    findTheme (name: string): Theme|null {
+        return this.config.enabledServices(this.themes).find(x => x.name === name) || null
    }

    findCurrentTheme (): Theme {
-        return this.findTheme(this.config.store.appearance.theme) || this.findTheme('Standard')
+        return this.findTheme(this.config.store.appearance.theme) || this.findTheme('Standard')!
    }

    applyTheme (theme: Theme): void {
        if (!this.styleElement) {
            this.styleElement = document.createElement('style')
            this.styleElement.setAttribute('id', 'theme')
-            document.querySelector('head').appendChild(this.styleElement)
+            document.querySelector('head')!.appendChild(this.styleElement)
        }
        this.styleElement.textContent = theme.css
-        document.querySelector('style#custom-css').innerHTML = this.config.store.appearance.css
+        document.querySelector('style#custom-css')!.innerHTML = this.config.store.appearance.css
    }

    private applyCurrentTheme (): void {
--- a/terminus-core/src/services/touchbar.service.ts
+++ b/terminus-core/src/services/touchbar.service.ts
@@ -42,7 +42,7 @@ export class TouchbarService {
                const showIcon = this.app.activeTab !== tab && hasActivity
                const segment = this.tabSegments[app.tabs.indexOf(tab)]
                if (segment) {
-                    segment.icon = showIcon ? activityIcon : null
+                    segment.icon = showIcon ? activityIcon : undefined
                }
            })
        })
@@ -83,7 +83,9 @@ export class TouchbarService {
            segments: buttons.map(button => this.getButton(button)),
            mode: 'buttons',
            change: (selectedIndex) => this.zone.run(() => {
-                buttons[selectedIndex].click()
+                if (buttons[selectedIndex].click) {
+                    buttons[selectedIndex].click!()
+                }
            }),
        })

@@ -100,8 +102,8 @@ export class TouchbarService {

    private getButton (button: ToolbarButton): Electron.SegmentedControlSegment {
        return {
-            label: button.touchBarNSImage ? null : this.shortenTitle(button.touchBarTitle || button.title),
-            icon: button.touchBarNSImage ? this.getCachedNSImage(button.touchBarNSImage) : null,
+            label: button.touchBarNSImage ? undefined : this.shortenTitle(button.touchBarTitle || button.title),
+            icon: button.touchBarNSImage ? this.getCachedNSImage(button.touchBarNSImage) : undefined,
            // click: () => this.zone.run(() => button.click()),
        }
    }
--- a/terminus-core/src/tabContextMenu.ts
+++ b/terminus-core/src/tabContextMenu.ts
@@ -78,7 +78,7 @@ export class CommonOptionsContextMenu extends TabContextMenuItemProvider {
        return [
            {
                label: 'Rename',
-                click: () => this.zone.run(() => tabHeader.showRenameTabModal()),
+                click: () => this.zone.run(() => tabHeader && tabHeader.showRenameTabModal()),
            },
            {
                label: 'Duplicate',
@@ -86,7 +86,7 @@ export class CommonOptionsContextMenu extends TabContextMenuItemProvider {
            },
            {
                label: 'Color',
-                sublabel: COLORS.find(x => x.value === tab.color).name,
+                sublabel: COLORS.find(x => x.value === tab.color)!.name,
                submenu: COLORS.map(color => ({
                    label: color.name,
                    type: 'radio',
--- a/terminus-core/yarn.lock
+++ b/terminus-core/yarn.lock
@@ -7,6 +7,11 @@
  resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.1.tgz#5c6f4a1eabca84792fbd916f0cb40847f123c656"
  integrity sha512-SGGAhXLHDx+PK4YLNcNGa6goPf9XRWQNAUUbffkwVGGXIxmDKWyGGL4inzq2sPmExu431Ekb9aEMn9BkPqEYFA==

+"@types/semver@^6.0.1":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-6.0.2.tgz#5e8b09f0e4af53034b1d0fb9977a277847836205"
+  integrity sha512-G1Ggy7/9Nsa1Jt2yiBR2riEuyK2DFNnqow6R7cromXPMNynackRY1vqFTLz/gwnef1LHokbXThcPhqMRjUbkpQ==
+
 "@types/shell-escape@^0.2.0":
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/@types/shell-escape/-/shell-escape-0.2.0.tgz#cd2f0df814388599dd07196dcc510de2669d1ed2"
@@ -19,17 +24,17 @@
  dependencies:
    winston "*"

-agent-base@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
-  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
+agent-base@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
+  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
  dependencies:
    es6-promisify "^5.0.0"

 argparse@^1.0.7:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
-  integrity sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
  dependencies:
    sprintf-js "~1.0.2"

@@ -48,36 +53,17 @@ axios@^0.19.0:
    follow-redirects "1.5.10"
    is-buffer "^2.0.2"

-bluebird-lst@^1.0.6, bluebird-lst@^1.0.7:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.8.tgz#61b572e8b3eb57e0fff676a0e54566d93597e6a4"
-  integrity sha512-InUDOaBaIjIobOa3O4YRAbFgff907uTJZXW0m0rhk3zhVZ4GvsmdCLEAKC1CTWTtUWCM8iWTTfFX9N/xQR/etw==
-  dependencies:
-    bluebird "^3.5.4"
-
-bluebird@^3.5.4:
-  version "3.5.5"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
-  integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==
-
 bootstrap@^4.1.3:
  version "4.3.1"
  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
  integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==

-buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
-
-builder-util-runtime@~8.1.0:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.1.1.tgz#f2f6fc43e33d26892bd491667fc746ad69bccc50"
-  integrity sha512-+ieS4PMB33vVE2S3ZNWBEQJ1zKmAs/agrBdh7XadE1lKLjrH4aXYuOh9OOGdxqIRldhlhNBaF+yKMMEFOdNVig==
+builder-util-runtime@8.3.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.3.0.tgz#f5fac9139af6facf42a21fbe4d3aebed88fda33e"
+  integrity sha512-CSOdsYqf4RXIHh1HANPbrZHlZ9JQJXSuDDloblZPcWQVN62inyYoTQuSmY3KrgefME2Sv3Kn2MxHvbGQHRf8Iw==
  dependencies:
-    bluebird-lst "^1.0.6"
    debug "^4.1.1"
-    fs-extra-p "^7.0.0"
    sax "^1.2.4"

 color-convert@^1.9.1:
@@ -132,9 +118,9 @@ colorspace@1.1.x:
    text-hex "1.0.x"

 core-js@^3.1.2:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.2.0.tgz#0a835fdf6aa677fff83a823a7b5276c9e7cebb76"
-  integrity sha512-gybgLzmr7SQRSF6UzGYXducx4eE10ONQlyEnQoqiGPbmbn7zLkb73tPfc4YbZN0lvcTQwoLNPjq4RuCaCumGyQ==
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.3.2.tgz#cd42da1d7b0bb33ef11326be3a721934277ceb42"
+  integrity sha512-S1FfZpeBchkhyoY76YAdFzKS4zz9aOK7EeFaNA2aJlyXyA+sgqz6xdxmLPGXEAf0nF44MVN1kSjrA9Kt3ATDQg==

 core-util-is@~1.0.0:
  version "1.0.2"
@@ -162,10 +148,10 @@ debug@^4.1.1:
  dependencies:
    ms "^2.1.1"

-deepmerge@^3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.2.1.tgz#76a1f47854bcfcd66ee9a948d110540a8e12b261"
-  integrity sha512-+hbDSzTqEW0fWgnlKksg7XAOtT+ddZS5lHZJ6f6MdixRs9wQy+50fm1uUCVb1IkvjLUYX/SfFO021ZNwriURTw==
+deepmerge@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.1.1.tgz#ee0866e4019fe62c1276b9062d4c4803d9aea14c"
+  integrity sha512-+qO5WbNBKBaZez95TffdUDnGIo4+r5kmsX8aOb7PDHvXsTbghAmleuxjs6ytNaf5Eg4FGBXDS5vqO61TRi6BMg==

 diagnostics@^1.1.1:
  version "1.1.1"
@@ -177,19 +163,18 @@ diagnostics@^1.1.1:
    kuler "1.0.x"

 electron-updater@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.0.6.tgz#9c4f495ae0e80bf4425e3e1b801c5ed2ab933c2d"
-  integrity sha512-JPGLME6fxJcHG8hX7HWFl6Aew6iVm0DkcrENreKa5SUJCHG+uUaAhxDGDt+YGcNkyx1uJ6eBGMvFxDTLUv67pg==
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.1.2.tgz#46a6e62cc8d0c7d935db7aff83207da2a21ff788"
+  integrity sha512-4Sk8IW0LfOilDz+WAB/gEDmX7+FUFRbKHGN1zGjehPilnd6H9cmjgBHK6Xzq/FLq/uOHGJ6GX/9tsF+jr7CvnA==
  dependencies:
-    bluebird-lst "^1.0.6"
-    builder-util-runtime "~8.1.0"
-    fs-extra-p "^7.0.0"
-    js-yaml "^3.12.0"
-    lazy-val "^1.0.3"
+    "@types/semver" "^6.0.1"
+    builder-util-runtime "8.3.0"
+    fs-extra "^8.1.0"
+    js-yaml "^3.13.1"
+    lazy-val "^1.0.4"
    lodash.isequal "^4.5.0"
-    pako "^1.0.7"
-    semver "^5.6.0"
-    source-map-support "^0.5.9"
+    pako "^1.0.10"
+    semver "^6.2.0"

 enabled@1.0.x:
  version "1.0.2"
@@ -216,9 +201,9 @@ es6-promisify@^5.0.0:
    es6-promise "^4.0.3"

 esprima@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
-  integrity sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==

 fast-safe-stringify@^2.0.4:
  version "2.0.6"
@@ -237,34 +222,26 @@ follow-redirects@1.5.10:
  dependencies:
    debug "=3.1.0"

-fs-extra-p@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-7.0.1.tgz#4eec0b6dfa150fa90f6ddd773b4fb1d55cad54e3"
-  integrity sha512-yhd2OV0HnHt2oitlp+X9hl2ReX4X/7kQeL7/72qzPHTZj5eUPGzAKOvEglU02Fa1OeG2rSy/aKB4WGVaLiF8tw==
+fs-extra@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
  dependencies:
-    bluebird-lst "^1.0.7"
-    fs-extra "^7.0.1"
-
-fs-extra@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
-  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
-  dependencies:
-    graceful-fs "^4.1.2"
+    graceful-fs "^4.2.0"
    jsonfile "^4.0.0"
    universalify "^0.1.0"

-graceful-fs@^4.1.2, graceful-fs@^4.1.6:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
+graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
+  integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==

-https-proxy-agent@2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
-  integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
+https-proxy-agent@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-3.0.0.tgz#0106efa5d63d6d6f3ab87c999fa4877a3fd1ff97"
+  integrity sha512-y4jAxNEihqvBI5F3SaO2rtsjIOnnNA8sEbuiP+UhJZJHeM2NRm6c09ax2tgqme+SgUUvjao2fJXF4h3D6Cb2HQ==
  dependencies:
-    agent-base "^4.1.0"
+    agent-base "^4.3.0"
    debug "^3.1.0"

 inherits@^2.0.3, inherits@~2.0.3:
@@ -292,7 +269,7 @@ isarray@~1.0.0:
  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=

-js-yaml@^3.12.0, js-yaml@^3.9.0:
+js-yaml@^3.13.1, js-yaml@^3.9.0:
  version "3.13.1"
  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -314,7 +291,7 @@ kuler@1.0.x:
  dependencies:
    colornames "^1.1.1"

-lazy-val@^1.0.3:
+lazy-val@^1.0.4:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz#882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65"
  integrity sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q==
@@ -341,11 +318,11 @@ logform@^2.1.1:
    triple-beam "^1.3.0"

 mixpanel@^0.10.2:
-  version "0.10.2"
-  resolved "https://registry.yarnpkg.com/mixpanel/-/mixpanel-0.10.2.tgz#10ff6cd76034b262d469094ad3d8c99039345376"
-  integrity sha512-+zbBQGd/Q5LLRooqJ2iyEDzKz2/ly4TipH5tE9te0BDMJpROxUMGffPulyHbh4FtMcbJuPmIUSIfy//JhhnlnA==
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/mixpanel/-/mixpanel-0.10.3.tgz#2dff3bc0e17b57d6365547d315cbbf3ecfdb8a00"
+  integrity sha512-wIYr5o+1XSzJ80o3QED35K/yfPAKi5FigZXTSfcs4vltfeKbilIjNgwxdno7LrqzhjoSjmIyDWkI7D3lr7TwDw==
  dependencies:
-    https-proxy-agent "2.2.1"
+    https-proxy-agent "3.0.0"

 ms@2.0.0:
  version "2.0.0"
@@ -353,37 +330,37 @@ ms@2.0.0:
  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=

 ms@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==

 ng2-dnd@^5.0.2:
  version "5.0.2"
  resolved "https://registry.yarnpkg.com/ng2-dnd/-/ng2-dnd-5.0.2.tgz#862278ac7dedfa14f5783bbf34014d5d73dfefb4"
  integrity sha512-5mWWBePwvEPsNd/HkdbD543Q9mPyJofL6zkNydl8/Ah3qrrvZT2DaEPbknY08OgkXpI2qUGksc01OzzVlRQ9dQ==

-ngx-perfect-scrollbar@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/ngx-perfect-scrollbar/-/ngx-perfect-scrollbar-6.0.0.tgz#92b51957c04ed6a6d416beca2707bab005667b68"
-  integrity sha512-x4bzfI7AmeZubUN+tJJ99GYniSgHLJbTAg3ecbWd8dG6z59efgx4yxUjN1sDh7UYgimtg3w857qXEZJW/USAhA==
+ngx-perfect-scrollbar@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/ngx-perfect-scrollbar/-/ngx-perfect-scrollbar-8.0.0.tgz#19c1bbf9b1a36d89b00a68f7834e39427d29182f"
+  integrity sha512-IXoFbULQnxyJj0gdCcKCLE/6OW9HCP9KARzMCKS1kNxTuzG4DghjM2AaCBRM5/sFwdbn6rqOKMCINtHA8W8YCA==
  dependencies:
-    perfect-scrollbar "^1.3.0"
-    resize-observer-polyfill "^1.4.0"
+    perfect-scrollbar "^1.4.0"
+    resize-observer-polyfill "^1.5.0"

 one-time@0.0.4:
  version "0.0.4"
  resolved "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz#f8cdf77884826fe4dff93e3a9cc37b1e4480742e"
  integrity sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=

-pako@^1.0.7:
+pako@^1.0.10:
  version "1.0.10"
  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
  integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==

-perfect-scrollbar@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/perfect-scrollbar/-/perfect-scrollbar-1.3.0.tgz#61da56f94b58870d8e0a617bce649cee17d1e3b2"
-  integrity sha512-7Ub8YOvZB5k+pTy0K3LYUDnH9Xl3qvHcclJyIX+AV5UxHxll146iVGq4rtc+848nTDBQq89J7QxKKMA++cTXzQ==
+perfect-scrollbar@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/perfect-scrollbar/-/perfect-scrollbar-1.4.0.tgz#5d014ef9775e1f43058a1dbae9ed1daf0e7091f1"
+  integrity sha512-/2Sk/khljhdrsamjJYS5NjrH+GKEHEwh7zFSiYyxROyYKagkE4kSn2zDQDRTOMo8mpT2jikxx6yI1dG7lNP/hw==

 process-nextick-args@~2.0.0:
  version "2.0.0"
@@ -412,10 +389,10 @@ readable-stream@^3.1.1:
    string_decoder "^1.1.1"
    util-deprecate "^1.0.1"

-resize-observer-polyfill@^1.4.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.0.tgz#660ff1d9712a2382baa2cad450a4716209f9ca69"
-  integrity sha512-M2AelyJDVR/oLnToJLtuDJRBBWUGUvvGigj1411hXhAdyFWqMaqHp7TixW3FpiLuVaikIcR1QL+zqoJoZlOgpg==
+resize-observer-polyfill@^1.5.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
+  integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==

 safe-buffer@~5.1.0, safe-buffer@~5.1.1:
  version "5.1.2"
@@ -427,10 +404,10 @@ sax@^1.2.4:
  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==

-semver@^5.6.0:
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
-  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
+semver@^6.2.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==

 shell-escape@^0.2.0:
  version "0.2.0"
@@ -444,19 +421,6 @@ simple-swizzle@^0.2.2:
  dependencies:
    is-arrayish "^0.3.1"

-source-map-support@^0.5.9:
-  version "0.5.12"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
-  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map@^0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
 sprintf-js@~1.0.2:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -492,9 +456,9 @@ triple-beam@^1.2.0, triple-beam@^1.3.0:
  integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==

 universalify@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
-  integrity sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==

 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
  version "1.0.2"
@@ -502,9 +466,9 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=

 uuid@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
+  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.83-nightly.0",
+  "version": "1.0.92-nightly.0",
  "description": "Terminus' plugin manager",
  "keywords": [
    "terminus-builtin-plugin"
@@ -20,7 +20,6 @@
    "@types/semver": "^6.0.0",
    "axios": "^0.19.0",
    "mz": "^2.6.0",
-    "ngx-pipes": "^1.6.1",
    "semver": "^6.1.0"
  },
  "peerDependencies": {
--- a/terminus-plugin-manager/src/components/pluginsSettingsTab.component.pug
+++ b/terminus-plugin-manager/src/components/pluginsSettingsTab.component.pug
@@ -8,9 +8,9 @@
    button.btn.btn-outline-info.btn-sm.ml-auto((click)='openPluginsFolder()')
        i.fas.fa-folder
        span Plugins folder
-    
+
 .list-group.list-group-flush.mt-2
-    .list-group-item.d-flex.align-items-center(*ngFor='let plugin of pluginManager.installedPlugins|orderBy:"name"')
+    .list-group-item.d-flex.align-items-center(*ngFor='let plugin of pluginManager.installedPlugins')
        .mr-auto.d-flex.flex-column
            div
                strong {{plugin.name}}
@@ -33,15 +33,15 @@
            (click)='enablePlugin(plugin)'
        )
            i.fas.fa-fw.fa-play
-                
+
        button.btn.btn-secondary.ml-2(
            *ngIf='!config.store.pluginBlacklist.includes(plugin.name)',
            (click)='disablePlugin(plugin)'
        )
            i.fas.fa-fw.fa-pause
-            
+
        button.btn.btn-danger.ml-2(
-            (click)='uninstallPlugin(plugin)', 
+            (click)='uninstallPlugin(plugin)',
            *ngIf='!plugin.isBuiltin',
            [disabled]='busy[plugin.name] != undefined'
        )
@@ -65,7 +65,7 @@ div


    .list-group.list-group-flush.mb-4(*ngIf='availablePlugins$')
-        ng-container(*ngFor='let plugin of (availablePlugins$|async|orderBy:"name")')
+        ng-container(*ngFor='let plugin of (availablePlugins$|async)')
            .list-group-item.d-flex.align-items-center(*ngIf='!isAlreadyInstalled(plugin)')
                button.btn.btn-primary.mr-3(
                    (click)='installPlugin(plugin)',
@@ -73,7 +73,7 @@ div
                )
                    i.fas.fa-fw.fa-download(*ngIf='busy[plugin.name] != BusyState.Installing')
                    i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='busy[plugin.name] == BusyState.Installing')
-                
+
                div((click)='showPluginInfo(plugin)')
                    div
                        strong {{plugin.name}}
--- a/terminus-plugin-manager/src/components/pluginsSettingsTab.component.ts
+++ b/terminus-plugin-manager/src/components/pluginsSettingsTab.component.ts
@@ -1,5 +1,5 @@
 import { BehaviorSubject, Observable } from 'rxjs'
-import { debounceTime, distinctUntilChanged, first, tap, flatMap } from 'rxjs/operators'
+import { debounceTime, distinctUntilChanged, first, tap, flatMap, map } from 'rxjs/operators'
 import * as semver from 'semver'

 import { Component, Input } from '@angular/core'
@@ -18,7 +18,7 @@ export class PluginsSettingsTabComponent {
    @Input() availablePlugins$: Observable<PluginInfo[]>
    @Input() availablePluginsQuery$ = new BehaviorSubject<string>('')
    @Input() availablePluginsReady = false
-    @Input() knownUpgrades: {[id: string]: PluginInfo} = {}
+    @Input() knownUpgrades: {[id: string]: PluginInfo|null} = {}
    @Input() busy: {[id: string]: BusyState} = {}
    @Input() erroredPlugin: string
    @Input() errorMessage: string
@@ -43,9 +43,12 @@ export class PluginsSettingsTabComponent {
                    }))
                })
            )
-        this.availablePlugins$.pipe(first()).subscribe(available => {
+        this.availablePlugins$.pipe(first(), map((plugins: PluginInfo[]) => {
+            plugins.sort((a, b) => a.name > b.name ? 1 : -1)
+            return plugins
+        })).subscribe(available => {
            for (const plugin of this.pluginManager.installedPlugins) {
-                this.knownUpgrades[plugin.name] = available.find(x => x.name === plugin.name && semver.gt(x.version, plugin.version))
+                this.knownUpgrades[plugin.name] = available.find(x => x.name === plugin.name && semver.gt(x.version, plugin.version)) || null
            }
        })
    }
@@ -91,7 +94,7 @@ export class PluginsSettingsTabComponent {
    }

    async upgradePlugin (plugin: PluginInfo): Promise<void> {
-        return this.installPlugin(this.knownUpgrades[plugin.name])
+        return this.installPlugin(this.knownUpgrades[plugin.name]!)
    }

    showPluginInfo (plugin: PluginInfo) {
--- a/terminus-plugin-manager/src/index.ts
+++ b/terminus-plugin-manager/src/index.ts
@@ -1,7 +1,6 @@
 import { NgModule } from '@angular/core'
 import { BrowserModule } from '@angular/platform-browser'
 import { FormsModule } from '@angular/forms'
-import { NgPipesModule } from 'ngx-pipes'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'

 import { SettingsTabProvider } from 'terminus-settings'
@@ -15,7 +14,6 @@ import { PluginsSettingsTabProvider } from './settings'
        BrowserModule,
        FormsModule,
        NgbModule,
-        NgPipesModule,
    ],
    providers: [
        { provide: SettingsTabProvider, useClass: PluginsSettingsTabProvider, multi: true },
--- a/terminus-plugin-manager/yarn.lock
+++ b/terminus-plugin-manager/yarn.lock
@@ -53,20 +53,15 @@ mz@^2.6.0:
    object-assign "^4.0.1"
    thenify-all "^1.0.0"

-ngx-pipes@^1.6.1:
-  version "1.6.6"
-  resolved "https://registry.yarnpkg.com/ngx-pipes/-/ngx-pipes-1.6.6.tgz#32bb80906c220f1e84d5cce7d6dae002cffead4b"
-  integrity sha512-mRV0xOZDd6/Jlvti4W0pDepZRIHLHd3kZ6ZzdqyGCU0dxbKVWWLTR1jlNlxN1ruMk8eO0Y8lNh6a1bEW7dJP1w==
-
 object-assign@^4.0.1:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=

 semver@^6.1.0:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.2.tgz#079960381376a3db62eb2edc8a3bfb10c7cfe318"
-  integrity sha512-z4PqiCpomGtWj8633oeAdXm1Kn1W++3T8epkZYnwiVgIYIJ0QHszhInYSJTYxebByQH7KVCEAn8R9duzZW2PhQ==
+  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.83-nightly.4",
+  "version": "1.0.92-nightly.0",
  "description": "Terminus terminal settings page",
  "keywords": [
    "terminus-builtin-plugin"
@@ -17,8 +17,7 @@
  "author": "Eugene Pankov",
  "license": "MIT",
  "devDependencies": {
-    "@types/deep-equal": "1.0.1",
-    "ngx-pipes": "^1.6.1"
+    "@types/deep-equal": "1.0.1"
  },
  "peerDependencies": {
    "@angular/common": "^7",
@@ -26,7 +25,7 @@
    "@angular/forms": "^7",
    "@angular/platform-browser": "^7",
    "@ng-bootstrap/ng-bootstrap": "^1",
-    "terminus-core": "*",
-    "rxjs": "^5"
+    "rxjs": "^5",
+    "terminus-core": "*"
  }
 }
--- a/terminus-settings/src/components/hotkeyInputModal.component.ts
+++ b/terminus-settings/src/components/hotkeyInputModal.component.ts
@@ -41,8 +41,8 @@ export class HotkeyInputModalComponent {
    @Input() timeoutProgress = 0

    private keySubscription: Subscription
-    private lastKeyEvent: number
-    private keyTimeoutInterval: number = null
+    private lastKeyEvent: number|null = null
+    private keyTimeoutInterval: number|null = null

    constructor (
        private modalInstance: NgbActiveModal,
@@ -78,7 +78,7 @@ export class HotkeyInputModalComponent {
        this.keySubscription.unsubscribe()
        this.hotkeys.clearCurrentKeystrokes()
        this.hotkeys.enable()
-        clearInterval(this.keyTimeoutInterval)
+        clearInterval(this.keyTimeoutInterval!)
    }

    close () {
--- a/terminus-settings/src/components/settingsTab.component.pug
+++ b/terminus-settings/src/components/settingsTab.component.pug
@@ -8,14 +8,14 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
        ng-template(ngbTabContent)
            .d-flex.align-items-center.mb-4
                h1.terminus-title.mb-2.mr-2 Terminus
-                    sup α 
-                
+                    sup α
+
                .text-muted.mr-auto {{homeBase.appVersion}}
-                            
+
                button.btn.btn-secondary.mr-3((click)='homeBase.openGitHub()')
                    i.fab.fa-github
                    span GitHub
-                    
+
                button.btn.btn-secondary((click)='homeBase.reportBug()')
                    i.fas.fa-bug
                    span Report a problem
@@ -57,7 +57,7 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
                    .title(*ngIf='hostApp.platform === Platform.Windows') Acrylic background
                    .title(*ngIf='hostApp.platform === Platform.macOS') Vibrancy
                    .description Gives the window a blurred transparent background
-                    
+
                toggle(
                    [(ngModel)]='config.store.appearance.vibrancy',
                    (ngModelChange)='config.save()'
@@ -85,7 +85,7 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
                            [value]='"fluent"'
                        )
                        | Fluent
-                    
+
            .form-line
                .header
                    .title Transparency
@@ -256,27 +256,28 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
            | Hotkeys
        ng-template(ngbTabContent)
            h3.mb-3 Hotkeys
-            
+
            .input-group.mb-4
                .input-group-prepend
                    .input-group-text
                        i.fas.fa-fw.fa-search
                input.form-control(type='search', placeholder='Search hotkeys', [(ngModel)]='hotkeyFilter')
-                            
+
            .form-group
                table.hotkeys-table
                    tr
                        th Name
                        th ID
                        th Hotkey
-                    tr(*ngFor='let hotkey of hotkeyDescriptions|filterBy:["name"]:hotkeyFilter')
-                        td {{hotkey.name}}
-                        td {{hotkey.id}}
-                        td.pr-5
-                            multi-hotkey-input(
-                                [model]='getHotkey(hotkey.id)',
-                                (modelChange)='setHotkey(hotkey.id, $event); config.save(); docking.dock()'
-                            )
+                    ng-container(*ngFor='let hotkey of hotkeyDescriptions')
+                        tr(*ngIf='!hotkeyFilter || hotkey.name.toLowerCase().includes(hotkeyFilter.toLowerCase())')
+                            td {{hotkey.name}}
+                            td {{hotkey.id}}
+                            td.pr-5
+                                multi-hotkey-input(
+                                    [model]='getHotkey(hotkey.id)',
+                                    (modelChange)='setHotkey(hotkey.id, $event); config.save(); docking.dock()'
+                                )

    ngb-tab(*ngFor='let provider of settingsProviders', [id]='provider.id')
        ng-template(ngbTabTitle)
@@ -285,7 +286,7 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
        ng-template(ngbTabContent)
            settings-tab-body([provider]='provider')

-                
+
    ngb-tab(id='config-file')
        ng-template(ngbTabTitle)
            i.fas.fa-fw.fa-code.mr-2
@@ -303,7 +304,7 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
                        textarea.form-control.h-100(
                            [(ngModel)]='configDefaults',
                            readonly
-                        )   
+                        )
                .mt-2.mb-2.d-flex
                    button.btn.btn-primary((click)='saveConfigFile()', *ngIf='isConfigFileValid()')
                        i.fas.fa-check.mr-2
--- a/terminus-settings/src/index.ts
+++ b/terminus-settings/src/index.ts
@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core'
 import { BrowserModule } from '@angular/platform-browser'
 import { FormsModule } from '@angular/forms'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
-import { NgPipesModule } from 'ngx-pipes'

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

@@ -22,7 +21,6 @@ import { SettingsConfigProvider } from './config'
        BrowserModule,
        FormsModule,
        NgbModule,
-        NgPipesModule,
        TerminusCorePlugin,
    ],
    providers: [
--- a/terminus-settings/src/recoveryProvider.ts
+++ b/terminus-settings/src/recoveryProvider.ts
@@ -6,7 +6,7 @@ import { SettingsTabComponent } from './components/settingsTab.component'
 /** @hidden */
@Injectable()
 export class RecoveryProvider extends TabRecoveryProvider {
-    async recover (recoveryToken: any): Promise<RecoveredTab> {
+    async recover (recoveryToken: any): Promise<RecoveredTab|null> {
        if (recoveryToken && recoveryToken.type === 'app:settings') {
            return { type: SettingsTabComponent }
        }
--- a/terminus-settings/yarn.lock
+++ b/terminus-settings/yarn.lock
@@ -6,8 +6,3 @@
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/@types/deep-equal/-/deep-equal-1.0.1.tgz#71cfabb247c22bcc16d536111f50c0ed12476b03"
  integrity sha512-mMUu4nWHLBlHtxXY17Fg6+ucS/MnndyOWyOe7MmwkoMYxvfQU2ajtRaEvqSUv+aVkMqH/C0NCI8UoVfRNQ10yg==
-
-ngx-pipes@^1.6.1:
-  version "1.6.6"
-  resolved "https://registry.yarnpkg.com/ngx-pipes/-/ngx-pipes-1.6.6.tgz#32bb80906c220f1e84d5cce7d6dae002cffead4b"
-  integrity sha512-mRV0xOZDd6/Jlvti4W0pDepZRIHLHd3kZ6ZzdqyGCU0dxbKVWWLTR1jlNlxN1ruMk8eO0Y8lNh6a1bEW7dJP1w==
--- a/terminus-ssh/package.json
+++ b/terminus-ssh/package.json
@@ -1,6 +1,6 @@
 {
  "name": "terminus-ssh",
-  "version": "1.0.83-nightly.0",
+  "version": "1.0.92-nightly.0",
  "description": "SSH connection manager for Terminus",
  "keywords": [
    "terminus-builtin-plugin"
--- a/terminus-ssh/src/api.ts
+++ b/terminus-ssh/src/api.ts
@@ -1,7 +1,7 @@
 import { BaseSession } from 'terminus-terminal'

 export interface LoginScript {
-    expect?: string
+    expect: string
    send: string
    isRegex?: boolean
    optional?: boolean
@@ -15,7 +15,7 @@ export enum SSHAlgorithmType {
 }

 export interface SSHConnection {
-    name?: string
+    name: string
    host: string
    port: number
    user: string
@@ -122,7 +122,7 @@ export class SSHSession extends BaseSession {
        this.kill('TERM')
    }

-    async getWorkingDirectory (): Promise<string> {
+    async getWorkingDirectory (): Promise<string|null> {
        return null
    }

--- a/terminus-ssh/src/components/editConnectionModal.component.ts
+++ b/terminus-ssh/src/components/editConnectionModal.component.ts
@@ -85,7 +85,7 @@ export class EditConnectionModalComponent {
                title: 'Select private key',
            }
        ).then(result => {
-            if (!result.filePaths) {
+            if (result.filePaths) {
                this.connection.privateKey = result.filePaths[0]
            }
        })
@@ -93,7 +93,7 @@ export class EditConnectionModalComponent {

    save () {
        for (const k of Object.values(SSHAlgorithmType)) {
-            this.connection.algorithms[k] = Object.entries(this.algorithms[k])
+            this.connection.algorithms![k] = Object.entries(this.algorithms[k])
                .filter(([_k, v]) => !!v)
                .map(([k, _v]) => k)
        }
@@ -105,6 +105,9 @@ export class EditConnectionModalComponent {
    }

    moveScriptUp (script: LoginScript) {
+        if (!this.connection.scripts) {
+            this.connection.scripts = []
+        }
        const index = this.connection.scripts.indexOf(script)
        if (index > 0) {
            this.connection.scripts.splice(index, 1)
@@ -113,6 +116,9 @@ export class EditConnectionModalComponent {
    }

    moveScriptDown (script: LoginScript) {
+        if (!this.connection.scripts) {
+            this.connection.scripts = []
+        }
        const index = this.connection.scripts.indexOf(script)
        if (index >= 0 && index < this.connection.scripts.length - 1) {
            this.connection.scripts.splice(index, 1)
@@ -121,7 +127,7 @@ export class EditConnectionModalComponent {
    }

    async deleteScript (script: LoginScript) {
-        if ((await this.electron.showMessageBox(
+        if (this.connection.scripts && (await this.electron.showMessageBox(
            this.hostApp.getWindow(),
            {
                type: 'warning',
@@ -136,6 +142,9 @@ export class EditConnectionModalComponent {
    }

    addScript () {
+        if (!this.connection.scripts) {
+            this.connection.scripts = []
+        }
        this.connection.scripts.push({ expect: '', send: '' })
    }
 }
--- a/terminus-ssh/src/components/sshModal.component.ts
+++ b/terminus-ssh/src/components/sshModal.component.ts
@@ -15,7 +15,7 @@ export class SSHModalComponent {
    connections: SSHConnection[]
    childFolders: SSHConnectionGroup[]
    quickTarget: string
-    lastConnection: SSHConnection
+    lastConnection: SSHConnection|null = null
    childGroups: SSHConnectionGroup[]
    groupCollapsed: {[id: string]: boolean} = {}

@@ -87,18 +87,18 @@ export class SSHModalComponent {

        let connections = this.connections
        if (this.quickTarget) {
-            connections = connections.filter(connection => (connection.name + connection.group).toLowerCase().includes(this.quickTarget))
+            connections = connections.filter((connection: SSHConnection) => (connection.name + connection.group!).toLowerCase().includes(this.quickTarget))
        }

        for (const connection of connections) {
-            connection.group = connection.group || null
+            connection.group = connection.group || undefined
            let group = this.childGroups.find(x => x.name === connection.group)
            if (!group) {
                group = {
-                    name: connection.group,
+                    name: connection.group!,
                    connections: [],
                }
-                this.childGroups.push(group)
+                this.childGroups.push(group!)
            }
            group.connections.push(connection)
        }
--- a/terminus-ssh/src/components/sshSettingsTab.component.ts
+++ b/terminus-ssh/src/components/sshSettingsTab.component.ts
@@ -97,7 +97,7 @@ export class SSHSettingsTabComponent {
            }
        )).response === 1) {
            for (const connection of this.connections.filter(x => x.group === group.name)) {
-                connection.group = null
+                connection.group = undefined
            }
            this.config.save()
            this.refresh()
@@ -109,14 +109,14 @@ export class SSHSettingsTabComponent {
        this.childGroups = []

        for (const connection of this.connections) {
-            connection.group = connection.group || null
+            connection.group = connection.group || undefined
            let group = this.childGroups.find(x => x.name === connection.group)
            if (!group) {
                group = {
-                    name: connection.group,
+                    name: connection.group!,
                    connections: [],
                }
-                this.childGroups.push(group)
+                this.childGroups.push(group!)
            }
            group.connections.push(connection)
        }
--- a/terminus-ssh/src/components/sshTab.component.ts
+++ b/terminus-ssh/src/components/sshTab.component.ts
@@ -46,7 +46,7 @@ export class SSHTabComponent extends BaseTerminalTabComponent {
        this.write(`Connecting to ${this.connection.host}`)
        const interval = setInterval(() => this.write('.'), 500)
        try {
-            await this.ssh.connectSession(this.session, message => {
+            await this.ssh.connectSession(this.session, (message: string) => {
                this.write('\r\n' + message)
            })
        } catch (e) {
--- a/terminus-ssh/src/recoveryProvider.ts
+++ b/terminus-ssh/src/recoveryProvider.ts
@@ -6,7 +6,7 @@ import { SSHTabComponent } from './components/sshTab.component'
 /** @hidden */
@Injectable()
 export class RecoveryProvider extends TabRecoveryProvider {
-    async recover (recoveryToken: any): Promise<RecoveredTab> {
+    async recover (recoveryToken: any): Promise<RecoveredTab|null> {
        if (recoveryToken && recoveryToken.type === 'app:ssh-tab') {
            return {
                type: SSHTabComponent,
--- a/terminus-ssh/src/services/passwordStorage.service.ts
+++ b/terminus-ssh/src/services/passwordStorage.service.ts
@@ -12,7 +12,7 @@ export class PasswordStorageService {
        await keytar.deletePassword(`ssh@${connection.host}`, connection.user)
    }

-    async loadPassword (connection: SSHConnection): Promise<string> {
+    async loadPassword (connection: SSHConnection): Promise<string|null> {
        return keytar.getPassword(`ssh@${connection.host}`, connection.user)
    }
 }
--- a/terminus-ssh/src/services/ssh.service.ts
+++ b/terminus-ssh/src/services/ssh.service.ts
@@ -38,9 +38,9 @@ export class SSHService {
        ) as SSHTabComponent)
    }

-    async connectSession (session: SSHSession, logCallback?: (s: string) => void): Promise<void> {
-        let privateKey: string = null
-        let privateKeyPassphrase: string = null
+    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) {
@@ -48,12 +48,12 @@ export class SSHService {
        }

        const log = (s: any) => {
-            logCallback(s)
+            logCallback!(s)
            this.logger.info(s)
        }

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

        const ssh = new Client()
        let connected = false
-        let savedPassword: string = null
+        let savedPassword: string|null = null
        await new Promise(async (resolve, reject) => {
            ssh.on('ready', () => {
                connected = true
@@ -116,7 +116,7 @@ export class SSHService {
            ssh.on('keyboard-interactive', (name, instructions, instructionsLang, prompts, finish) => this.zone.run(async () => {
                log(`Keyboard-interactive auth requested: ${name}`)
                this.logger.info('Keyboard-interactive auth:', name, instructions, instructionsLang)
-                const results = []
+                const results: string[] = []
                for (const prompt of prompts) {
                    const modal = this.ngbModal.open(PromptModalComponent)
                    modal.componentInstance.prompt = prompt.prompt
@@ -135,7 +135,7 @@ export class SSHService {
                log('Banner: \n' + banner)
            })

-            let agent: string = null
+            let agent: string|null = null
            if (this.hostApp.platform === Platform.Windows) {
                const pageantRunning = new Promise<boolean>(resolve => {
                    windowsProcessTreeNative.getProcessList(list => { // eslint-disable-line block-scoped-var
@@ -146,7 +146,7 @@ export class SSHService {
                    agent = 'pageant'
                }
            } else {
-                agent = process.env.SSH_AUTH_SOCK
+                agent = process.env.SSH_AUTH_SOCK as string
            }

            try {
@@ -155,10 +155,10 @@ export class SSHService {
                    port: session.connection.port || 22,
                    username: session.connection.user,
                    password: session.connection.privateKey ? undefined : '',
-                    privateKey,
-                    passphrase: privateKeyPassphrase,
+                    privateKey: privateKey || undefined,
+                    passphrase: privateKeyPassphrase || undefined,
                    tryKeyboard: true,
-                    agent,
+                    agent: agent || undefined,
                    agentForward: !!agent,
                    keepaliveInterval: session.connection.keepaliveInterval,
                    keepaliveCountMax: session.connection.keepaliveCountMax,
--- a/terminus-ssh/yarn.lock
+++ b/terminus-ssh/yarn.lock
@@ -3,9 +3,9 @@


 "@types/node@*", "@types/node@^12.7.3":
-  version "12.7.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.4.tgz#64db61e0359eb5a8d99b55e05c729f130a678b04"
-  integrity sha512-W0+n1Y+gK/8G2P/piTkBBN38Qc5Q1ZSO6B5H3QmPCUewaiXOo2GCAWZ4ElZCcNhjJuBSUSLGFUJnmlCn5+nxOQ==
+  version "12.7.12"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.12.tgz#7c6c571cc2f3f3ac4a59a5f2bd48f5bdbc8653cc"
+  integrity sha512-KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ==

 "@types/ssh2-streams@*":
  version "0.1.2"
@@ -42,9 +42,9 @@ safer-buffer@~2.1.0:
  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==

 ssh2-streams@^0.4.2, ssh2-streams@~0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/ssh2-streams/-/ssh2-streams-0.4.4.tgz#7f07464c4b19ee93324995ec7164f110c5a13658"
-  integrity sha512-yNfPZgJO/N69TvYkpDHZBkXAXQzTpfzRkOphQu3PeUpZnrjp9VNa8RKDZkZDpjsWItay+I4NMAbZZ7DqHRt0AQ==
+  version "0.4.6"
+  resolved "https://registry.yarnpkg.com/ssh2-streams/-/ssh2-streams-0.4.6.tgz#1ef0bca163141b4baedf047c8429e48be8c2d99d"
+  integrity sha512-jXq/nk2K82HuueO9CTCdas/a0ncX3fvYzEPKt1+ftKwE5RXTX25GyjcpjBh2lwVUYbk0c9yq6cBczZssWmU3Tw==
  dependencies:
    asn1 "~0.2.0"
    bcrypt-pbkdf "^1.0.2"
--- a/terminus-terminal/package.json
+++ b/terminus-terminal/package.json
@@ -1,6 +1,6 @@
 {
  "name": "terminus-terminal",
-  "version": "1.0.83-nightly.4",
+  "version": "1.0.92-nightly.0",
  "description": "Terminus' terminal emulation core",
  "keywords": [
    "terminus-builtin-plugin"
@@ -28,10 +28,10 @@
    "slug": "^1.1.0",
    "uuid": "^3.3.2",
    "xterm": "3.15.0-beta98",
-    "xterm-addon-fit": "^0.2.0-beta1",
-    "xterm-addon-ligatures": "^0.1.0-beta-2",
-    "xterm-addon-search": "^0.2.0-beta1",
-    "xterm-addon-webgl": "^0.2.0-beta1"
+    "xterm-addon-fit": "^0.3.0-beta2",
+    "xterm-addon-ligatures": "^0.2.0",
+    "xterm-addon-search": "^0.3.0-beta2",
+    "xterm-addon-webgl": "^0.3.0-beta2"
  },
  "peerDependencies": {
    "@angular/animations": "^7",
--- a/terminus-terminal/src/api/baseTerminalTab.component.ts
+++ b/terminus-terminal/src/api/baseTerminalTab.component.ts
@@ -43,7 +43,7 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
    @ViewChild('content') content

    /** @hidden */
-    @HostBinding('style.background-color') backgroundColor: string
+    @HostBinding('style.background-color') backgroundColor: string|null = null

    /** @hidden */
    @HostBinding('class.top-padded') topPadded: boolean
--- a/terminus-terminal/src/buttonProvider.ts
+++ b/terminus-terminal/src/buttonProvider.ts
@@ -18,7 +18,7 @@ export class ButtonProvider extends ToolbarButtonProvider {
                for (const arg of argv.slice(1).concat([electron.remote.process.argv0])) {
                    if (await fs.exists(arg)) {
                        if ((await fs.stat(arg)).isDirectory()) {
-                            this.terminal.openTab(null, arg)
+                            this.terminal.openTab(undefined, arg)
                        }
                    }
                }
--- a/terminus-terminal/src/colorSchemes.ts
+++ b/terminus-terminal/src/colorSchemes.ts
@@ -8,7 +8,7 @@ import { TerminalColorScheme } from './api/interfaces'
@Injectable()
 export class HyperColorSchemes extends TerminalColorSchemeProvider {
    async getSchemes (): Promise<TerminalColorScheme[]> {
-        const pluginsPath = path.join(process.env.HOME, '.hyper_plugins', 'node_modules')
+        const pluginsPath = path.join(process.env.HOME as string, '.hyper_plugins', 'node_modules')
        if (!await fs.exists(pluginsPath)) {
            return []
        }
--- a/terminus-terminal/src/components/appearanceSettingsTab.component.ts
+++ b/terminus-terminal/src/components/appearanceSettingsTab.component.ts
@@ -19,7 +19,7 @@ export class AppearanceSettingsTabComponent {
    fonts: string[] = []
    colorSchemes: TerminalColorScheme[] = []
    equalComparator = deepEqual
-    editingColorScheme: TerminalColorScheme
+    editingColorScheme: TerminalColorScheme|null = null
    schemeChanged = false

    constructor (
@@ -68,7 +68,7 @@ export class AppearanceSettingsTabComponent {

    saveScheme () {
        let schemes = this.config.store.terminal.customColorSchemes
-        schemes = schemes.filter(x => x !== this.editingColorScheme && x.name !== this.editingColorScheme.name)
+        schemes = schemes.filter(x => x !== this.editingColorScheme && x.name !== this.editingColorScheme!.name)
        schemes.push(this.editingColorScheme)
        this.config.store.terminal.customColorSchemes = schemes
        this.config.save()
--- a/terminus-terminal/src/components/searchPanel.component.pug
+++ b/terminus-terminal/src/components/searchPanel.component.pug
@@ -32,3 +32,9 @@
                placement='bottom'
            )
                i.fa.fa-fw.fa-text-width
+            button.btn.btn-outline(
+                (click)='close.emit()',
+                ngbTooltip='Close',
+                placement='bottom'
+            )
+                i.fa.fa-fw.fa-times
--- a/terminus-terminal/src/components/searchPanel.component.ts
+++ b/terminus-terminal/src/components/searchPanel.component.ts
@@ -8,11 +8,10 @@ import { Frontend, SearchOptions } from '../frontends/frontend'
    styles: [require('./searchPanel.component.scss')],
 })
 export class SearchPanelComponent {
-    static globalOptions: SearchOptions = {}
    @Input() query: string
    @Input() frontend: Frontend
    notFound = false
-    options: SearchOptions = SearchPanelComponent.globalOptions
+    options: SearchOptions = {}

    @Output() close = new EventEmitter()

--- a/terminus-terminal/src/components/shellSettingsTab.component.ts
+++ b/terminus-terminal/src/components/shellSettingsTab.component.ts
@@ -52,6 +52,9 @@ export class ShellSettingsTabComponent {

    pickWorkingDirectory () {
        const shell = this.shells.find(x => x.id === this.config.store.terminal.shell)
+        if (!shell) {
+            return
+        }
        const paths = this.electron.dialog.showOpenDialog(
            this.hostApp.getWindow(),
            {
@@ -66,7 +69,7 @@ export class ShellSettingsTabComponent {

    newProfile (shell: Shell) {
        const profile: Profile = {
-            name: shell.name,
+            name: shell.name || '',
            sessionOptions: this.terminalService.optionsFromShell(shell),
        }
        this.config.store.terminal.profiles = [profile, ...this.config.store.terminal.profiles]
--- a/terminus-terminal/src/components/terminalSettingsTab.component.pug
+++ b/terminus-terminal/src/components/terminalSettingsTab.component.pug
@@ -66,6 +66,15 @@ h3.mb-3 Terminal
        (ngModelChange)='config.save()',
    )

+.form-line
+    .header
+        .title Restore terminal tabs on app start
+            
+    toggle(
+        [(ngModel)]='config.store.terminal.recoverTabs',
+        (ngModelChange)='config.save()',
+    )
+
 .form-line
    .header
        .title Bracketed paste (requires shell support)
--- a/terminus-terminal/src/components/terminalSettingsTab.component.ts
+++ b/terminus-terminal/src/components/terminalSettingsTab.component.ts
@@ -16,7 +16,7 @@ export class TerminalSettingsTabComponent {
    openWSLVolumeMixer () {
        this.electron.shell.openItem('sndvol.exe')
        this.terminal.openTab({
-            name: null,
+            name: '',
            sessionOptions: {
                command: 'wsl.exe',
                args: ['tput', 'bel'],
--- a/terminus-terminal/src/components/terminalTab.component.ts
+++ b/terminus-terminal/src/components/terminalTab.component.ts
@@ -68,7 +68,7 @@ export class TerminalTabComponent extends BaseTerminalTabComponent {
        }
    }

-    async getCurrentProcess (): Promise<BaseTabProcess> {
+    async getCurrentProcess (): Promise<BaseTabProcess|null> {
        const children = await this.session.getChildProcesses()
        if (!children.length) {
            return null
--- a/terminus-terminal/src/config.ts
+++ b/terminus-terminal/src/config.ts
@@ -59,6 +59,7 @@ export class TerminalConfigProvider extends ConfigProvider {
            environment: {},
            profiles: [],
            useConPTY: true,
+            recoverTabs: true,
        },
    }

--- a/terminus-terminal/src/frontends/hterm.ts
+++ b/terminus-terminal/src/frontends/hterm.ts
@@ -78,11 +78,11 @@ hterm.hterm.VT.CSI[' q'] = function (parseState) {
 }

 hterm.hterm.VT.OSC['4'] = function (parseState) {
-    const args = parseState.args[0].split(';')
+    const args: string[] = parseState.args[0].split(';')

    const pairCount = args.length / 2
    const colorPalette = this.terminal.getTextAttributes().colorPalette
-    const responseArray = []
+    const responseArray: string[] = []

    for (let pairNumber = 0; pairNumber < pairCount; ++pairNumber) {
        const colorIndex = parseInt(args[pairNumber * 2])
@@ -95,7 +95,7 @@ hterm.hterm.VT.OSC['4'] = function (parseState) {
        if (colorValue === '?') {
            colorValue = hterm.lib.colors.rgbToX11(colorPalette[colorIndex])
            if (colorValue) {
-                responseArray.push(colorIndex + ';' + colorValue)
+                responseArray.push(colorIndex.toString() + ';' + colorValue)
            }
            continue
        }
--- a/terminus-terminal/src/frontends/htermFrontend.ts
+++ b/terminus-terminal/src/frontends/htermFrontend.ts
@@ -186,7 +186,7 @@ export class HTermFrontend extends Frontend {
            this.io.onTerminalResize = (columns, rows) => {
                this.resize.next({ columns, rows })
            }
-            this.ready.next(null)
+            this.ready.next()
            this.ready.complete()

            this.term.scrollPort_.document_.addEventListener('dragOver', event => {
--- a/terminus-terminal/src/frontends/xtermFrontend.ts
+++ b/terminus-terminal/src/frontends/xtermFrontend.ts
@@ -2,7 +2,7 @@ import { Frontend, SearchOptions } from './frontend'
 import { Terminal, ITheme } from 'xterm'
 import { getCSSFontFamily } from '../utils'
 import { FitAddon } from 'xterm-addon-fit'
-import { enableLigatures } from 'xterm-addon-ligatures'
+import { LigaturesAddon } from 'xterm-addon-ligatures'
 import { SearchAddon } from 'xterm-addon-search'
 import { WebglAddon } from 'xterm-addon-webgl'
 import './xterm.css'
@@ -29,6 +29,7 @@ export class XTermFrontend extends Frontend {
    private copyOnSelect = false
    private search = new SearchAddon()
    private fitAddon = new FitAddon()
+    private ligaturesAddon: LigaturesAddon
    private opened = false

    constructor () {
@@ -85,11 +86,11 @@ export class XTermFrontend extends Frontend {

        this.resizeHandler = () => {
            try {
-                if (this.xtermCore.element && getComputedStyle(this.xtermCore.element).getPropertyValue('height') !== 'auto') {
-                    let t = window.getComputedStyle(this.xtermCore.element.parentElement)
+                if (this.xterm.element && getComputedStyle(this.xterm.element).getPropertyValue('height') !== 'auto') {
+                    let t = window.getComputedStyle(this.xterm.element.parentElement!)
                    let r = parseInt(t.getPropertyValue('height'))
                    let n = Math.max(0, parseInt(t.getPropertyValue('width')))
-                    let o = window.getComputedStyle(this.xtermCore.element)
+                    let o = window.getComputedStyle(this.xterm.element)
                    let i = r - (parseInt(o.getPropertyValue('padding-top')) + parseInt(o.getPropertyValue('padding-bottom')))
                    let l = n - (parseInt(o.getPropertyValue('padding-right')) + parseInt(o.getPropertyValue('padding-left'))) - this.xtermCore.viewport.scrollBarWidth
                    let actualCellWidth = this.xtermCore._renderService.dimensions.actualCellWidth || 9
@@ -119,11 +120,7 @@ export class XTermFrontend extends Frontend {
            this.xterm.loadAddon(new WebglAddon())
        }

-        if (this.configService.store.terminal.ligatures) {
-            enableLigatures(this.xterm)
-        }
-
-        this.ready.next(null)
+        this.ready.next()
        this.ready.complete()

        this.xterm.loadAddon(this.search)
@@ -225,8 +222,9 @@ export class XTermFrontend extends Frontend {
            this.configuredTheme = theme
        }

-        if (this.opened && config.terminal.ligatures) {
-            enableLigatures(this.xterm)
+        if (this.opened && config.terminal.ligatures && !this.ligaturesAddon) {
+            this.ligaturesAddon = new LigaturesAddon()
+            this.xterm.loadAddon(this.ligaturesAddon)
        }
    }

@@ -252,13 +250,13 @@ export class XTermFrontend extends Frontend {
        let html = `<div style="font-family: '${this.configService.store.terminal.font}', monospace; white-space: pre">`
        const selection = this.xterm.getSelectionPosition()
        if (!selection) {
-            return null
+            return ''
        }
        if (selection.startRow === selection.endRow) {
            html += this.getLineAsHTML(selection.startRow, selection.startColumn, selection.endColumn)
        } else {
            html += this.getLineAsHTML(selection.startRow, selection.startColumn, this.xterm.cols)
-            for (let y = selection.startRow + 1; y < selection.endRow; y++) {
+            for (let y = selection.startRow! + 1; y < selection.endRow; y++) {
                html += this.getLineAsHTML(y, 0, this.xterm.cols)
            }
            html += this.getLineAsHTML(selection.endRow, 0, selection.endColumn)
@@ -280,7 +278,7 @@ export class XTermFrontend extends Frontend {

    private getLineAsHTML (y: number, start: number, end: number): string {
        let html = '<div>'
-        let lastStyle = null
+        let lastStyle: string|null = null
        const line = (this.xterm.buffer.getLine(y) as any)._line
        const cell = new CellData()
        for (let i = start; i < end; i++) {
--- a/terminus-terminal/src/index.ts
+++ b/terminus-terminal/src/index.ts
@@ -188,7 +188,7 @@ export default class TerminalModule { // eslint-disable-line @typescript-eslint/
        hostApp.cliOpenDirectory$.subscribe(async directory => {
            if (await fs.exists(directory)) {
                if ((await fs.stat(directory)).isDirectory()) {
-                    terminal.openTab(null, directory)
+                    terminal.openTab(undefined, directory)
                    hostApp.bringToFront()
                }
            }
--- a/terminus-terminal/src/pathDrop.ts
+++ b/terminus-terminal/src/pathDrop.ts
@@ -15,7 +15,7 @@ export class PathDropDecorator extends TerminalDecorator {
                    event.preventDefault()
                }),
                terminal.frontend.drop$.subscribe(event => {
-                    for (const file of event.dataTransfer.files as any) {
+                    for (const file of event.dataTransfer!.files as any) {
                        this.injectPath(terminal, file.path)
                    }
                    event.preventDefault()
--- a/terminus-terminal/src/recoveryProvider.ts
+++ b/terminus-terminal/src/recoveryProvider.ts
@@ -6,7 +6,7 @@ import { TerminalTabComponent } from './components/terminalTab.component'
 /** @hidden */
@Injectable()
 export class RecoveryProvider extends TabRecoveryProvider {
-    async recover (recoveryToken: any): Promise<RecoveredTab> {
+    async recover (recoveryToken: any): Promise<RecoveredTab|null> {
        if (recoveryToken && recoveryToken.type === 'app:terminal-tab') {
            return {
                type: TerminalTabComponent,
--- a/terminus-terminal/src/services/dockMenu.service.ts
+++ b/terminus-terminal/src/services/dockMenu.service.ts
@@ -30,7 +30,7 @@ export class DockMenuService {
                    iconPath: process.execPath,
                    iconIndex: 0,
                })),
-            }] : null)
+            }] : null as any)
        }
        if (this.hostApp.platform === Platform.macOS) {
            this.electron.app.dock.setMenu(this.electron.Menu.buildFromTemplate(
--- a/terminus-terminal/src/services/sessions.service.ts
+++ b/terminus-terminal/src/services/sessions.service.ts
@@ -62,7 +62,7 @@ export abstract class BaseSession {
    releaseInitialDataBuffer () {
        this.initialDataBufferReleased = true
        this.output.next(this.initialDataBuffer)
-        this.initialDataBuffer = null
+        this.initialDataBuffer = ''
    }

    async destroy (): Promise<void> {
@@ -81,14 +81,14 @@ export abstract class BaseSession {
    abstract kill (signal?: string): void
    abstract async getChildProcesses (): Promise<ChildProcess[]>
    abstract async gracefullyKillProcess (): Promise<void>
-    abstract async getWorkingDirectory (): Promise<string>
+    abstract async getWorkingDirectory (): Promise<string|null>
 }

 /** @hidden */
 export class Session extends BaseSession {
    private pty: any
    private pauseAfterExit = false
-    private guessedCWD: string
+    private guessedCWD: string|null = null
    private reportedCWD: string

    constructor (private config: ConfigService) {
@@ -96,7 +96,7 @@ export class Session extends BaseSession {
    }

    start (options: SessionOptions) {
-        this.name = options.name
+        this.name = options.name || ''

        const env = {
            ...process.env,
@@ -122,7 +122,7 @@ export class Session extends BaseSession {

        if (!fs.existsSync(cwd)) {
            console.warn('Ignoring non-existent CWD:', cwd)
-            cwd = null
+            cwd = undefined
        }

        this.pty = nodePTY.spawn(options.command, options.args || [], {
@@ -135,7 +135,7 @@ export class Session extends BaseSession {
            experimentalUseConpty: (isWindowsBuild(WIN_BUILD_CONPTY_SUPPORTED) && this.config.store.terminal.useConPTY ? 1 : false) as any,
        })

-        this.guessedCWD = cwd
+        this.guessedCWD = cwd || null

        this.truePID = this.pty['pid']

@@ -174,7 +174,7 @@ export class Session extends BaseSession {
            }
        })

-        this.pauseAfterExit = options.pauseAfterExit
+        this.pauseAfterExit = options.pauseAfterExit || false
    }

    processOSC1337 (data: string) {
@@ -270,7 +270,7 @@ export class Session extends BaseSession {
        }
    }

-    async getWorkingDirectory (): Promise<string> {
+    async getWorkingDirectory (): Promise<string|null> {
        if (this.reportedCWD) {
            return this.reportedCWD
        }
--- a/terminus-terminal/src/services/terminal.service.ts
+++ b/terminus-terminal/src/services/terminal.service.ts
@@ -51,7 +51,7 @@ export class TerminalService {
     * Launches a new terminal with a specific shell and CWD
     * @param pause Wait for a keypress when the shell exits
     */
-    async openTab (profile?: Profile, cwd?: string, pause?: boolean): Promise<TerminalTabComponent> {
+    async openTab (profile?: Profile, cwd?: string|null, pause?: boolean): Promise<TerminalTabComponent> {
        if (!profile) {
            const profiles = await this.getProfiles(true)
            profile = profiles.find(x => slug(x.name).toLowerCase() === this.config.store.terminal.profile) || profiles[0]
@@ -85,7 +85,7 @@ export class TerminalService {
        const sessionOptions = {
            ...profile.sessionOptions,
            pauseAfterExit: pause,
-            cwd,
+            cwd: cwd || undefined,
        }

        return this.openTabWithOptions(sessionOptions)
--- a/terminus-terminal/src/services/terminalFrontend.service.ts
+++ b/terminus-terminal/src/services/terminalFrontend.service.ts
@@ -34,6 +34,6 @@ export class TerminalFrontendService {
                this.getFrontend(),
            )
        }
-        return this.containers.get(session)
+        return this.containers.get(session)!
    }
 }
--- a/terminus-terminal/src/shells/linuxDefault.ts
+++ b/terminus-terminal/src/shells/linuxDefault.ts
@@ -23,7 +23,7 @@ export class LinuxDefaultShellProvider extends ShellProvider {
            return []
        }
        const line = (await fs.readFile('/etc/passwd', { encoding: 'utf-8' }))
-            .split('\n').find(x => x.startsWith(process.env.LOGNAME + ':'))
+            .split('\n').find(x => x.startsWith(`${process.env.LOGNAME}:`))
        if (!line) {
            this.logger.warn('Could not detect user shell')
            return [{
--- a/terminus-terminal/yarn.lock
+++ b/terminus-terminal/yarn.lock
@@ -46,7 +46,7 @@ define-properties@^1.1.2:
  dependencies:
    object-keys "^1.0.12"

-font-finder@^1.0.2, font-finder@^1.0.3:
+font-finder@^1.0.3, font-finder@^1.0.4:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/font-finder/-/font-finder-1.0.4.tgz#2ca944954dd8d0e1b5bdc4c596cc08607761d89b"
  integrity sha512-naF16RpjWUTFLqzhmdivYpBCrqySN6PI+a4GPtoEsCdvOpbKYTGeTjO7mxh3Wwjz4xKU+Oqx9kwOcteLDeMFQA==
@@ -54,7 +54,7 @@ font-finder@^1.0.2, font-finder@^1.0.3:
    get-system-fonts "^2.0.0"
    promise-stream-reader "^1.0.1"

-font-ligatures@^1.3.1:
+font-ligatures@^1.3.2:
  version "1.3.2"
  resolved "https://registry.yarnpkg.com/font-ligatures/-/font-ligatures-1.3.2.tgz#227eb5fc38fef34b5373aa19b555320b82842a71"
  integrity sha512-h9t+gvKVr/c2GnQs4GhXHY39/qyLlXNaIxupU1cxj7YOXEFT8+sJfcchIrZ9UETZUUT7dNcI7RDOXN7gFtuw2g==
@@ -209,32 +209,32 @@ tiny-inflate@^1.0.2:
  integrity sha512-+cHtykLb+eF1yrSLWTwcYBrqJkTfX7Quoyg7Juhe6uylF43ZbMdxMuSHNYlnyLT8T7POAvavgBthzUF9AIaQvQ==

 uuid@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
+  integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==

-xterm-addon-fit@^0.2.0-beta1:
-  version "0.2.0-beta1"
-  resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.2.0-beta1.tgz#7bb277c53e174d25b0e85eddbcf886820c0fc5ae"
-  integrity sha512-GikOMxlay53F/PVHHPoZ/3CGKowfS/Sp2qAERXU4MruK7V+gMb5IhwihkXQc6nGqt6ddVUHTl6nelsw8MEJ1dQ==
+xterm-addon-fit@^0.3.0-beta2:
+  version "0.3.0-beta3"
+  resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.3.0-beta3.tgz#c091d1fcff49fbb321a5276fe04cbc90d37f03ad"
+  integrity sha512-cTRWGje3/WvWly0xF3E/kl8Clr2l/EUiQpbMrpsBpnASQbEdZ+u+OLSYsouT6+H/mO/MX+VzFZKWD/WrZitx7A==

-xterm-addon-ligatures@^0.1.0-beta-2:
-  version "0.1.0-beta-2"
-  resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.1.0-beta-2.tgz#def635fd0ca671fe61179629f8492b76c66dec6e"
-  integrity sha512-MN5zCBxrF9xagzUYIpcgHS4L/Isod3m3ET5S7AUEEbymLJ+4zccio32eyq65Bcc50x/Bm57Hoh9gaSEUdojs8g==
+xterm-addon-ligatures@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.2.0.tgz#8d65fea968ba5b4306b2ada6f53eed3e1984f69c"
+  integrity sha512-IcRgjq3QCcL6P8W5M86BCnXIGD1LcCVKk7w3S29Yn2+YksMM3c85JjW2OUgsL3VTW/Tb6uyxpSV2rJOsRElVrQ==
  dependencies:
-    font-finder "^1.0.2"
-    font-ligatures "^1.3.1"
+    font-finder "^1.0.4"
+    font-ligatures "^1.3.2"

-xterm-addon-search@^0.2.0-beta1:
-  version "0.2.0-beta6"
-  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.2.0-beta6.tgz#acd7da66015acdef5942031f7e812be47e3ca079"
-  integrity sha512-dKP9MW+X2LUco+MgT6cL7ytCtbtsaXFdDjZbJQoBEkU7Z8kxgJft8saKhGYjg+4nrFkSqocqGIaLEBMaZhjoFw==
+xterm-addon-search@^0.3.0-beta2:
+  version "0.3.0-beta5"
+  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.3.0-beta5.tgz#fd53d33a77a0235018479c712be8c12f7c0d083a"
+  integrity sha512-3GkGc4hST35/4hzgnQPLLvQ29WH7MkZ0mUrBE/Vm1IQum7TnMvWPTkGemwM+wAl4tdBmynNccHJlFeQzaQtVUg==

-xterm-addon-webgl@^0.2.0-beta1:
-  version "0.2.0-beta7"
-  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.2.0-beta7.tgz#b43f9e9edae52386b87c1834ca4385b37be3d4a9"
-  integrity sha512-5rFvt27qVJ6nf3WunLyc4qeZoUg9JugE6J911yKTgH4TFLjoDnYv5Q5CYn4W0yX084Frq8tL2tZVy0KXVXJ7Lg==
+xterm-addon-webgl@^0.3.0-beta2:
+  version "0.3.0-beta6"
+  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.3.0-beta6.tgz#0516624f077a674f8acb05a42a76fd7f4c7b292a"
+  integrity sha512-qJmsKKM8lkFzb+KgBsxkZtMdP97Ztrt+ykRXZh2MOchxAnvOla9Xrurhvc9BcqpB8jJ9lWF2hJdyjfiFLsCRLQ==

 xterm@3.15.0-beta98:
  version "3.15.0-beta98"
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -16,6 +16,7 @@
    "esModuleInterop": true,
    "allowSyntheticDefaultImports": true,
    "importHelpers": true,
+    "strictNullChecks": true,
    "lib": [
      "dom",
      "es5",
--- a/yarn.lock
+++ b/yarn.lock