diff --git a/CHANGELOG.md b/CHANGELOG.md
index da647e27..2ae6ef2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Cleaned up alert module code
 - Cleaned up check_config code
 - Replaced grunt-based linters with their non-grunt equivalents
+- Switch to most of the eslint:recommended rules and fix warnings 
 
 ### Deleted
 - Removed truetype (ttf) fonts
diff --git a/js/loader.js b/js/loader.js
index 6db46ad5..e29ad3a0 100644
--- a/js/loader.js
+++ b/js/loader.js
@@ -1,11 +1,11 @@
 /* global config, vendor, MM, Log, Module */
+
 /* Magic Mirror
  * Module and File loaders.
  *
  * By Michael Teeuw http://michaelteeuw.nl
  * MIT Licensed.
  */
-
 var Loader = (function() {
 
 	/* Create helper variables */
diff --git a/js/main.js b/js/main.js
index 7801ae3c..41976568 100644
--- a/js/main.js
+++ b/js/main.js
@@ -1,4 +1,4 @@
-/* global  Log, Loader, Module, config, defaults */
+/* global Log, Loader, Module, config, defaults */
 
 /* Magic Mirror
  * Main System
@@ -6,7 +6,6 @@
  * By Michael Teeuw http://michaelteeuw.nl
  * MIT Licensed.
  */
-
 var MM = (function() {
 
 	var modules = [];
diff --git a/modules/default/alert/alert.js b/modules/default/alert/alert.js
index cbfa2dcd..7fce85cd 100644
--- a/modules/default/alert/alert.js
+++ b/modules/default/alert/alert.js
@@ -6,7 +6,6 @@
  * By Paul-Vincent Roll http://paulvincentroll.com
  * MIT Licensed.
  */
-
 Module.register("alert",{
 	defaults: {
 		// scale|slide|genie|jelly|flip|bouncyflip|exploader
diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js
index 06f6c2f3..1d30a78a 100755
--- a/modules/default/calendar/calendar.js
+++ b/modules/default/calendar/calendar.js
@@ -6,7 +6,6 @@
  * By Michael Teeuw http://michaelteeuw.nl
  * MIT Licensed.
  */
-
 Module.register("calendar", {
 
 	// Define module defaults
diff --git a/modules/default/clock/clock.js b/modules/default/clock/clock.js
index 4db7febb..faed4950 100644
--- a/modules/default/clock/clock.js
+++ b/modules/default/clock/clock.js
@@ -1,4 +1,5 @@
 /* global Log, Module, moment, config */
+
 /* Magic Mirror
  * Module: Clock
  *
diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js
index ff14b47b..bc04ebcd 100644
--- a/modules/default/currentweather/currentweather.js
+++ b/modules/default/currentweather/currentweather.js
@@ -6,7 +6,6 @@
  * By Michael Teeuw http://michaelteeuw.nl
  * MIT Licensed.
  */
-
 Module.register("currentweather",{
 
 	// Default module config.
diff --git a/modules/default/helloworld/helloworld.js b/modules/default/helloworld/helloworld.js
index cf6cebfa..63640f70 100644
--- a/modules/default/helloworld/helloworld.js
+++ b/modules/default/helloworld/helloworld.js
@@ -6,7 +6,6 @@
  * By Michael Teeuw http://michaelteeuw.nl
  * MIT Licensed.
  */
-
 Module.register("helloworld",{
 
 	// Default module config.
diff --git a/modules/default/newsfeed/newsfeed.js b/modules/default/newsfeed/newsfeed.js
index 31dbec4b..ca219c7f 100644
--- a/modules/default/newsfeed/newsfeed.js
+++ b/modules/default/newsfeed/newsfeed.js
@@ -6,7 +6,6 @@
  * By Michael Teeuw http://michaelteeuw.nl
  * MIT Licensed.
  */
-
 Module.register("newsfeed",{
 
 	// Default module config.
diff --git a/modules/default/weather/providers/openweathermap.js b/modules/default/weather/providers/openweathermap.js
index 4f3569fd..849e1dd1 100755
--- a/modules/default/weather/providers/openweathermap.js
+++ b/modules/default/weather/providers/openweathermap.js
@@ -8,7 +8,6 @@
  *
  * This class is the blueprint for a weather provider.
  */
-
 WeatherProvider.register("openweathermap", {
 
 	// Set the name of the provider.
diff --git a/modules/default/weather/providers/ukmetoffice.js b/modules/default/weather/providers/ukmetoffice.js
index dc617dd0..54ebed16 100755
--- a/modules/default/weather/providers/ukmetoffice.js
+++ b/modules/default/weather/providers/ukmetoffice.js
@@ -8,7 +8,6 @@
  *
  * This class is a provider for UK Met Office Datapoint.
  */
-
 WeatherProvider.register("ukmetoffice", {
 
 	// Set the name of the provider.
diff --git a/modules/default/weather/providers/weathergov.js b/modules/default/weather/providers/weathergov.js
index 1d030d32..568e2f47 100755
--- a/modules/default/weather/providers/weathergov.js
+++ b/modules/default/weather/providers/weathergov.js
@@ -11,7 +11,6 @@
  * Note that this is only for US locations (lat and lon) and does not require an API key
  * Since it is free, there are some items missing - like sunrise, sunset, humidity, etc.
  */
-
 WeatherProvider.register("weathergov", {
 
 	// Set the name of the provider.
diff --git a/modules/default/weather/weather.js b/modules/default/weather/weather.js
index 8f5568b4..0a1b941e 100644
--- a/modules/default/weather/weather.js
+++ b/modules/default/weather/weather.js
@@ -6,7 +6,6 @@
  * By Michael Teeuw http://michaelteeuw.nl
  * MIT Licensed.
  */
-
 Module.register("weather",{
 	// Default module config.
 	defaults: {
diff --git a/modules/default/weather/weatherobject.js b/modules/default/weather/weatherobject.js
index 60311424..e0b11695 100755
--- a/modules/default/weather/weatherobject.js
+++ b/modules/default/weather/weatherobject.js
@@ -7,11 +7,10 @@
  * MIT Licensed.
  *
  * This class is the blueprint for a day which includes weather information.
+ *
+ * Currently this is focused on the information which is necessary for the current weather.
+ * As soon as we start implementing the forecast, mode properties will be added.
  */
-
-// Currently this is focused on the information which is necessary for the current weather.
-// As soon as we start implementing the forecast, mode properties will be added.
-
 class WeatherObject {
 	constructor(units, tempUnits, windUnits) {
 
diff --git a/modules/default/weather/weatherprovider.js b/modules/default/weather/weatherprovider.js
index 1789b95c..8fa73d3b 100644
--- a/modules/default/weather/weatherprovider.js
+++ b/modules/default/weather/weatherprovider.js
@@ -8,10 +8,6 @@
  *
  * This class is the blueprint for a weather provider.
  */
-
-/**
- * Base BluePrint for the WeatherProvider
- */
 var WeatherProvider = Class.extend({
 	// Weather Provider Properties
 	providerName: null,
diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js
index e6f54b14..e496771a 100644
--- a/modules/default/weatherforecast/weatherforecast.js
+++ b/modules/default/weatherforecast/weatherforecast.js
@@ -6,7 +6,6 @@
  * By Michael Teeuw http://michaelteeuw.nl
  * MIT Licensed.
  */
-
 Module.register("weatherforecast",{
 
 	// Default module config.