diff --git a/.eslintignore b/.eslintignore
index c0fa65d0..82635f43 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,4 @@
 node_modules/
-bower_components/
 build/
 dist/
 images/
diff --git a/.eslintrc b/.eslintrc
deleted file mode 100644
index fb4a2cdf..00000000
--- a/.eslintrc
+++ /dev/null
@@ -1,17 +0,0 @@
----
-#
-# 0 - disable
-#     Rules that more harmful than useful, or just buggy.
-#
-# 1 - warning
-#     Rules that we didn't encounter yet. You can safely ignore them,
-#     but I'd like to know any interesting use-cases they forbid.
-#
-# 2 - error
-#     Rules that have proven to be useful, please follow them.
-
-
-# https://github.com/Availity/eslint-config-availity
-extends: eslint-config-availity
-rules:
-  strict: 0
diff --git a/.eslintrc.yml b/.eslintrc.yml
new file mode 100644
index 00000000..1e7d531e
--- /dev/null
+++ b/.eslintrc.yml
@@ -0,0 +1 @@
+extends: availity
diff --git a/js/.eslintrc b/js/.eslintrc
deleted file mode 100644
index 7556a3b9..00000000
--- a/js/.eslintrc
+++ /dev/null
@@ -1,2 +0,0 @@
-# https://github.com/Availity/eslint-config-availity/browser
-extends: eslint-config-availity/browser
diff --git a/package.json b/package.json
index a624d1d7..4dd83627 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "docs:publish": "npm run clean && npm run docs:pages && gh-pages -d build",
     "preversion": "npm run lint",
     "prepublishOnly": "npm run build",
-    "lint": "node cli.js lint"
+    "lint": "eslint ."
   },
   "license": "MIT",
   "main": "./lib/index.js",
@@ -67,7 +67,7 @@
     "availity-workflow-logger": "^2.0.0",
     "babel-cli": "^6.24.1",
     "babel-core": "^6.24.1",
-    "babel-eslint": "^7.2.3",
+    "babel-eslint": "^8.0.1",
     "babel-loader": "^7.0.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-object-assign": "^6.8.0",
@@ -89,9 +89,14 @@
     "dateformat": "2.0.0",
     "debounce-collect": "1.0.2",
     "del": "2.2.2",
-    "eslint": "^3.19.0",
-    "eslint-config-availity": "^2.1.0",
-    "eslint-plugin-react": "^7.0.1",
+    "eslint": "^4.9.0",
+    "eslint-config-airbnb": "^16.1.0",
+    "eslint-config-airbnb-base": "^12.1.0",
+    "eslint-config-availity": "^3.0.0-beta.8",
+    "eslint-plugin-import": "^2.8.0",
+    "eslint-plugin-jsx-a11y": "^6.0.2",
+    "eslint-plugin-promise": "^3.6.0",
+    "eslint-plugin-react": "^7.4.0",
     "expose-loader": "^0.7.3",
     "extract-text-webpack-plugin": "^2.1.0",
     "file-loader": "^0.11.1",