diff --git a/.eslintrc.js b/.eslintrc.js
index 748b27b..d44e921 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -16,7 +16,7 @@ module.exports = {
   },
   "plugins": [
     "promise",
-    "unsafe-property-assignment"
+    "no-unescaped"
   ],
   "root": true,
   "rules": {
@@ -29,8 +29,8 @@ module.exports = {
     "promise/no-promise-in-callback": "warn",
     "promise/no-return-wrap": "error",
     "promise/param-names": "error",
-    "unsafe-property-assignment/no-key-assignment": ["error"],
-    "unsafe-property-assignment/enforce-tagged-template-protection": ["error"],
+    "no-unescaped/no-key-assignment": "error",
+    "no-unescaped/enforce": "error",
 
     "eqeqeq": "error",
     "indent": ["error", 2],
diff --git a/package.json b/package.json
index d9eb4f5..33c1ab3 100644
--- a/package.json
+++ b/package.json
@@ -12,8 +12,8 @@
     "addons-linter": "^0.15.14",
     "deploy-txp": "^1.0.7",
     "eslint": "^3.17.1",
+    "eslint-plugin-no-unescaped": "^1.1.0",
     "eslint-plugin-promise": "^3.4.0",
-    "eslint-plugin-unsafe-property-assignment": "^1.0.2",
     "htmllint-cli": "^0.0.5",
     "jpm": "^1.2.2",
     "npm-run-all": "^4.0.0",
diff --git a/webextension/js/popup.js b/webextension/js/popup.js
index 23a6d66..7ed2b50 100644
--- a/webextension/js/popup.js
+++ b/webextension/js/popup.js
@@ -555,7 +555,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
     const colorRadioFieldset = document.getElementById("edit-container-panel-choose-color");
     colors.forEach((containerColor) => {
       const templateInstance = document.createElement("span");
-      // eslint-disable-next-line unsafe-property-assignment/enforce-tagged-template-protection
+      // eslint-disable-next-line no-unescaped/enforce
       templateInstance.innerHTML = colorRadioTemplate(containerColor);
       colorRadioFieldset.appendChild(templateInstance);
     });
@@ -568,7 +568,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
     const iconRadioFieldset = document.getElementById("edit-container-panel-choose-icon");
     icons.forEach((containerIcon) => {
       const templateInstance = document.createElement("span");
-      // eslint-disable-next-line unsafe-property-assignment/enforce-tagged-template-protection
+      // eslint-disable-next-line no-unescaped/enforce
       templateInstance.innerHTML = iconRadioTemplate(containerIcon);
       iconRadioFieldset.appendChild(templateInstance);
     });