diff --git a/.eslintrc.json b/.eslintrc.json
index a63980e7..00fae289 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -10,6 +10,7 @@
 		"config": true,
 		"Log": true,
 		"MM": true,
+		"Module": true,
 		"moment": true
 	},
 	"parserOptions": {
diff --git a/js/loader.js b/js/loader.js
index 7199fe88..c69f92ae 100644
--- a/js/loader.js
+++ b/js/loader.js
@@ -1,4 +1,4 @@
-/* global defaultModules, Module, vendor */
+/* global defaultModules, vendor */
 
 /* Magic Mirror
  * Module and File loaders.
diff --git a/js/main.js b/js/main.js
index 271a3be7..117aed10 100644
--- a/js/main.js
+++ b/js/main.js
@@ -1,4 +1,4 @@
-/* global Loader, Module, defaults, Translator */
+/* global Loader, defaults, Translator */
 
 /* Magic Mirror
  * Main System
diff --git a/modules/default/alert/alert.js b/modules/default/alert/alert.js
index 3ec8c8f7..66b88601 100644
--- a/modules/default/alert/alert.js
+++ b/modules/default/alert/alert.js
@@ -1,4 +1,4 @@
-/* global Module, NotificationFx */
+/* global NotificationFx */
 
 /* Magic Mirror
  * Module: alert
diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js
index 0f042051..24a2c45d 100755
--- a/modules/default/calendar/calendar.js
+++ b/modules/default/calendar/calendar.js
@@ -1,4 +1,4 @@
-/* global cloneObject, Module */
+/* global cloneObject */
 
 /* Magic Mirror
  * Module: Calendar
diff --git a/modules/default/clock/clock.js b/modules/default/clock/clock.js
index 6c4e2ff6..1b9a2a12 100644
--- a/modules/default/clock/clock.js
+++ b/modules/default/clock/clock.js
@@ -1,4 +1,4 @@
-/* global Module, SunCalc */
+/* global SunCalc */
 
 /* Magic Mirror
  * Module: Clock
diff --git a/modules/default/compliments/compliments.js b/modules/default/compliments/compliments.js
index 5b79c09a..ff245eef 100644
--- a/modules/default/compliments/compliments.js
+++ b/modules/default/compliments/compliments.js
@@ -1,5 +1,3 @@
-/* global Module */
-
 /* Magic Mirror
  * Module: Compliments
  *
diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js
index b49b8e8b..d24a92b4 100644
--- a/modules/default/currentweather/currentweather.js
+++ b/modules/default/currentweather/currentweather.js
@@ -1,5 +1,3 @@
-/* global Module */
-
 /* Magic Mirror
  * Module: CurrentWeather
  *
diff --git a/modules/default/helloworld/helloworld.js b/modules/default/helloworld/helloworld.js
index 3d1c17e7..72474577 100644
--- a/modules/default/helloworld/helloworld.js
+++ b/modules/default/helloworld/helloworld.js
@@ -1,5 +1,3 @@
-/* global Module */
-
 /* Magic Mirror
  * Module: HelloWorld
  *
diff --git a/modules/default/newsfeed/newsfeed.js b/modules/default/newsfeed/newsfeed.js
index 5926c712..edbac68d 100644
--- a/modules/default/newsfeed/newsfeed.js
+++ b/modules/default/newsfeed/newsfeed.js
@@ -1,5 +1,3 @@
-/* global Module */
-
 /* Magic Mirror
  * Module: NewsFeed
  *
diff --git a/modules/default/updatenotification/updatenotification.js b/modules/default/updatenotification/updatenotification.js
index c720ae3d..0c4e2ad9 100644
--- a/modules/default/updatenotification/updatenotification.js
+++ b/modules/default/updatenotification/updatenotification.js
@@ -1,5 +1,3 @@
-/* global Module */
-
 /* Magic Mirror
  * Module: UpdateNotification
  *
diff --git a/modules/default/weather/providers/darksky.js b/modules/default/weather/providers/darksky.js
index 9dbe49b4..ea36da28 100755
--- a/modules/default/weather/providers/darksky.js
+++ b/modules/default/weather/providers/darksky.js
@@ -1,4 +1,4 @@
-/* global WeatherProvider */
+/* global WeatherProvider, WeatherObject */
 
 /* Magic Mirror
  * Module: Weather
diff --git a/modules/default/weather/providers/ukmetoffice.js b/modules/default/weather/providers/ukmetoffice.js
index d7aa9886..17cc463e 100755
--- a/modules/default/weather/providers/ukmetoffice.js
+++ b/modules/default/weather/providers/ukmetoffice.js
@@ -1,4 +1,4 @@
-/* global WeatherProvider, WeatherObject */
+/* global WeatherProvider, WeatherObject, SunCalc */
 
 /* Magic Mirror
  * Module: Weather
diff --git a/modules/default/weather/providers/weathergov.js b/modules/default/weather/providers/weathergov.js
index 568e2f47..68211b56 100755
--- a/modules/default/weather/providers/weathergov.js
+++ b/modules/default/weather/providers/weathergov.js
@@ -1,4 +1,4 @@
-/* global WeatherProvider, WeatherObject */
+/* global WeatherProvider, WeatherObject, SunCalc */
 
 /* Magic Mirror
  * Module: Weather
diff --git a/modules/default/weather/weather.js b/modules/default/weather/weather.js
index a28b7ab5..6e277447 100644
--- a/modules/default/weather/weather.js
+++ b/modules/default/weather/weather.js
@@ -1,4 +1,4 @@
-/* global Module, WeatherProvider */
+/* global WeatherProvider */
 
 /* Magic Mirror
  * Module: Weather
diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js
index 7624e671..8df266a0 100644
--- a/modules/default/weatherforecast/weatherforecast.js
+++ b/modules/default/weatherforecast/weatherforecast.js
@@ -1,5 +1,3 @@
-/* global Module */
-
 /* Magic Mirror
  * Module: WeatherForecast
  *