diff --git a/.eslintrc.js b/.eslintrc.js
index a0f4374..2ff94f1 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -11,15 +11,28 @@ module.exports = {
 	rules: {
 		'indent': ['error', 'tab', {
 			'SwitchCase': 1,
+			'MemberExpression': 'off',
 			'flatTernaryExpressions': true,
+			'ArrayExpression': 'first',
+			'ObjectExpression': 'first',
 		}],
 		'eol-last': ['error', 'always'],
 		'semi': ['error', 'always'],
 		'quotes': ['error', 'single'],
+		'comma-dangle': ['error', 'always-multiline'],
 		'keyword-spacing': ['error', {
 			'before': true,
 			'after': true,
 		}],
+		'key-spacing': ['error', {
+			'beforeColon': false,
+			'afterColon': true,
+		}],
+		'space-infix-ops': ['error'],
+		'space-before-blocks': ['error', 'always'],
+		'object-curly-spacing': ['error', 'always'],
+		'nonblock-statement-body-position': ['error', 'beside'],
+		'no-multiple-empty-lines': ['error', { 'max': 1 }],
 		'no-multi-spaces': ['error'],
 		'no-var': ['error'],
 		'prefer-arrow-callback': ['error'],
@@ -27,6 +40,12 @@ module.exports = {
 		'no-param-reassign': ['warn'],
 		'no-constant-condition': ['warn'],
 		'no-empty-pattern': ['warn'],
+		'@typescript-eslint/no-unnecessary-condition': ['error'],
 		'@typescript-eslint/no-inferrable-types': ['warn'],
+		'@typescript-eslint/no-non-null-assertion': ['warn'],
+		'@typescript-eslint/explicit-function-return-type': ['warn'],
+		'@typescript-eslint/no-misused-promises': ['error', {
+			'checksVoidReturn': false,
+		}],
 	},
 };