diff --git a/core/file-guard.js b/core/file-guard.js
index 3ac1245e..1b535cf9 100644
--- a/core/file-guard.js
+++ b/core/file-guard.js
@@ -21,7 +21,7 @@
  * File Guard
  */
 
-var fileGuard = {};
+let fileGuard = {};
 
 
 /**
diff --git a/core/interceptor.js b/core/interceptor.js
index feb07d6e..dd3d71c9 100644
--- a/core/interceptor.js
+++ b/core/interceptor.js
@@ -23,7 +23,7 @@
  * Interceptor
  */
 
-var interceptor = {};
+let interceptor = {};
 
 
 /**
diff --git a/core/main.js b/core/main.js
index 0b83382c..ac4f61f8 100644
--- a/core/main.js
+++ b/core/main.js
@@ -23,7 +23,7 @@
  * Main
  */
 
-var main = {};
+let main = {};
 
 
 /**
diff --git a/core/manipulate-dom.js b/core/manipulate-dom.js
index 86999f63..5e8dba8f 100644
--- a/core/manipulate-dom.js
+++ b/core/manipulate-dom.js
@@ -19,7 +19,7 @@
  * Manipulate DOM
  */
 
-var manipulateDOM = {};
+let manipulateDOM = {};
 
 
 /**
diff --git a/core/mappings.js b/core/mappings.js
index a8fa639a..a7205c6e 100644
--- a/core/mappings.js
+++ b/core/mappings.js
@@ -23,7 +23,7 @@
  * Mappings
  */
 
-var mappings = {};
+let mappings = {};
 
 /*
  * Date of last update.
diff --git a/core/messenger.js b/core/messenger.js
index 39c0380b..582aefa7 100644
--- a/core/messenger.js
+++ b/core/messenger.js
@@ -23,7 +23,7 @@
  * Messenger
  */
 
-var messenger = {};
+let messenger = {};
 
 
 /**
diff --git a/core/request-analyzer.js b/core/request-analyzer.js
index 32e2e3ec..3d575d57 100644
--- a/core/request-analyzer.js
+++ b/core/request-analyzer.js
@@ -23,7 +23,7 @@
  * Request Analyzer
  */
 
-var requestAnalyzer = {};
+let requestAnalyzer = {};
 
 
 /**
diff --git a/core/request-sanitizer.js b/core/request-sanitizer.js
index 6a447a01..0524a68a 100644
--- a/core/request-sanitizer.js
+++ b/core/request-sanitizer.js
@@ -18,7 +18,7 @@
  * Request Sanitizer
  */
 
-var requestSanitizer = {};
+let requestSanitizer = {};
 
 
 /**
diff --git a/core/resources.js b/core/resources.js
index 7f442120..90398e8c 100644
--- a/core/resources.js
+++ b/core/resources.js
@@ -23,7 +23,7 @@
  * Resources
  */
 
-var resources = {
+let resources = {
 
     // Ajax Bootstrap Select
     'ajaxBootstrapSelect': {
diff --git a/core/shorthands.js b/core/shorthands.js
index f9b242f3..8975d903 100644
--- a/core/shorthands.js
+++ b/core/shorthands.js
@@ -23,7 +23,7 @@
  * Shorthands
  */
 
-var shorthands = {};
+let shorthands = {};
 
 shorthands.specialFiles = function (channelHost, channelPath, searchString) {
 
diff --git a/core/state-manager.js b/core/state-manager.js
index 745ae8e1..74aa18ce 100644
--- a/core/state-manager.js
+++ b/core/state-manager.js
@@ -23,7 +23,7 @@
  * State Manager
  */
 
-var stateManager = {};
+let stateManager = {};
 
 
 /**
diff --git a/core/storage-manager.js b/core/storage-manager.js
index 2c55ef39..44e9ec27 100644
--- a/core/storage-manager.js
+++ b/core/storage-manager.js
@@ -26,7 +26,7 @@ const InvalidFile = 'Invalid file!';
  * Storage Manager
  */
 
-var storageManager = {};
+let storageManager = {};
 
 
 /**
diff --git a/modules/internal/helpers.js b/modules/internal/helpers.js
index b5938537..65c6fdee 100644
--- a/modules/internal/helpers.js
+++ b/modules/internal/helpers.js
@@ -23,7 +23,7 @@
  * Helpers
  */
 
-var helpers = {};
+let helpers = {};
 
 
 /**
diff --git a/modules/internal/log.js b/modules/internal/log.js
index d821f54e..6fd3da48 100644
--- a/modules/internal/log.js
+++ b/modules/internal/log.js
@@ -19,7 +19,7 @@
  * Log
  */
 
-var log = {};
+let log = {};
 
 log.append = function (initiator, resource, target, highlight, iframe = '') {
     storageManager.type.get(Setting.LOGGING, function (items) {
diff --git a/modules/internal/rule-generator.js b/modules/internal/rule-generator.js
index f9f3705c..e7f14eed 100644
--- a/modules/internal/rule-generator.js
+++ b/modules/internal/rule-generator.js
@@ -19,7 +19,7 @@
  * Updates
  */
 
-var ruleGenerator = {};
+let ruleGenerator = {};
 
 
 /**
diff --git a/modules/internal/stats.js b/modules/internal/stats.js
index bf07f65f..3da95e9f 100644
--- a/modules/internal/stats.js
+++ b/modules/internal/stats.js
@@ -20,7 +20,7 @@
  * Stats
  */
 
-var stats = {};
+let stats = {};
 
 
 /**
diff --git a/modules/internal/targets.js b/modules/internal/targets.js
index c0725b8e..e0a8ba65 100644
--- a/modules/internal/targets.js
+++ b/modules/internal/targets.js
@@ -19,7 +19,7 @@
  * Targets
  */
 
-var targets = {};
+let targets = {};
 
 
 /**
diff --git a/modules/internal/wrappers.js b/modules/internal/wrappers.js
index 2b422f42..4ad4e6d0 100644
--- a/modules/internal/wrappers.js
+++ b/modules/internal/wrappers.js
@@ -22,7 +22,7 @@
  * Wrappers
  */
 
-var wrappers = {};
+let wrappers = {};
 
 
 /**