diff --git a/.eslintrc.json b/.eslintrc.json
index 877c66e86..04f9da7ac 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,11 +1,6 @@
 {
 	"root": true,
 	"extends": [
-		"wikimedia/client-es5",
-		"wikimedia/jquery",
-		"wikimedia/mediawiki"
-	],
-	"rules": {
-		"max-len": "off"
-	}
+		"wikimedia/server"
+	]
 }
diff --git a/Gruntfile.js b/Gruntfile.js
index 37b880a1a..f20874d0e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -4,10 +4,10 @@
  * @package Cite
  */
 
-/* eslint-env node, es6 */
+'use strict';
 
 module.exports = function ( grunt ) {
-	var conf = grunt.file.readJSON( 'extension.json' );
+	const conf = grunt.file.readJSON( 'extension.json' );
 
 	grunt.loadNpmTasks( 'grunt-banana-checker' );
 	grunt.loadNpmTasks( 'grunt-eslint' );
diff --git a/modules/.eslintrc.json b/modules/.eslintrc.json
new file mode 100644
index 000000000..877c66e86
--- /dev/null
+++ b/modules/.eslintrc.json
@@ -0,0 +1,11 @@
+{
+	"root": true,
+	"extends": [
+		"wikimedia/client-es5",
+		"wikimedia/jquery",
+		"wikimedia/mediawiki"
+	],
+	"rules": {
+		"max-len": "off"
+	}
+}
diff --git a/modules/ve-cite/ve.ce.MWReferenceNode.js b/modules/ve-cite/ve.ce.MWReferenceNode.js
index d0fdfe010..6ad144503 100644
--- a/modules/ve-cite/ve.ce.MWReferenceNode.js
+++ b/modules/ve-cite/ve.ce.MWReferenceNode.js
@@ -10,7 +10,7 @@
  *
  * @class
  * @extends ve.ce.LeafNode
- * @mixins ve.ce.FocusableNode
+ * @mixin ve.ce.FocusableNode
  *
  * @constructor
  * @param {ve.dm.MWReferenceNode} model Model to observe
diff --git a/modules/ve-cite/ve.ce.MWReferencesListNode.js b/modules/ve-cite/ve.ce.MWReferencesListNode.js
index 29448a92a..c1574e317 100644
--- a/modules/ve-cite/ve.ce.MWReferencesListNode.js
+++ b/modules/ve-cite/ve.ce.MWReferencesListNode.js
@@ -10,7 +10,7 @@
  *
  * @class
  * @extends ve.ce.LeafNode
- * @mixins ve.ce.FocusableNode
+ * @mixin ve.ce.FocusableNode
  *
  * @constructor
  * @param {ve.dm.MWReferencesListNode} model Model to observe
diff --git a/modules/ve-cite/ve.dm.MWReferenceModel.js b/modules/ve-cite/ve.dm.MWReferenceModel.js
index eb3d1f1c9..43d69da41 100644
--- a/modules/ve-cite/ve.dm.MWReferenceModel.js
+++ b/modules/ve-cite/ve.dm.MWReferenceModel.js
@@ -9,7 +9,7 @@
  * MediaWiki reference model.
  *
  * @class
- * @mixins OO.EventEmitter
+ * @mixin OO.EventEmitter
  *
  * @constructor
  * @param {ve.dm.Document} parentDoc Document that contains or will contain the reference
diff --git a/modules/ve-cite/ve.dm.MWReferenceNode.js b/modules/ve-cite/ve.dm.MWReferenceNode.js
index 0619f30e3..c5d516e83 100644
--- a/modules/ve-cite/ve.dm.MWReferenceNode.js
+++ b/modules/ve-cite/ve.dm.MWReferenceNode.js
@@ -10,7 +10,7 @@
  *
  * @class
  * @extends ve.dm.LeafNode
- * @mixins ve.dm.FocusableNode
+ * @mixin ve.dm.FocusableNode
  *
  * @constructor
  * @param {Object} [element] Reference to element in linear model
diff --git a/modules/ve-cite/ve.dm.MWReferencesListNode.js b/modules/ve-cite/ve.dm.MWReferencesListNode.js
index c06588d8d..910a67f48 100644
--- a/modules/ve-cite/ve.dm.MWReferencesListNode.js
+++ b/modules/ve-cite/ve.dm.MWReferencesListNode.js
@@ -10,7 +10,7 @@
  *
  * @class
  * @extends ve.dm.BranchNode
- * @mixins ve.dm.FocusableNode
+ * @mixin ve.dm.FocusableNode
  *
  * @constructor
  * @param {Object} [element] Reference to element in linear model