diff --git a/src/apps.json b/src/apps.json
index 7ceeb4794..7db607242 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -6784,6 +6784,18 @@
       },
       "website": "http://max-3000.com"
     },
+    "Maxemail": {
+      "cats": [
+        32
+      ],
+      "icon": "Maxemail.svg",
+      "js": {
+        "Mxm.Basket": "",
+        "Mxm.FormHandler": "",
+        "Mxm.Tracker": ""
+      },
+      "website": "https://maxemail.xtremepush.com"
+    },
     "MediaElement.js": {
       "cats": [
         14
@@ -10573,12 +10585,12 @@
       "cats": [
         4
       ],
-      "html": "Created using <a href=\"https?://sphinx-doc\\.org/\">Sphinx</a> ([0-9.]+)\\.\\;version:\\1",
+      "html": "Created using <a href=\"https?://(?:www\\.)?sphinx-doc\\.org/\">Sphinx</a> ([0-9.]+)\\.\\;version:\\1",
       "icon": "Sphinx.png",
       "js": {
         "DOCUMENTATION_OPTIONS": ""
       },
-      "website": "http://sphinx.pocoo.org"
+      "website": "https://www.sphinx-doc.org/"
     },
     "SpinCMS": {
       "cats": [
@@ -12764,6 +12776,16 @@
       },
       "website": "http://www.xpressengine.com/"
     },
+    "Xtremepush": {
+      "cats": [
+        32
+      ],
+      "icon": "Xtremepush.svg",
+      "js": {
+        "xtremepush": ""
+      },
+      "website": "https://xtremepush.com"
+    },
     "YUI": {
       "cats": [
         59
diff --git a/src/drivers/webextension/images/icons/Maxemail.svg b/src/drivers/webextension/images/icons/Maxemail.svg
new file mode 100755
index 000000000..01b298ab1
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Maxemail.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
+<g>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;fill:#B2D1EE;" d="M1.391,11.783C1.116,9.21,2.159,7,3.8,5.214
+		c-1.486,2.626-1.199,6.3,0.215,9.389c0.172,0.376-0.149,0.3-0.62-0.035c-0.489-0.348-0.951-0.776-1.387-1.278
+		C1.593,12.812,1.456,12.394,1.391,11.783z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;fill:#7DADDA;" d="M6.002,15.348C3.988,13.724,3.163,11.423,3.059,9
+		c0.806,2.907,3.607,5.302,6.791,6.486c0.388,0.144,0.107,0.318-0.463,0.414c-0.592,0.1-1.221,0.123-1.884,0.077
+		C6.872,15.933,6.48,15.734,6.002,15.348z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;fill:#3874AD;" d="M11.783,14.609C9.21,14.884,7,13.841,5.214,12.201
+		c2.626,1.485,6.3,1.198,9.389-0.216c0.376-0.172,0.3,0.149-0.035,0.62c-0.348,0.489-0.776,0.95-1.278,1.386
+		C12.812,14.407,12.394,14.544,11.783,14.609z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;fill:#1B5F9D;" d="M15.348,9.998c-1.625,2.014-3.926,2.839-6.349,2.942
+		c2.907-0.806,5.302-3.607,6.486-6.791c0.144-0.388,0.318-0.107,0.414,0.463c0.1,0.592,0.123,1.221,0.077,1.884
+		C15.933,9.127,15.734,9.52,15.348,9.998z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;fill:#B2D1EE;" d="M14.609,4.217C14.884,6.79,13.841,9,12.2,10.786
+		c1.486-2.626,1.199-6.3-0.215-9.389c-0.172-0.376,0.149-0.3,0.62,0.035c0.489,0.348,0.951,0.776,1.386,1.278
+		C14.407,3.188,14.544,3.606,14.609,4.217z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;fill:#7DADDA;" d="M9.998,0.652C12.012,2.277,12.837,4.577,12.941,7
+		c-0.806-2.907-3.607-5.302-6.791-6.486C5.761,0.369,6.042,0.196,6.613,0.1C7.204,0,7.833-0.023,8.496,0.023
+		C9.127,0.067,9.52,0.266,9.998,0.652z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;fill:#3874AD;" d="M4.217,1.391C6.79,1.116,9,2.159,10.786,3.799
+		c-2.625-1.485-6.3-1.199-9.389,0.216c-0.376,0.172-0.3-0.149,0.035-0.62C1.78,2.906,2.209,2.444,2.71,2.008
+		C3.188,1.593,3.606,1.456,4.217,1.391z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;fill:#1B5F9D;" d="M0.651,6.002C2.277,3.988,4.577,3.163,7,3.059
+		C4.093,3.866,1.698,6.667,0.514,9.851C0.369,10.239,0.196,9.958,0.1,9.388C0,8.796-0.023,8.167,0.023,7.504
+		C0.067,6.873,0.266,6.48,0.651,6.002z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;fill:#568DC3;" d="M6.791,12.352c2.013-0.424,4.146-3.277,4.679-5.803
+		c0.262,0.162,0.496,0.349,0.691,0.566l0.324,0.362c0.07,0.476,0.081,1.01-0.02,1.58C12.029,11.474,9.026,13.221,6.791,12.352z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;fill:#568DC3;" d="M12.356,6.94c-1.479-1.649-5.457-2.018-7.916-0.966
+		c-0.005-0.093-0.005-0.185,0-0.277l0.027-0.498C4.92,4.649,5.632,4.021,6.634,3.656C8.957,2.82,11.989,4.557,12.356,6.94z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;fill:#568DC3;" d="M4.178,5.683c-0.104,1.913,1.801,4.473,3.923,5.76
+		c-0.43,0.316-0.89,0.554-1.365,0.653l-0.431,0.091c-0.137-0.049-0.275-0.105-0.414-0.17C3.67,10.971,2.76,7.617,4.178,5.683z"/>
+</g>
+</svg>
diff --git a/src/drivers/webextension/images/icons/Xtremepush.svg b/src/drivers/webextension/images/icons/Xtremepush.svg
new file mode 100755
index 000000000..858f28eae
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Xtremepush.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     enable-background="new 0 0 128 128" viewBox="0 0 128 128">
+  <path fill="#1b86c8" d="m34.2 82.4c3.6-.5 6.8-1.9 9.2-4 3.4-3.1 10.9-11.1 14.3-14.6-5-5-13.1-13.1-14.3-14.3-2.3-2.2-5.5-3.6-9.2-4-.1-3.8.3-6.3
+    1.2-9.2 5.3.7 10.3 2.8 14.2 6.4 2.2 2 9.6 9.5 14.5 14.5 3.3-3.4 10.2-10.7 14.3-14.5 3.9-3.6 9-5.7 14.2-6.4 1 2.6 1.3 6.4 1.2 9.2-3.6.5-6.8
+    1.9-9.2 4-3.4 3.2-10.8 10.9-14.1 14.3 1.9 2 3.7 3.9 6.1 6.4 3.6 3.8 7.4 7.6 7.9 8.2 2.3 2.2 5.5 3.6 9.2 4 .3 2.9 0 6.7-1.2
+    9.2-5.3-.7-10.3-2.8-14.2-6.4-1.5-1.4-4.7-4.7-8.4-8.6-2.3-2.4-4-4.2-5.9-6.1-3.8 3.9-10.7 11.1-14.5 14.7-3.9 3.6-9 5.7-14.2 6.4-1.1-1.9-1.5-5.7-1.1-9.2z"/>
+  <path fill="#bbbfc0" d="m100.3 36.4c-1.5 2.8-1.6 5.9-1.3 9.1 8.2 1.1 14.7 7.6 15.8 15.8 4.4.2 7-.1 9.1-1.3-1.6-12.2-11.3-21.9-23.6-23.6z"/>
+  <path fill="#bbbfc0" d="m13.1 66.6c-3.3-.2-6.3 0-9.1 1.3 1.7 12.3 11.4 22 23.7 23.7 1.3-3.1 1.4-6 1.3-9.1-8.2-1.2-14.7-7.7-15.9-15.9z"/>
+  <path fill="#bbbfc0" d="m100.3 91.6c-1.5-2.8-1.6-5.9-1.3-9.1 8.2-1.1 14.7-7.6 15.8-15.8 4.4-.2 7 .1 9.1 1.3-1.6 12.2-11.3 21.9-23.6 23.6z"/>
+  <path fill="#bbbfc0" d="m13.1 61.4c-3.3.2-6.3 0-9.1-1.3 1.7-12.3 11.4-22 23.7-23.7 1.3 3.1 1.4 6 1.3 9.1-8.2 1.2-14.7 7.7-15.9 15.9z"/>
+</svg>