diff --git a/devicon.json b/devicon.json
index 97513eb46..ff645ac41 100644
--- a/devicon.json
+++ b/devicon.json
@@ -2220,6 +2220,28 @@
         "color": "#8d6748",
         "aliases": []
     },
+    {
+        "name": "modx",
+        "tags": [
+            "cms",
+            "php",
+            "framework"
+        ],
+        "versions": {
+            "svg": [
+                "original",
+                "original-wordmark",
+                "plain",
+                "plain-wordmark"
+            ],
+            "font": [
+                "plain",
+                "plain-wordmark"
+            ]
+        },
+        "color": "#00decc",
+        "aliases": []
+    },
     {
         "name": "mongodb",
         "tags": [
diff --git a/icons/modx/modx-original-wordmark.svg b/icons/modx/modx-original-wordmark.svg
new file mode 100644
index 000000000..37633ea29
--- /dev/null
+++ b/icons/modx/modx-original-wordmark.svg
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   viewBox="0 0 128 128"
+   style="enable-background:new 0 0 128 128;"
+   xml:space="preserve"
+   sodipodi:docname="modx-original-wordmark.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata63"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs61">
+		
+	</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1440"
+   inkscape:window-height="748"
+   id="namedview59"
+   showgrid="false"
+   inkscape:zoom="3.2040776"
+   inkscape:cx="82.490418"
+   inkscape:cy="60.556111"
+   inkscape:window-x="-6"
+   inkscape:window-y="-6"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+
+<g
+   id="g865"><polygon
+     class="st0"
+     points="92.1,40.8 110.4,11.5 66.4,11.5 60.3,21.3 "
+     id="polygon9"
+     style="fill:#00b5de;fill-opacity:1" /><polygon
+     class="st2"
+     points="101.8,93.8 101.8,49.8 92.3,43.9 72.3,75.4 "
+     id="polygon26"
+     style="fill:#ff5529;fill-opacity:1" /><polygon
+     class="st3"
+     points="30.9,2.7 30.9,46.7 41.1,52.6 92.1,40.8 "
+     id="polygon35"
+     style="fill:#00decc;fill-opacity:1" /><polygon
+     class="st4"
+     points="40.9,56 22.6,84.8 66.6,84.8 92.3,43.9 "
+     id="polygon42"
+     style="fill:#ff9640;fill-opacity:1" /><g
+     id="g54"
+     style="fill:#102c53;fill-opacity:1">
+		<path
+   d="m 16.2,122.1 h 2.6 l 1.3,-15.6 h -2.6 v -3 h 7 l 4.8,12.2 c 0.4,1.1 0.5,1.8 0.5,1.8 h 0.1 c 0,0 0.2,-0.7 0.5,-1.8 l 4.8,-12.2 h 7 v 3 h -2.6 l 1.2,15.6 h 2.6 v 3 h -8.9 v -3 h 2.4 l -0.7,-11 c -0.1,-0.8 0.1,-2 0.1,-2 h -0.1 c 0,0 -0.2,1.2 -0.5,1.9 l -4.1,10 h -3.4 l -4.1,-10 c -0.3,-0.7 -0.5,-1.9 -0.5,-1.9 h -0.1 c 0,0 0.2,1.2 0.1,2 L 22.8,122 h 2.4 v 3 h -9 v -2.9 z"
+   id="path46"
+   style="fill:#102c53;fill-opacity:1" />
+		<path
+   d="m 56.1,103 c 6.4,0 11.2,4.8 11.2,11 0,6.4 -4.8,11.3 -11.2,11.3 -6.4,0 -11.2,-5 -11.2,-11.3 0,-6.1 4.8,-11 11.2,-11 z m 0,18.9 c 3.9,0 7.1,-3.4 7.1,-7.8 0,-4.3 -3.2,-7.5 -7.1,-7.5 -3.9,0 -7.1,3.3 -7.1,7.5 0,4.4 3.2,7.8 7.1,7.8 z"
+   id="path48"
+   style="fill:#102c53;fill-opacity:1" />
+		<path
+   d="m 69.3,122.1 h 2.6 v -15.6 h -2.6 v -3 h 9.4 c 1.7,0 3.1,0.1 4.5,0.5 4.2,1.2 7,5 7,10.3 0,5.1 -2.6,8.8 -6.7,10.2 -1.5,0.5 -3,0.6 -4.8,0.6 h -9.4 z m 9.2,-0.3 c 1.4,0 2.5,-0.1 3.5,-0.6 2.5,-1 4,-3.5 4,-7.1 0,-3.7 -1.6,-6.2 -4.2,-7.1 -1.1,-0.4 -2.1,-0.5 -3.4,-0.5 h -2.6 v 15.2 z"
+   id="path50"
+   style="fill:#102c53;fill-opacity:1" />
+		<path
+   d="m 92.5,122.1 h 1.9 l 5.5,-8 -5.3,-7.6 h -1.9 v -3 h 8.2 v 3 h -2.1 l 3,4.5 c 0.4,0.5 0.6,0.9 0.6,0.9 h 0.1 c 0,0 0.2,-0.4 0.6,-0.9 l 2.9,-4.5 h -2.1 v -3 h 7.9 v 3 h -1.9 l -5.5,7.9 5.4,7.7 h 1.9 v 3 h -8.2 v -3 h 2.1 l -3,-4.5 c -0.4,-0.5 -0.6,-0.9 -0.6,-0.9 h -0.1 c -0.1,0 -0.2,0.4 -0.6,0.9 l -2.9,4.5 h 2.1 v 3 h -7.9 z"
+   id="path52"
+   style="fill:#102c53;fill-opacity:1" />
+	</g></g></svg>
diff --git a/icons/modx/modx-original.svg b/icons/modx/modx-original.svg
new file mode 100644
index 000000000..d4d76b0a5
--- /dev/null
+++ b/icons/modx/modx-original.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   viewBox="0 0 128 128"
+   style="enable-background:new 0 0 128 128;"
+   xml:space="preserve"
+   sodipodi:docname="modx-original.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata63"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs61">
+		
+	</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1440"
+   inkscape:window-height="748"
+   id="namedview59"
+   showgrid="false"
+   inkscape:zoom="3.2040776"
+   inkscape:cx="51.074449"
+   inkscape:cy="73.565575"
+   inkscape:window-x="-6"
+   inkscape:window-y="-6"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+<g
+   id="g954"
+   transform="matrix(1.0316667,0,0,1.0316667,-2.0266671,-2.0266671)"><polygon
+     points="66.4,11.5 60.3,21.3 92.1,40.8 110.4,11.5 "
+     id="polygon9"
+     style="fill:#00b5de;fill-opacity:1"
+     transform="matrix(1.3172338,0,0,1.3172338,-23.596048,0.44346872)" /><polygon
+     class="st2"
+     points="92.3,43.9 72.3,75.4 101.8,93.8 101.8,49.8 "
+     id="polygon26"
+     style="fill:#ff5529;fill-opacity:1"
+     transform="matrix(1.3172338,0,0,1.3172338,-23.596048,0.44346872)" /><polygon
+     class="st3"
+     points="41.1,52.6 92.1,40.8 30.9,2.7 30.9,46.7 "
+     id="polygon35"
+     style="fill:#00decc;fill-opacity:1"
+     transform="matrix(1.3172338,0,0,1.3172338,-23.596048,0.44346872)" /><polygon
+     class="st4"
+     points="66.6,84.8 92.3,43.9 40.9,56 22.6,84.8 "
+     id="polygon42"
+     style="fill:#ff9640;fill-opacity:1"
+     transform="matrix(1.3172338,0,0,1.3172338,-23.596048,0.44346872)" /></g>
+</svg>
diff --git a/icons/modx/modx-plain-wordmark.svg b/icons/modx/modx-plain-wordmark.svg
new file mode 100644
index 000000000..5e4c5ec63
--- /dev/null
+++ b/icons/modx/modx-plain-wordmark.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   viewBox="0 0 128 128"
+   style="enable-background:new 0 0 128 128;"
+   xml:space="preserve"
+   sodipodi:docname="modx-plain-wordmark.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata29"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs27" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1440"
+   inkscape:window-height="748"
+   id="namedview25"
+   showgrid="false"
+   inkscape:zoom="2.265625"
+   inkscape:cx="34.144893"
+   inkscape:cy="61.810172"
+   inkscape:window-x="-6"
+   inkscape:window-y="-6"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+<g
+   id="g22"
+   style="fill:#00decc;fill-opacity:1">
+	<g
+   id="g10"
+   style="fill:#00decc;fill-opacity:1">
+		<polygon
+   points="110.5,11.4 66.5,11.4 61.7,19.2 93.4,39   "
+   id="polygon2"
+   style="fill:#00decc;fill-opacity:1" />
+		<polygon
+   points="92.2,40.7 31.2,2.6 31.2,46.7 40.7,52.6   "
+   id="polygon4"
+   style="fill:#00decc;fill-opacity:1" />
+		<polygon
+   points="73.4,77.4 100.8,94.6 100.8,50.5 93.2,45.7   "
+   id="polygon6"
+   style="fill:#00decc;fill-opacity:1" />
+		<polygon
+   points="39.8,56.5 21.5,85.8 65.5,85.8 91.3,44.6   "
+   id="polygon8"
+   style="fill:#00decc;fill-opacity:1" />
+	</g>
+	<g
+   id="g20"
+   style="fill:#00decc;fill-opacity:1">
+		<path
+   d="M16.3,122.1h2.6l1.3-15.6h-2.6v-3h7l4.8,12.2c0.4,1.1,0.5,1.8,0.5,1.8h0.1c0,0,0.2-0.7,0.5-1.8l4.8-12.2h7v3h-2.6    l1.2,15.6h2.6v3h-8.9v-3h2.4l-0.8-10.9c-0.1-0.8,0.1-2,0.1-2h-0.1c0,0-0.2,1.2-0.5,1.9l-4.1,10h-3.4l-4.1-10    c-0.3-0.7-0.5-1.9-0.5-1.9h-0.1c0,0,0.2,1.2,0.1,2l-0.8,10.9h2.4v3h-8.9V122.1z"
+   id="path12"
+   style="fill:#00decc;fill-opacity:1" />
+		<path
+   d="M56.2,103c6.4,0,11.2,4.8,11.2,11c0,6.4-4.8,11.3-11.2,11.3c-6.4,0-11.2-5-11.2-11.3C45,107.9,49.8,103,56.2,103z     M56.2,121.9c3.9,0,7.1-3.4,7.1-7.8c0-4.3-3.2-7.5-7.1-7.5s-7.1,3.3-7.1,7.5C49.1,118.5,52.3,121.9,56.2,121.9z"
+   id="path14"
+   style="fill:#00decc;fill-opacity:1" />
+		<path
+   d="M69.4,122.1H72v-15.6h-2.6v-3h9.4c1.7,0,3.1,0.1,4.5,0.5c4.2,1.2,7,5,7,10.3c0,5.1-2.6,8.8-6.7,10.2    c-1.5,0.5-3,0.6-4.8,0.6h-9.4V122.1z M78.6,121.8c1.4,0,2.5-0.1,3.5-0.5c2.5-1,4-3.5,4-7.1c0-3.7-1.6-6.2-4.2-7.1    c-1.1-0.4-2.1-0.5-3.4-0.5H76v15.2H78.6L78.6,121.8z"
+   id="path16"
+   style="fill:#00decc;fill-opacity:1" />
+		<path
+   d="M92.6,122.1h1.9l5.5-8l-5.3-7.6h-1.9v-3h8.2v3h-2.1l3,4.5c0.4,0.5,0.6,0.9,0.6,0.9h0.1c0,0,0.2-0.4,0.6-0.9l2.9-4.5h-2.1    v-3h7.9v3h-1.9l-5.5,8l5.4,7.7h1.9v3h-8.2v-3h2.1l-3-4.5c-0.4-0.5-0.6-0.9-0.6-0.9h-0.1c-0.1,0-0.2,0.4-0.6,0.9l-2.9,4.5h2.1v3    h-7.9L92.6,122.1L92.6,122.1z"
+   id="path18"
+   style="fill:#00decc;fill-opacity:1" />
+	</g>
+</g>
+</svg>
diff --git a/icons/modx/modx-plain.svg b/icons/modx/modx-plain.svg
new file mode 100644
index 000000000..f553bfcf1
--- /dev/null
+++ b/icons/modx/modx-plain.svg
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   viewBox="0 0 128 128"
+   style="enable-background:new 0 0 128 128;"
+   xml:space="preserve"
+   sodipodi:docname="modx-plain.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata17"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs15" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1440"
+   inkscape:window-height="748"
+   id="namedview13"
+   showgrid="false"
+   inkscape:zoom="2.265625"
+   inkscape:cx="81.848109"
+   inkscape:cy="74.996427"
+   inkscape:window-x="-6"
+   inkscape:window-y="-6"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+<g
+   id="g10"
+   style="fill:#00decc;fill-opacity:1">
+	<polygon
+   points="123.9,13.9 64.6,13.9 58.2,24.4 100.9,51  "
+   id="polygon2"
+   style="fill:#00decc;fill-opacity:1" />
+	<polygon
+   points="99.3,53.4 17.1,2.1 17.1,61.4 29.9,69.4  "
+   id="polygon4"
+   style="fill:#00decc;fill-opacity:1" />
+	<polygon
+   points="74,102.7 110.9,125.9 110.9,66.6 100.6,60.1  "
+   id="polygon6"
+   style="fill:#00decc;fill-opacity:1" />
+	<polygon
+   points="28.7,74.6 4.1,114.1 63.4,114.1 98.1,58.6  "
+   id="polygon8"
+   style="fill:#00decc;fill-opacity:1" />
+</g>
+</svg>
diff --git a/icons/modx/modx.eps b/icons/modx/modx.eps
new file mode 100644
index 000000000..9a3129348
Binary files /dev/null and b/icons/modx/modx.eps differ