diff --git a/.eslintrc.yml b/.eslintrc.yml
index 1055e084c9..c7ec5c228a 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -3,6 +3,52 @@ env:
   browser: true
   amd: true
 
+globals:
+  # New browser globals
+  DataView: readonly
+  MediaMetadata: readonly
+  Promise: readonly
+  # Deprecated browser globals
+  DocumentTouch: readonly
+  # Tizen globals
+  tizen: readonly
+  webapis: readonly
+  # WebOS globals
+  webOS: readonly
+  # Dependency globals
+  $: readonly
+  jQuery: readonly
+  queryString: readonly
+  requirejs: readonly
+  # Jellyfin globals
+  ApiClient: writable
+  AppInfo: writable
+  chrome: writable
+  ConnectionManager: writable
+  DlnaProfilePage: writable
+  Dashboard: writable
+  DashboardPage: writable
+  Emby: readonly
+  Events: writable
+  getParameterByName: writable
+  getWindowLocationSearch: writable
+  Globalize: writable
+  Hls: writable
+  humaneDate: writable
+  humaneElapsed: writable
+  LibraryMenu: writable
+  LinkParser: writable
+  LiveTvHelpers: writable
+  MetadataEditor: writable
+  pageClassOn: writable
+  pageIdOn: writable
+  PlaylistViewer: writable
+  UserParentalControlPage: writable
+  Windows: readonly
+
+extends:
+  - eslint:recommended
+
 rules:
   block-spacing: ["error"]
   brace-style: ["error"]
@@ -11,17 +57,13 @@ rules:
   eol-last: ["error"]
   indent: ["error", 4, { "SwitchCase": 1 }]
   keyword-spacing: ["error"]
-  line-comment-position: ["off"]
   max-statements-per-line: ["error"]
-  no-empty: ["error"]
-  no-extra-semi: ["error"]
   no-floating-decimal: ["error"]
   no-multi-spaces: ["error"]
   no-multiple-empty-lines: ["error", { "max": 1 }]
+  no-redeclare: ["warn"]
   no-trailing-spaces: ["error"]
-  no-void: ["off"]
+  no-unused-vars: ["warn"]
+  no-useless-escape: ["warn"]
   one-var: ["error", "never"]
-  padding-line-between-statements: ["off"]
-  semi: ["off"]
   space-before-blocks: ["error"]
-  yoda: ["off"]
diff --git a/src/components/htmlvideoplayer/plugin.js b/src/components/htmlvideoplayer/plugin.js
index 6760e1dd99..c72afb382f 100644
--- a/src/components/htmlvideoplayer/plugin.js
+++ b/src/components/htmlvideoplayer/plugin.js
@@ -357,6 +357,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
             return new Promise(function (resolve, reject) {
 
                 require(['shaka'], function () {
+                    /* globals shaka */
 
                     var player = new shaka.Player(elem);
 
diff --git a/src/components/polyfills/focusPreventScroll.js b/src/components/polyfills/focusPreventScroll.js
index 8c8da94244..6df9e9928c 100644
--- a/src/components/polyfills/focusPreventScroll.js
+++ b/src/components/polyfills/focusPreventScroll.js
@@ -12,6 +12,7 @@ if (HTMLElement.prototype.nativeFocus === undefined) {
             }, true);
 
             var opts = Object.defineProperty({}, "preventScroll", {
+                // eslint-disable-next-line getter-return
                 get: function () {
                     supportsPreventScrollOption = true;
                 }
diff --git a/src/components/polyfills/objectassign.js b/src/components/polyfills/objectassign.js
index bf8d7118a5..85f55aa144 100644
--- a/src/components/polyfills/objectassign.js
+++ b/src/components/polyfills/objectassign.js
@@ -11,6 +11,7 @@ if (typeof Object.assign != 'function') {
                 var source = arguments[index];
                 if (source !== undefined && source !== null) {
                     for (var nextKey in source) {
+                        // eslint-disable-next-line no-prototype-builtins
                         if (source.hasOwnProperty(nextKey)) {
                             output[nextKey] = source[nextKey];
                         }
diff --git a/src/components/serviceworker/notifications.js b/src/components/serviceworker/notifications.js
index dbb0844045..33f54bb64d 100644
--- a/src/components/serviceworker/notifications.js
+++ b/src/components/serviceworker/notifications.js
@@ -1,3 +1,4 @@
+/* eslint-env serviceworker */
 (function () {
     'use strict';
 
diff --git a/src/components/skinManager.js b/src/components/skinManager.js
index b38ff25791..b81e7c3a40 100644
--- a/src/components/skinManager.js
+++ b/src/components/skinManager.js
@@ -162,6 +162,7 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr
     function playSound(path, volume) {
         lastSound = new Date().getTime();
         require(['howler'], function (howler) {
+            /* globals Howl */
             try {
                 var sound = new Howl({
                     src: [path],
diff --git a/src/components/youtubeplayer/plugin.js b/src/components/youtubeplayer/plugin.js
index df04fb850e..fd9c05292e 100644
--- a/src/components/youtubeplayer/plugin.js
+++ b/src/components/youtubeplayer/plugin.js
@@ -1,5 +1,6 @@
 define(['require', 'events', 'browser', 'appRouter', 'loading'], function (require, events, browser, appRouter, loading) {
     "use strict";
+    /* globals YT */
 
     function zoomIn(elem, iterations) {
         var keyframes = [
diff --git a/src/serviceworker.js b/src/serviceworker.js
index 49c3767691..c43d1f4b4e 100644
--- a/src/serviceworker.js
+++ b/src/serviceworker.js
@@ -1 +1,2 @@
+/* eslint-env serviceworker */
 importScripts("components/serviceworker/notifications.js");