diff --git a/.eslintrc.yml b/.eslintrc.yml
index 8cf12746..befa865b 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -79,6 +79,7 @@ rules:
       args: after-used
       argsIgnorePattern: ^_
   no-undef: error
+  no-var: error
   object-curly-spacing:
   - error
   - always
diff --git a/terminus-core/src/services/shellIntegration.service.ts b/terminus-core/src/services/shellIntegration.service.ts
index dbf32f9d..f2fd1ff6 100644
--- a/terminus-core/src/services/shellIntegration.service.ts
+++ b/terminus-core/src/services/shellIntegration.service.ts
@@ -8,7 +8,7 @@ import { HostAppService, Platform } from './hostApp.service'
 /* eslint-disable block-scoped-var */
 
 try {
-    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires
+    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires, no-var
 } catch (_) { }
 
 @Injectable({ providedIn: 'root' })
diff --git a/terminus-ssh/src/services/ssh.service.ts b/terminus-ssh/src/services/ssh.service.ts
index d7c8256b..4b738a14 100644
--- a/terminus-ssh/src/services/ssh.service.ts
+++ b/terminus-ssh/src/services/ssh.service.ts
@@ -13,7 +13,7 @@ import { PasswordStorageService } from './passwordStorage.service'
 import { SSH2Stream } from 'ssh2-streams'
 
 try {
-    var windowsProcessTreeNative = require('windows-process-tree/build/Release/windows_process_tree.node') // eslint-disable-line @typescript-eslint/no-var-requires
+    var windowsProcessTreeNative = require('windows-process-tree/build/Release/windows_process_tree.node') // eslint-disable-line @typescript-eslint/no-var-requires, no-var
 } catch { }
 
 @Injectable({ providedIn: 'root' })
diff --git a/terminus-terminal/src/services/sessions.service.ts b/terminus-terminal/src/services/sessions.service.ts
index 2055a44f..8153f71d 100644
--- a/terminus-terminal/src/services/sessions.service.ts
+++ b/terminus-terminal/src/services/sessions.service.ts
@@ -14,11 +14,11 @@ import { WIN_BUILD_CONPTY_SUPPORTED, isWindowsBuild } from '../utils'
 /* eslint-disable block-scoped-var */
 
 try {
-    var macOSNativeProcessList = require('macos-native-processlist')  // eslint-disable-line @typescript-eslint/no-var-requires
+    var macOSNativeProcessList = require('macos-native-processlist')  // eslint-disable-line @typescript-eslint/no-var-requires, no-var
 } catch { }
 
 try {
-    var windowsProcessTree = require('windows-process-tree')  // eslint-disable-line @typescript-eslint/no-var-requires
+    var windowsProcessTree = require('windows-process-tree')  // eslint-disable-line @typescript-eslint/no-var-requires, no-var
 } catch { }
 
 
diff --git a/terminus-terminal/src/shells/cygwin32.ts b/terminus-terminal/src/shells/cygwin32.ts
index 72ea8255..e8417352 100644
--- a/terminus-terminal/src/shells/cygwin32.ts
+++ b/terminus-terminal/src/shells/cygwin32.ts
@@ -8,7 +8,7 @@ import { Shell } from '../api/interfaces'
 /* eslint-disable block-scoped-var */
 
 try {
-    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires
+    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires, no-var
 } catch { }
 
 /** @hidden */
diff --git a/terminus-terminal/src/shells/cygwin64.ts b/terminus-terminal/src/shells/cygwin64.ts
index c7ac017f..c116b84a 100644
--- a/terminus-terminal/src/shells/cygwin64.ts
+++ b/terminus-terminal/src/shells/cygwin64.ts
@@ -8,7 +8,7 @@ import { Shell } from '../api/interfaces'
 /* eslint-disable block-scoped-var */
 
 try {
-    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires
+    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires, no-var
 } catch { }
 
 /** @hidden */
diff --git a/terminus-terminal/src/shells/gitBash.ts b/terminus-terminal/src/shells/gitBash.ts
index 984bf38e..2041e174 100644
--- a/terminus-terminal/src/shells/gitBash.ts
+++ b/terminus-terminal/src/shells/gitBash.ts
@@ -8,7 +8,7 @@ import { Shell } from '../api/interfaces'
 /* eslint-disable block-scoped-var */
 
 try {
-    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires
+    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires, no-var
 } catch { }
 
 /** @hidden */
diff --git a/terminus-terminal/src/shells/powershellCore.ts b/terminus-terminal/src/shells/powershellCore.ts
index 394bfbe9..b72e0725 100644
--- a/terminus-terminal/src/shells/powershellCore.ts
+++ b/terminus-terminal/src/shells/powershellCore.ts
@@ -6,7 +6,7 @@ import { Shell } from '../api/interfaces'
 /* eslint-disable block-scoped-var */
 
 try {
-    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires
+    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires, no-var
 } catch { }
 
 /** @hidden */
diff --git a/terminus-terminal/src/shells/wsl.ts b/terminus-terminal/src/shells/wsl.ts
index 53630cec..fa4d4107 100644
--- a/terminus-terminal/src/shells/wsl.ts
+++ b/terminus-terminal/src/shells/wsl.ts
@@ -11,13 +11,13 @@ import { isWindowsBuild, WIN_BUILD_WSL_EXE_DISTRO_FLAG } from '../utils'
 /* eslint-disable block-scoped-var */
 
 try {
-    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires
+    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires, no-var
 } catch { }
 
 // WSL Distribution List
 // https://docs.microsoft.com/en-us/windows/wsl/install-win10#install-your-linux-distribution-of-choice
 /* eslint-disable quote-props */
-var wslIconMap: { [key: string]: string } = {
+const wslIconMap: { [key: string]: string } = {
     'Alpine': require('../icons/alpine.svg'),
     'Debian': require('../icons/debian.svg'),
     'kali-linux': require('../icons/linux.svg'),