diff --git a/install/package.json b/install/package.json
index 4636db27cb..176eac5636 100644
--- a/install/package.json
+++ b/install/package.json
@@ -135,7 +135,7 @@
         "@commitlint/cli": "8.0.0",
         "@commitlint/config-angular": "8.0.0",
         "coveralls": "3.0.4",
-        "eslint": "5.16.0",
+        "eslint": "6.0.0",
         "eslint-config-airbnb-base": "13.1.0",
         "eslint-plugin-import": "2.17.3",
         "grunt": "1.0.4",
diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index 1b902390ed..ae44c1eae5 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-var ajaxify = window.ajaxify || {};
+ajaxify = window.ajaxify || {};
 
 $(document).ready(function () {
 	var location = document.location || window.location;
diff --git a/public/src/app.js b/public/src/app.js
index 5c83eebfdf..749a64aaf5 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-var app = window.app || {};
+app = window.app || {};
 
 app.isFocused = true;
 app.currentRoom = null;
diff --git a/public/src/client/flags/detail.js b/public/src/client/flags/detail.js
index 7b8691f37d..40ee9c4fe2 100644
--- a/public/src/client/flags/detail.js
+++ b/public/src/client/flags/detail.js
@@ -1,7 +1,5 @@
 'use strict';
 
-/* globals define */
-
 define('forum/flags/detail', ['forum/flags/list', 'components', 'translator', 'benchpress'], function (FlagsList, components, translator, Benchpress) {
 	var Flags = {};
 
diff --git a/public/src/client/flags/list.js b/public/src/client/flags/list.js
index 0806195ac4..16a5535e7d 100644
--- a/public/src/client/flags/list.js
+++ b/public/src/client/flags/list.js
@@ -1,7 +1,5 @@
 'use strict';
 
-/* globals define */
-
 define('forum/flags/list', ['components', 'Chart'], function (components, Chart) {
 	var Flags = {};
 
diff --git a/public/src/client/recent.js b/public/src/client/recent.js
index 35f886c582..cca931e194 100644
--- a/public/src/client/recent.js
+++ b/public/src/client/recent.js
@@ -7,6 +7,8 @@ define('forum/recent', ['topicList'], function (topicList) {
 		app.enterRoom('recent_topics');
 
 		topicList.init('recent');
+		$('#new_topic').removeAttr('data-toggle');
+		$('#new_topic span.caret').remove();
 	};
 
 	return Recent;
diff --git a/public/src/overrides.js b/public/src/overrides.js
index 33376ccad3..84f6bbb393 100644
--- a/public/src/overrides.js
+++ b/public/src/overrides.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-var overrides = window.overrides || {};
+overrides = window.overrides || {};
 
 if (typeof window !== 'undefined') {
 	(function ($) {
diff --git a/public/src/sockets.js b/public/src/sockets.js
index 41bc0ba4c7..1c0ab6cf6d 100644
--- a/public/src/sockets.js
+++ b/public/src/sockets.js
@@ -1,8 +1,8 @@
 'use strict';
 
 
-var app = window.app || {};
-var socket;
+app = window.app || {};
+socket = window.socket;
 app.isConnected = false;
 
 (function () {
diff --git a/test/blacklist.js b/test/blacklist.js
index d6ccb23260..d03aad341f 100644
--- a/test/blacklist.js
+++ b/test/blacklist.js
@@ -1,8 +1,5 @@
 'use strict';
 
-/* global require, after, before */
-
-
 var async = require('async');
 var assert = require('assert');
 
diff --git a/test/flags.js b/test/flags.js
index 4dbf43c495..a7996b9933 100644
--- a/test/flags.js
+++ b/test/flags.js
@@ -1,7 +1,5 @@
 'use strict';
 
-/* globals require, before, after, describe, it */
-
 var assert = require('assert');
 var async = require('async');