diff --git a/.eslintrc.js b/.eslintrc.js
index 282e5b7d2..0b5d280b4 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -68,6 +68,7 @@ module.exports = {
     "no-label-var": "error",
     "no-shadow-restricted-names": "error",
     "no-undef-init": "error",
+    "no-buffer-constructor": "error",
 
     // ----- Node.js and CommonJS -----
     "no-new-require": "error",
@@ -84,7 +85,7 @@ module.exports = {
     "eol-last": ["error", "always"],
     "func-call-spacing": ["error", "never"],
     "func-style": ["error", "declaration"],
-    "indent": ["error", 2, {
+    "indent-legacy": ["error", 2, {
       SwitchCase: 1,
       VariableDeclarator: 1,
       outerIIFEBody: 1,
@@ -98,7 +99,12 @@ module.exports = {
       mode: "minimum"
     }],
     "keyword-spacing": ["error", { before: true, after: true }],
-    "lines-around-directive": ["error", "always"],
+    "padding-line-between-statements": ["error",
+      { blankLine: "always", prev: "directive", next: "*" },
+      { blankLine: "any", prev: "directive", next: "directive" },
+      { blankLine: "always", prev: "*", next: "return" },
+      { blankLine: "any", prev: "block-like", next: "return" },
+    ],
     "max-len": ["error", {
       code: 100,
       ignoreComments: true,
diff --git a/bin/options.js b/bin/options.js
index 5fe7460d6..3dfd129e7 100644
--- a/bin/options.js
+++ b/bin/options.js
@@ -99,7 +99,6 @@ while (args.length > 0) {
   }
 
   switch (argument) {
-
     case "--":
       options["--"] = args;
       args = [];
diff --git a/package.json b/package.json
index 55c3b5c4a..0b9948467 100644
--- a/package.json
+++ b/package.json
@@ -72,8 +72,8 @@
     "express": "^4.16.2",
     "glob": "^7.1.2",
     "gulp": "^3.9.1",
-    "gulp-eslint": "^3.0.1",
-    "gulp-header": "^1.8.9",
+    "gulp-eslint": "^4.0.1",
+    "gulp-header": "1 - 2",
     "gulp-mocha": "^5.0.0",
     "gulp-rename": "^1.2.2",
     "gulp-transform": "^3.0.5",
@@ -81,7 +81,7 @@
     "morgan": "^1.9.0",
     "nyc": "^11.3.0",
     "run-sequence": "^2.2.0",
-    "sinon": "^4.1.3",
+    "sinon": "^4.1.4",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0"
   },