From c5ea4123741334ad2e56839f749a8cd3bec58ca4 Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Thu, 8 Jul 2021 17:23:09 +1000
Subject: [PATCH 01/33] Add Astra Theme

Add Astra theme detection & icon
---
 .../webextension/images/icons/astra.png       | Bin 0 -> 5494 bytes
 src/technologies.json                         |  19 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 src/drivers/webextension/images/icons/astra.png

diff --git a/src/drivers/webextension/images/icons/astra.png b/src/drivers/webextension/images/icons/astra.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4b6aedc1e59d5f8970407f637f415bc4a9b9abf
GIT binary patch
literal 5494
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

literal 0
HcmV?d00001

diff --git a/src/technologies.json b/src/technologies.json
index 25451be1f..de3f27423 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -2399,6 +2399,25 @@
       "scripts": "asciinema\\.org/",
       "website": "https://asciinema.org/"
     },
+    "Astra": {
+      "cats": [
+        80
+      ],
+      "description": "Astra is a fast, lightweight, and highly customizable WordPress Theme.",
+      "icon": "astra.png",
+      "pricing": [
+        "low",
+        "freemium"
+      ],
+      "html": "<!--\\[if IE]>*.<script.*\/themes\/astra",
+      "dom": [
+        "style[id*='astra-theme']",
+        "script[id*='astra-theme']"
+      ],
+      "scripts": "wp-content/themes/astra",
+      "requires": "WordPress",
+      "website": "https://wpastra.com/"
+    },
     "Astute Solutions": {
       "cats": [
         53

From 13edba614c08a3f419c565d0f7b5c57c128c7cb7 Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Thu, 8 Jul 2021 17:29:22 +1000
Subject: [PATCH 02/33] Elementor Hello Theme Detection

Added theme detection code & icon
---
 .../images/icons/Hello Elementor.png          | Bin 0 -> 617 bytes
 src/technologies.json                         |  23 ++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 src/drivers/webextension/images/icons/Hello Elementor.png

diff --git a/src/drivers/webextension/images/icons/Hello Elementor.png b/src/drivers/webextension/images/icons/Hello Elementor.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2da94792e19dcb9bce54e4c34fd7fbfa0c746d3
GIT binary patch
literal 617
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyy#YQUu0VPsgY^Uk>xm3j6Bw+3
zB#;Xx@vz|vtS3RWpez1g_2ggGlV7EGZwIZt;lJXrdB;}uqRp!LE2R?V^7u?+b(+d-
zKbg^XGNa8T28babGj;aP>;XDRwj{_en1P3fPee>Z!y+msrho4I`3ujUz5Md^>-V33
z{`~z{`p`Qw1_s7FPZ!6Kid&_@-9^m`0(*|lIKsAiYS`Mq<Vnjsxy%3muaxBzIGa3E
zu;ppo8^)fF?U{jFb3>P$6neMuTvn^ci4~u}p8eRJAu_A6!%H)yw<GPk>iw`4yp53>
z>TYK9^MWJ!%L4O`{Z_3K@cZyE$K}$_?c#S2`4k;wSvb){SSag~OUuLf4b5shj@@)h
zOrG=P-FFL_bro_teSK3Ik8JJEdGTG`=BpSpyHCXN2|pI_IM%+`<+Hn{yW~hnuI`^W
zopraO7Kq%dO}uevOMs1Nz{1s^F1*$MQM}3G_oeU)zwXQ^c=c=D`(1e-cE4>Yn9r)T
zHQ+4AV(xJLRSPz}e}75lYs0r@);&KvZXTNNf0=#ep|WXd8dGlj`K(+XIfKJmTBW;~
zbHdJ`*~fz(Zp>L(T=(vI)s2nIjuhK&NJvneFSEEOZIP<^o}!g8y_@vqJIzkWC8&PQ
zIQZK6+%A2g-Ib4PI*;alepZ^X*DBin#e0j7Z~sfR->u&{x&Dz+9G@sKiWody{an^L
HB{Ts5$#e~k

literal 0
HcmV?d00001

diff --git a/src/technologies.json b/src/technologies.json
index 25451be1f..e856d26b3 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -6577,6 +6577,28 @@
       "scripts": "elementor/assets/js/[^/]+\\.js\\?ver=([\\d.]+)$\\;version:\\1",
       "website": "https://elementor.com"
     },
+    "Elementor Hello Theme": {
+      "cats": [
+        80
+      ],
+      "description": "Hello Elementor is a WordPress theme built for the Elementor website builder platform. It uses minimal styling and scripts for maximum speed and design freedom.",
+      "icon": "Hello Elementor.png",
+      "pricing": [
+        "low",
+        "freemium"
+      ],
+      "html": [
+        "<link [^>]*href=(?:\"|')[^\"']*wp-content/themes/hello-elementor",
+        "<link [^>]*href=(?:\"|')[^\"']*wp-content/themes/elementor-hello"
+      ],
+      "dom": [
+        "style[id*='hello-elementor']",
+        "style[id*='elementor-hello']"
+      ],
+      "implies": "Elementor",
+      "requires" : "Wordpress",
+      "website": "https://elementor.com/hello-theme/"
+    },
     "Elm": {
       "cats": [
         27,
@@ -9152,6 +9174,7 @@
       "scripts": "hellobar\\.js",
       "website": "http://hellobar.com"
     },
+  
     "HelpDocs": {
       "cats": [
         4,

From 250233f189f0c36531f31a447492ccd457213aa0 Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Fri, 9 Jul 2021 11:18:20 +1000
Subject: [PATCH 03/33] Capital P in WordPress

---
 src/technologies.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/technologies.json b/src/technologies.json
index e856d26b3..5b86bcd72 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -6596,7 +6596,7 @@
         "style[id*='elementor-hello']"
       ],
       "implies": "Elementor",
-      "requires" : "Wordpress",
+      "requires" : "WordPress",
       "website": "https://elementor.com/hello-theme/"
     },
     "Elm": {

From e2040119d174d1c61f39cad30066550e3f081364 Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Fri, 9 Jul 2021 11:51:43 +1000
Subject: [PATCH 04/33] Added version detection on CSS link

---
 src/technologies.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/technologies.json b/src/technologies.json
index de3f27423..e8d069714 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -2409,7 +2409,10 @@
         "low",
         "freemium"
       ],
-      "html": "<!--\\[if IE]>*.<script.*\/themes\/astra",
+      "html": [
+        "<link[^>]* href=[\\'\"][^']+wp-content/themes/astra/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
+        "<!--\\[if IE]>*.<script.*\/themes\/astra"
+      ], 
       "dom": [
         "style[id*='astra-theme']",
         "script[id*='astra-theme']"

From c4948ad200ffe775c3f95542fa6bd4399c7b12c8 Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Fri, 9 Jul 2021 11:58:33 +1000
Subject: [PATCH 05/33] Added version detection on CSS file link

---
 src/technologies.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/technologies.json b/src/technologies.json
index 5b86bcd72..4b0d6234a 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -6588,8 +6588,8 @@
         "freemium"
       ],
       "html": [
-        "<link [^>]*href=(?:\"|')[^\"']*wp-content/themes/hello-elementor",
-        "<link [^>]*href=(?:\"|')[^\"']*wp-content/themes/elementor-hello"
+        "<link [^>]*href=(?:\"|')[^\"']*wp-content/themes/hello-elementor/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
+        "<link [^>]*href=(?:\"|')[^\"']*wp-content/themes/elementor-hello/.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
       ],
       "dom": [
         "style[id*='hello-elementor']",

From 0f4113e41de7ee4dfce070bf8f68c2d6db1574eb Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Fri, 9 Jul 2021 14:32:21 +1000
Subject: [PATCH 06/33] OceanWP Logo & CSS detection added to technologies.json

---
 .../webextension/images/icons/OceanWP.png     | Bin 0 -> 1236 bytes
 src/technologies.json                         |  19 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 src/drivers/webextension/images/icons/OceanWP.png

diff --git a/src/drivers/webextension/images/icons/OceanWP.png b/src/drivers/webextension/images/icons/OceanWP.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f936e93c146cd131d2a6dc09e74c6fd9c6f3d1f
GIT binary patch
literal 1236
zcmV;_1S|WAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006O%
z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006
zVoOIv0RI600RN!9r;`8x00(qQO+^Rg2M7l%H#SR}jQ{`x*hxe|R9M69*I$U$RS*a8
z&)nU$-89`@(*8&kBHDkVBIvJ0_14QSMo|&eOG#4Hi-ZvLQg0PSgisVj1Qu@8OD`1_
zgcw#vR*<?zVx_t3ntxJv@AU9HyY9O8>fZj)O9PjC?woUGzGu$&%*^F~`Hv-9-O#&s
zMEl`3qjSb;WE-RyYda<C>gl)J=Kb>kdIv_v*Pe~5a0PiD=2iOm9Y10t)~DPN<WOJt
z-viJyut#Wz1-KvgU<o>ot;)$}MzIC2lP?pyGShH>b0AFt^u9Av+2%q#i(62`QEbN#
z*j*6xU@;b<3w3;eN0ZGpX-|`Av^RxTIbVb|xUOh7;stz|nY*MTwKiF=>xhV6T#c2u
z3AbWRaBqrjEk&Sr-3W9FFP6~5dw2wcjl$Y9uvcUt=Zkn6_mzmfh86f@sBbz!YfWK=
zWmsM`oA6lWT*EsZ?&~(xKaYsrSdEX%)N<V1ECSO2^sF0^nQgceb1^EtC~Zk;xc?;2
zEK~9;p2s1~!QJR6uj#}9B8Z5ExVEUa3h#^RlqZv+{_gR6{S@C6^))zmMiHpkmy5}T
zWxSExInK(NNy@rC*idYoMPAUz#uNZO>-LTh7va>x(QlJ6IrF4B)YmO4%ik3nv#?lB
zB(=r>A|{+Hn55kqq9R!9@-s#YtIw>kOpQW=D+t8wg1nCXf5mf=gVI<T&(0jTe?kCL
zB(-+=)Az^3{+JZu<^XaW`LX#^{|10A$Fl8#Mn{?c46Co*lYX8Fy#ssy3V;O@0Mf2T
zp_~F>QmPzOB@tN4SWA6F@4!SMTUt~{u{C0fkH!%wvIW1C@#WO!w{-5RLeIsOMf0oh
zZKI{rIglwccaZA~2hS(2uTC~RGXRmuE6K}BC^o1{_{jkb_jikkqr_Sj89VV1F+WfG
zXePLFT8b6KT;dSk#NpxL=?6GbIi4-NirZ0_ULsdxM1)4AwPez+h**WkRT=Q@l=or3
zjB_F^!FKiBCYt2eN$K)pyn#zq?bf?^245aHG<vYBvt2FfDx%j<QFTu%aaW1lCRHWe
zj7#uJu{DSX@JaKQY+yvzQ`F)b>3QLbGBt!R@U^P!CQipiD$<=%)_snLGjly5!V`FM
zl8ZHm>K<&`k`49Et3b%lBH|8JH?&-p7j7w^<0V!3|1CU+!AaR~-*IdAbw#w)mbc@4
z+*nR}4o)jP+K->gsXxN^7#-(H*?$(E!VTqWR^f-163nuV>8tH~)oM|bIwQ;~Q%8tD
z>Z#r}i=U7CbJ8;~B(xzriC&DPJTR-HqZRl6%fBOk0-@|pM0-@K8vp<RC3HntbYx+4
zWjbSWWnpw>05UK#F)c7REigD#FgH3hGdeXjD=;uRFfbn6`78hc03~!qSaf7zbY(hi
yZ)9m^c>ppnGBGVMH!UzYR4_L>G&4FiH7hVMIxsMAfkBV}0000<MNUMnLSTZ3ATvP#

literal 0
HcmV?d00001

diff --git a/src/technologies.json b/src/technologies.json
index 25451be1f..e596ff0cc 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -13833,6 +13833,25 @@
       "implies": "PHP",
       "website": "https://www.oxid-esales.com"
     },
+    "OceanWP": {
+      "cats": [
+        80
+      ],
+      "description": "OceanWP is a fast-loading WordPress theme that has great support for third-party plugins and drag-and-drop page builders.",
+      "icon": "OceanWP.png",
+      "pricing": [
+        "low",
+        "recurring"
+      ],
+      "html": [
+        "<link[^>]* href=[\\'\"][^']+wp-content/themes/oceanwp/.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+      ],
+      "dom": [
+        "style[id*='oceanwp.*']"
+      ],
+      "requires": "WordPress",
+      "website": "https://oceanwp.org"
+    },
     "Occasion": {
       "cats": [
         72

From 141758e0cd7645b55a08d034112c67e939ee2b0b Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Fri, 9 Jul 2021 18:06:03 +1000
Subject: [PATCH 07/33] Added DOM & html to detect theme & version

---
 src/technologies.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/technologies.json b/src/technologies.json
index e596ff0cc..ac34ce924 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -13843,11 +13843,9 @@
         "low",
         "recurring"
       ],
+      "dom": "link[rel='stylesheet'][id*='oceanwp-style-css']",
       "html": [
-        "<link[^>]* href=[\\'\"][^']+wp-content/themes/oceanwp/.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
-      ],
-      "dom": [
-        "style[id*='oceanwp.*']"
+        "<link[^>]* href=[\\'\"][^']+oceanwp/.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
       ],
       "requires": "WordPress",
       "website": "https://oceanwp.org"

From 7adad671f0415bd280f990b3b109524efb6fc2b3 Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Tue, 13 Jul 2021 16:50:11 +1000
Subject: [PATCH 08/33] 2020 theme detection

---
 src/technologies.json | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/technologies.json b/src/technologies.json
index 9e94e8226..7eec41a2d 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -21398,6 +21398,23 @@
       },
       "scripts": "(turf@[\\d.]+)?/?turf\\.min\\.js",
       "website": "https://turfjs.org/"
+    },    
+    "TwentyTwenty": {
+      "cats": [
+        80
+      ],
+      "description": "Twenty Twenty is the default WordPress theme for 2020.",
+      "icon": "WordPress.svg",
+      "dom": [
+        "link[rel='stylesheet'][id*='twentytwenty-style-css']",
+        "body[class*='twentytwenty-theme']"
+      ],
+      "html": [
+        "<link[^>]* href=[\\'\"][^']+twentytwenty/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
+        "<script[^>]* src=[\\'\"][^']+themes/twentytwenty.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
+      ],
+      "requires": "WordPress",
+      "website": "https://wordpress.com/theme/twentytwenty"
     },
     "TwicPics": {
       "cats": [

From a4671c3387b5411a1813b55095f52e20fbbd6cfc Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Thu, 15 Jul 2021 22:37:18 +1000
Subject: [PATCH 09/33] Added body class for OceanWP

---
 src/technologies.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/technologies.json b/src/technologies.json
index e45be4184..e3947279a 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -14054,7 +14054,9 @@
         "low",
         "recurring"
       ],
-      "dom": "link[rel='stylesheet'][id*='oceanwp-style-css']",
+      "dom": ["link[rel='stylesheet'][id*='oceanwp-style-css']",
+              "body[class*='oceanwp-theme']"
+      ],
       "html": [
         "<link[^>]* href=[\\'\"][^']+oceanwp/.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
       ],

From 4594839a05f8e6f70587148a07ef99e08fe16eb7 Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Thu, 15 Jul 2021 23:02:38 +1000
Subject: [PATCH 10/33] Added Neve theme detection & icon

---
 .../webextension/images/icons/themeisle.png    | Bin 0 -> 1784 bytes
 src/technologies.json                          |  17 +++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 src/drivers/webextension/images/icons/themeisle.png

diff --git a/src/drivers/webextension/images/icons/themeisle.png b/src/drivers/webextension/images/icons/themeisle.png
new file mode 100644
index 0000000000000000000000000000000000000000..473913530b2a652e821c795eeacdd76c56d34e8c
GIT binary patch
literal 1784
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
JpPdu4;~z~YiLw9y

literal 0
HcmV?d00001

diff --git a/src/technologies.json b/src/technologies.json
index e3947279a..9826329f0 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -13769,6 +13769,23 @@
       },
       "website": "https://nette.org"
     },
+    "Neve": {
+      "cats": [
+          80
+      ],
+      "description": "Neve is a super-fast, easily customizable, multi-purpose theme that works perfectly with Gutenberg and the most popular page builders as well as WooCommerce",
+      "icon": "themeisle.png",
+      "dom": [
+          "link[rel='stylesheet'][id*='neve-style-css']",
+          "body[class*='neve-theme']"
+      ],
+      "html": [
+          "<link[^>]* href=[\\'\"][^']+neve/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
+          "<script[^>]* src=[\\'\"][^']+themes/neve.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
+      ],
+      "requires": "WordPress",
+      "website": "https://themeisle.com/themes/neve/"
+  },
     "New Relic": {
       "cats": [
         10

From 190040d47e6f87f747e6ff2c1328262acd68bcf7 Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Thu, 15 Jul 2021 23:17:06 +1000
Subject: [PATCH 11/33] added generate press - icon & tech entry

---
 .../images/icons/generatepress.png             | Bin 0 -> 1428 bytes
 src/technologies.json                          |  17 +++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 src/drivers/webextension/images/icons/generatepress.png

diff --git a/src/drivers/webextension/images/icons/generatepress.png b/src/drivers/webextension/images/icons/generatepress.png
new file mode 100644
index 0000000000000000000000000000000000000000..1956cf781e735bc63629d5f943434e8994083aed
GIT binary patch
literal 1428
zcmZ`(dpOez82;t7(U98^<}f06+YlDVZ7!QQj5Hx;#xtckOc**Yg_28}OYYL_V7Ybl
zbdlsTqM~Iamv%T<?nRPA&ir})IM4Td-}^l8`@HY>-+SG|-B}W%3;_T@66=D&3sL=G
z#lXTFO{Z@P;c%Fpn;ihO<cjYSK?fqq1@8s`bZr1gz6t<4LMmAR05J#vSPTLHbTI%Z
zMwUJCv=R#7U{_}huzxUB&sevGj3^E3<|sNRdQ?=>;9P0$9btYn7Gvj4=<Xf!%Pcqp
z6<z;mT5`L_`3<zM>{D&=Fx0Usv?|~lPF!mPE^R2Nvxn35^=0W&1_=$#8I3emwrB#j
z+mHN0N5=9iqQw1!Ag<C+Dj_L)t1QRTLCVk~vSV!`VQ>G!O3cLW5EoJC7-2#+_~G73
zdxcS{?fvIGtw!7#0Zavy?`PYBCsTU~Iq}6QgOS)owJr**=Tc(o{q3b-jFF3aXX(21
zC}^EY+FXub?rGQ-Sun!Ps2xT%gz-Ua&fn;SjA6C?6QR@nbI@rHc-M1CrA91-|6pBt
zwaN2+hV}dOB#RqF|CGxHJ^rU(Z%NF$T50w6>&VJ2Hdmx%oADQhQ^r~}4OBcCGE|O;
z)pceu)ae&#bY*8XjNQW7!N!4dLod+RVdr~>1Z%5{BV!X@F|O3yj_IG7QA`{5a%R#-
zD%9T?v^t7^j3O*k|7hXMv=>AyzIe9{bd#_Rrvn`X6PY*#x!k|HyVBzMe+ET>uN*a=
z-TRyz=4=A%F~8b4lQ|0Z`C=Qohik7X30EUZy7MfTbRTI=LZ0)T%h+-%ukqUK%(jIV
zz5eXDDw#ply4-uHQ3EJ2Ikp8v<xs_^v#8%cbgh)yvpNY1#hQm386vfL)_C~aDW0!*
zhwqJbD_(6dHc<tBOLgMSuy22RCk!5`dhP*e0uno#%<fxWp0eGA+{s>;&5W{CLW@%*
zU&)A^t@C*bUv47pO+C{0YCT(@-!S_-JnP=Jhd^vx@d?OBg=g<Q(7)*_Z&akMn*_;c
zeU|;@_2|W%XhY)BhhqW@Jy4KWklUcO$63@8wa<E-<(^n-Erp|eqjJ@jAe8<iu%Ss4
z&-#_tg}yThHk0a(TU^3Z)JA9}qp+=2aR_%P{v^U#jF#b-6}vLdQSdL9ISv|!=zc{<
z25v=Uc*{8*pW$0fi*YZkKfC#r%0(bgR49V`v6L=ft-00k$@+7~B}kiY<-(b}O{2R8
z$8vEzdDFrHdE#E;By7#NC{<uPKRUHdxG_(`kChS9-bqiFq^2>W=Hlx7m3WWBnd%7G
zw2t1$Jr6E?>57n-xB}7mh@HA`HmZnH{WfD)cSO~wK)(++HxOy9kzHLp!dmMz`y5d?
zA{i_16B6;QeWb+ZHso{~W6ZJS<W)t*Yo23wS>BDCjDdpcG8avVNZ8D)q8_DR^J+^!
zw%EjyokG-SSU&~21~j?VgFv@rFLielC%5pAqaF_P2s#q7&pG1?N!3cRPB&?V0|h_m
zm>qgTI&KbU-jSa^e5g)&9*I)2;YUm4Xyn~G#^BZjwDC^5ItsLRuWPnpT2sw@2k!M&
z*B~{UK|@vMm4=*CjEcM`AI$3=>MYi_EH)mG%RuoGOwnW3jPn-_0*&Rf>7?&fZ%Of_
zax>PMzAp}K{Foyn(v*BIrQG`jCmK1<q$4d)&1by?wZGMv+ltb)_2WG+QAO>9UuIYE
zNZKA5F3$!(HG3~SWiqTT!iwJQ2mAmhm!<2m?w73!8%c}iNT7ufX=F4hiYx>Gg+L(<
z5$1+SQ*VSh8fk(yHPuHT&<KPU*J<cKh6rj1B{cs34c@swqJ;*fgAZQRP+BZ8iVWC=
gP=m?p*a%`68BZpL#Q*k^d{C7D*3li)XdjgNFA@HQbN~PV

literal 0
HcmV?d00001

diff --git a/src/technologies.json b/src/technologies.json
index 9826329f0..8be71a9af 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -8116,6 +8116,23 @@
       ],
       "website": "https://www.gemius.com"
     },
+    "GeneratePress": {
+      "cats": [
+          80
+      ],
+      "description": "GeneratePress is a lightweight WordPress theme that focuses on speed, stability, and accessibility",
+      "icon": "generatepress.png",
+      "dom": [
+          "link[rel='stylesheet'][id*='generatepress-style-css']",
+          "body[class*='generatepress-theme']"
+      ],
+      "html": [
+          "<link[^>]* href=[\\'\"][^']+generatepress/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
+          "<script[^>]* src=[\\'\"][^']+themes/generatepress.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
+      ],
+      "requires": "WordPress",
+      "website": "https://generatepress.com/"
+    },
     "GeneXus": {
       "cats": [
         27

From 7d9248e592c9f5226f584862ca55f86924f0a0af Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Thu, 15 Jul 2021 23:49:20 +1000
Subject: [PATCH 12/33] Added WP 2010-2020

---
 src/technologies.json | 194 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 192 insertions(+), 2 deletions(-)

diff --git a/src/technologies.json b/src/technologies.json
index 8be71a9af..3d10e6040 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -2433,7 +2433,7 @@
       ],
       "html": [
         "<link[^>]* href=[\\'\"][^']+wp-content/themes/astra/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
-        "<!--\\[if IE]>*.<script.*\/themes\/astra"
+        "<!--\\[if*.<script.*\/themes\/astra"
       ], 
       "dom": [
         "style[id*='astra-theme']",
@@ -8124,11 +8124,13 @@
       "icon": "generatepress.png",
       "dom": [
           "link[rel='stylesheet'][id*='generatepress-style-css']",
+          "link[rel='stylesheet'][id*='generate-style-css']",
           "body[class*='generatepress-theme']"
       ],
       "html": [
           "<link[^>]* href=[\\'\"][^']+generatepress/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
-          "<script[^>]* src=[\\'\"][^']+themes/generatepress.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
+          "<script[^>]* src=[\\'\"][^']+themes/generatepress.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
+          "<!--\\[if IE]>*.<script.*\/themes\/generatepress"
       ],
       "requires": "WordPress",
       "website": "https://generatepress.com/"
@@ -23342,6 +23344,194 @@
       "implies": "WordPress",
       "website": "http://z9.io/wp-super-cache/"
     },
+
+    "WordPress Twenty Ten": {
+      "cats": [
+          80
+      ],
+      "description": "Twenty Ten is the default theme for WordPress in 2010.",
+      "icon": "WordPress.svg",
+      "dom": [
+          "link[rel='stylesheet'][id*='twentyten-style-css']",
+          "body[class*='twentyten-theme']"
+      ],
+      "html": [
+          "<link[^>]* href=[\\'\"][^']+twentyten/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
+          "<script[^>]* src=[\\'\"][^']+themes/twentyten.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
+      ],
+      "requires": "WordPress",
+      "website": "https://wordpress.com/theme/twentyten"
+  },
+  "WordPress Twenty Eleven": {
+    "cats": [
+        80
+    ],
+    "description": "Twenty Eleven is the default theme for WordPress in 2011.",
+    "icon": "WordPress.svg",
+    "dom": [
+        "link[rel='stylesheet'][id*='twentyeleven-style-css']",
+        "body[class*='twentyeleven-theme']"
+    ],
+    "html": [
+        "<link[^>]* href=[\\'\"][^']+twentyeleven/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
+        "<script[^>]* src=[\\'\"][^']+themes/twentyeleven.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
+    ],
+    "requires": "WordPress",
+    "website": "https://wordpress.com/theme/twentyeleven"
+},
+"WordPress Twenty Twelve": {
+  "cats": [
+      80
+  ],
+  "description": "Twenty Twelve is an elegant, readable, and fully responsive theme that makes your site content look its best on any device.",
+  "icon": "WordPress.svg",
+  "dom": [
+      "link[rel='stylesheet'][id*='twentytwelve-style-css']",
+      "body[class*='twentytwelve-theme']"
+  ],
+  "html": [
+      "<link[^>]* href=[\\'\"][^']+twentytwelve/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
+      "<script[^>]* src=[\\'\"][^']+themes/twentytwelve.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
+  ],
+  "requires": "WordPress",
+  "website": "https://wordpress.com/theme/twentytwelve"
+},
+"WordPress Twenty Thirteen": {
+  "cats": [
+      80
+  ],
+  "description": "The 2013 theme for WordPress.com is colorful, opinionated, and ready to give your blog a warm, welcoming vibe.",
+  "icon": "WordPress.svg",
+  "dom": [
+      "link[rel='stylesheet'][id*='twentythirteen-style-css']",
+      "body[class*='twentythirteen-theme']"
+  ],
+  "html": [
+      "<link[^>]* href=[\\'\"][^']+twentythirteen/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
+      "<script[^>]* src=[\\'\"][^']+themes/twentythirteen.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
+  ],
+  "requires": "WordPress",
+  "website": "https://wordpress.com/theme/twentythirteen"
+},
+    "WordPress Twenty Fourteen": {
+      "cats": [
+          80
+      ],
+      "description": "The default theme for 2014 is a magazine theme with a sleek, modern, and beautifully crafted responsive design.",
+      "icon": "WordPress.svg",
+      "dom": [
+          "link[rel='stylesheet'][id*='twentyfourteen-style-css']",
+          "body[class*='twentyfourteen-theme']"
+      ],
+      "html": [
+          "<link[^>]* href=[\\'\"][^']+twentyfourteen/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
+          "<script[^>]* src=[\\'\"][^']+themes/twentyfourteen.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
+      ],
+      "requires": "WordPress",
+      "website": "https://wordpress.com/theme/twentyfourteen"
+  },
+    "WordPress Twenty Fifteen": {
+      "cats": [
+          80
+      ],
+      "description": "The annual WordPress theme for 2015 is super-clean, content-focused, and designed to bring a little more simplicity to our blogs.",
+      "icon": "WordPress.svg",
+      "dom": [
+          "link[rel='stylesheet'][id*='twentyfifteen-style-css']",
+          "body[class*='twentyfifteen-theme']"
+      ],
+      "html": [
+          "<link[^>]* href=[\\'\"][^']+twentyfifteen/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
+          "<script[^>]* src=[\\'\"][^']+themes/twentyfifteen.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
+      ],
+      "requires": "WordPress",
+      "website": "https://wordpress.com/theme/twentyfifteen"
+  },
+    "WordPress Twenty Sixteen": {
+      "cats": [
+          80
+      ],
+      "description": "The annual WordPress theme for 2016 is a modern take on an ever-popular layout.",
+      "icon": "WordPress.svg",
+      "dom": [
+          "link[rel='stylesheet'][id*='twentysixteen-style-css']",
+          "body[class*='twentysixteen-theme']"
+      ],
+      "html": [
+          "<link[^>]* href=[\\'\"][^']+twentysixteen/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
+          "<script[^>]* src=[\\'\"][^']+themes/twentysixteen.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
+      ],
+      "requires": "WordPress",
+      "website": "https://wordpress.com/theme/twentysixteen"
+  },
+    "WordPress Twenty Seventeen": {
+        "cats": [
+            80
+        ],
+        "description": "Twenty Seventeen is the default WordPress theme for 2017.",
+        "icon": "WordPress.svg",
+        "dom": [
+            "link[rel='stylesheet'][id*='twentyseventeen-style-css']",
+            "body[class*='twentyseventeen-theme']"
+        ],
+        "html": [
+            "<link[^>]* href=[\\'\"][^']+twentyseventeen/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
+            "<script[^>]* src=[\\'\"][^']+themes/twentyseventeen.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
+        ],
+        "requires": "WordPress",
+        "website": "https://wordpress.com/theme/twentyseventeen"
+    },
+  "WordPress Twenty Nineteen": {
+    "cats": [
+        80
+    ],
+    "description": "Twenty Nineteen is the default WordPress theme for 2019",
+    "icon": "WordPress.svg",
+    "dom": [
+        "link[rel='stylesheet'][id*='twentynineteen-style-css']",
+        "body[class*='twentynineteen-theme']"
+    ],
+    "html": [
+        "<link[^>]* href=[\\'\"][^']+twentynineteen/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
+        "<script[^>]* src=[\\'\"][^']+themes/twentynineteen.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
+    ],
+    "requires": "WordPress",
+    "website": "https://wordpress.com/theme/twentynineteen"
+  },
+    "WordPress Twenty Twenty": {
+        "cats": [
+            80
+        ],
+        "description": "Twenty Twenty is the default WordPress theme for 2020",
+        "icon": "WordPress.svg",
+        "dom": [
+            "link[rel='stylesheet'][id*='twentytwenty-style-css']",
+            "body[class*='twentytwenty-theme']"
+        ],
+        "html": [
+            "<link[^>]* href=[\\'\"][^']+twentytwenty/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
+            "<script[^>]* src=[\\'\"][^']+themes/twentytwenty.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
+        ],
+        "requires": "WordPress",
+        "website": "https://wordpress.com/theme/twentytwenty"
+    },
+    "WordPress Twenty Twenty-One": {
+        "cats": [
+            80
+        ],
+        "description": "Twenty Twenty One is the default WordPress theme for 2021",
+        "icon": "WordPress.svg",
+        "dom": [
+            "link[rel='stylesheet'][id*='twentytwentyone-style-css']",
+            "body[class*='twentytwentyone-theme']"
+        ],
+        "html": [
+            "<link[^>]* href=[\\'\"][^']+twentytwentyone/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
+            "<script[^>]* src=[\\'\"][^']+themes/twentytwentyone.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
+        ],
+        "requires": "WordPress",
+        "website": "https://wordpress.com/theme/twentytwentyone"
+    },
     "WordPress VIP": {
       "cats": [
         62

From ca3c83a1af58842f9d4f9c67c1499eba114f0ca4 Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Thu, 15 Jul 2021 23:50:05 +1000
Subject: [PATCH 13/33] Fixed typo in WordPress Super Cache description

---
 src/technologies.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/technologies.json b/src/technologies.json
index 3d10e6040..5dec5b83f 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -23335,7 +23335,7 @@
       "cats": [
         23
       ],
-      "description": "WordPpress Super Cache is a static caching plugin for WordPress.",
+      "description": "WordPress Super Cache is a static caching plugin for WordPress.",
       "headers": {
         "WP-Super-Cache": ""
       },
@@ -23344,7 +23344,6 @@
       "implies": "WordPress",
       "website": "http://z9.io/wp-super-cache/"
     },
-
     "WordPress Twenty Ten": {
       "cats": [
           80

From 4cb6aa78fec8cdc4ca85562ac68c1f8100942c2c Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Thu, 15 Jul 2021 23:57:36 +1000
Subject: [PATCH 14/33] Colormag entry & icon added

---
 .../webextension/images/icons/themegrill.png   | Bin 0 -> 34494 bytes
 src/technologies.json                          |  17 +++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 src/drivers/webextension/images/icons/themegrill.png

diff --git a/src/drivers/webextension/images/icons/themegrill.png b/src/drivers/webextension/images/icons/themegrill.png
new file mode 100644
index 0000000000000000000000000000000000000000..8625b0e8a55072b79b45240b3019d190c81ed5ae
GIT binary patch
literal 34494
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
N*8^1j{vT7|zX2f57q$QZ

literal 0
HcmV?d00001

diff --git a/src/technologies.json b/src/technologies.json
index 5dec5b83f..b9aab4f43 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -24446,6 +24446,23 @@
       },
       "website": "http://git.zx2c4.com/cgit"
     },
+    "ColorMag": {
+      "cats": [
+          80
+      ],
+      "description": "ColorMag theme is for creating news, magazine, newspaper and other kinds of publishing sites. Compatible with Elementor.",
+      "icon": "themegrill.png",
+      "dom": [
+          "link[rel='stylesheet'][id*='colormag-style-css']",
+          "body[class*='colormag-theme']"
+      ],
+      "html": [
+          "<link[^>]* href=[\\'\"][^']+colormag/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
+          "<script[^>]* src=[\\'\"][^']+themes/colormag.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
+      ],
+      "requires": "WordPress",
+      "website": "https://themegrill.com/themes/colormag/"
+    },
     "Complianz": {
       "cats": [
         74,

From bdd2fdbea640be98352dd4ad93006a884dbfb762 Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Thu, 15 Jul 2021 23:59:37 +1000
Subject: [PATCH 15/33] Added Hestia to technologies

---
 src/technologies.json | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/technologies.json b/src/technologies.json
index b9aab4f43..59f928ac6 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -9309,7 +9309,6 @@
       "scripts": "hellobar\\.js",
       "website": "http://hellobar.com"
     },
-  
     "HelpDocs": {
       "cats": [
         4,
@@ -9364,6 +9363,23 @@
       "url": "\\.herokuapp\\.com",
       "website": "https://www.heroku.com/"
     },
+    "Hestia": {
+      "cats": [
+          80
+      ],
+      "description": "Hestia is a modern WordPress theme for professionals a multipurpose one-page design, widgetized footer, blog/news page, and a clean look.",
+      "icon": "themeisle.png",
+      "dom": [
+          "link[rel='stylesheet'][id*='hestia-style-css']",
+          "body[class*='hestia-theme']"
+      ],
+      "html": [
+          "<link[^>]* href=[\\'\"][^']+hestia/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
+          "<script[^>]* src=[\\'\"][^']+themes/hestia.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
+      ],
+      "requires": "WordPress",
+      "website": "https://themeisle.com/themes/hestia/"
+    },
     "Hexo": {
       "cats": [
         57

From e2d6fd4ca760c8880b4269999382896f54770062 Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Fri, 16 Jul 2021 00:01:39 +1000
Subject: [PATCH 16/33] Added Sydney theme to technologies & atthemes icon

---
 .../webextension/images/icons/athemes.png      | Bin 0 -> 338 bytes
 src/technologies.json                          |  17 +++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 src/drivers/webextension/images/icons/athemes.png

diff --git a/src/drivers/webextension/images/icons/athemes.png b/src/drivers/webextension/images/icons/athemes.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c58b0542aefa0b536d92c9d82a409f066d3b487
GIT binary patch
literal 338
zcmV-Y0j>U0Nk&FW0RRA3MM6+kP&iCI0RR9mAHW9?-@qu6Bt^C0-`V=WAH!YiP}E40
z(mDU0&J4YnISSjhZ3y@OgQvqdwyiX;1)R31lpcuN+GXdS1`+^4?jKZO0gb-Vi%jA<
zU3$+%Jr~?DQGGj8QEk!OBj@B^t+*4w16H8~A9S)vU<rvSJnw?Twv8NVed+&l&iyw!
zv+J41HxSW(2W}%NQfDa(*@It%Kl8Tk8K3(+wzaPuz4yAMw<vRm5B(0;eeT=Bm>T5t
zJ1izs4OHPFJ#&T{P~V+La}OZ$aq~?Fo#^S;TIRT~lRW*bq&Jg(>@m0W%zoktC)XYk
zwR*~7^)2V|S^K6Z@tO8fgLx8X{W@`jEAD%o#5=Hw+@wewhSPY4lv>@vCqqr$wSfL9
kJ}Pp#3QkJf9r4utWB_$<oVhO^`A>YAyW`?N(uQ;b0DrKiM*si-

literal 0
HcmV?d00001

diff --git a/src/technologies.json b/src/technologies.json
index 59f928ac6..c8556ce84 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -20505,6 +20505,23 @@
       "scripts": "swiper(?:\\.min)?\\.js",
       "website": "https://swiperjs.com"
     },
+    "Sydney": {
+      "cats": [
+          80
+      ],
+      "description": "Sydney is a powerful business theme that provides a fast way for companies or freelancers to create an online presence. Built by aThemes.",
+      "icon": "athemes.png",
+      "dom": [
+          "link[rel='stylesheet'][id*='sydney-style-css']",
+          "body[class*='sydney-theme']"
+      ],
+      "html": [
+          "<link[^>]* href=[\\'\"][^']+sydney/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
+          "<script[^>]* src=[\\'\"][^']+themes/sydney.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
+      ],
+      "requires": "WordPress",
+      "website": "https://athemes.com/theme/sydney/"
+    },
     "Sylius": {
       "cats": [
         6

From 294d6560d2d7a21e14c284087f05c777e814e4be Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Fri, 23 Jul 2021 15:02:21 +1000
Subject: [PATCH 17/33] Removed html identifiers from Generate Press Entry

---
 src/technologies.json | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/technologies.json b/src/technologies.json
index 0282f5c17..bcdb5a7ae 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -8181,14 +8181,12 @@
       "description": "GeneratePress is a lightweight WordPress theme that focuses on speed, stability, and accessibility",
       "icon": "generatepress.png",
       "dom": [
-          "link[rel='stylesheet'][id*='generatepress-style-css']",
-          "link[rel='stylesheet'][id*='generate-style-css']",
+          "link[id*='generatepress-style']",
+          "link[id*='generate-style']",
           "body[class*='generatepress-theme']"
       ],
-      "html": [
-          "<link[^>]* href=[\\'\"][^']+generatepress/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
-          "<script[^>]* src=[\\'\"][^']+themes/generatepress.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
-          "<!--\\[if IE]>*.<script.*\/themes\/generatepress"
+      "scripts": [
+          "themes/generatepress.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
       ],
       "requires": "WordPress",
       "website": "https://generatepress.com/"

From 29d645bfddb8661740dca92013cc784b7f4b9a11 Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Fri, 23 Jul 2021 15:35:51 +1000
Subject: [PATCH 18/33] Removed html identifiers from Astra entry

---
 src/technologies.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/technologies.json b/src/technologies.json
index bcdb5a7ae..78ea07738 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -2435,15 +2435,11 @@
         "low",
         "freemium"
       ],
-      "html": [
-        "<link[^>]* href=[\\'\"][^']+wp-content/themes/astra/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
-        "<!--\\[if*.<script.*\/themes\/astra"
-      ], 
       "dom": [
         "style[id*='astra-theme']",
         "script[id*='astra-theme']"
       ],
-      "scripts": "wp-content/themes/astra",
+      "scripts": "themes/astra.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://wpastra.com/"
     },

From 80b6329c3ad53cd97b585ee20aff0fedc13bf9e3 Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Fri, 23 Jul 2021 15:41:13 +1000
Subject: [PATCH 19/33] Removed html identifiers from ColorMag entry

---
 src/technologies.json | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/technologies.json b/src/technologies.json
index 78ea07738..f4aa5a099 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -4983,13 +4983,10 @@
       "description": "ColorMag theme is for creating news, magazine, newspaper and other kinds of publishing sites. Compatible with Elementor.",
       "icon": "themegrill.png",
       "dom": [
-          "link[rel='stylesheet'][id*='colormag-style-css']",
+          "link[id*='colormag-style']",
           "body[class*='colormag-theme']"
       ],
-      "html": [
-          "<link[^>]* href=[\\'\"][^']+colormag/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
-          "<script[^>]* src=[\\'\"][^']+themes/colormag.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
-      ],
+      "scripts": "themes/colormag.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://themegrill.com/themes/colormag/"
     },

From 313fc4fa9de2ae94648cf27b0b41eef634e1ecf6 Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Fri, 23 Jul 2021 15:44:30 +1000
Subject: [PATCH 20/33] Neve - removed html identifiers

---
 src/technologies.json | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/technologies.json b/src/technologies.json
index f4aa5a099..68bb7c517 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -13887,13 +13887,10 @@
       "description": "Neve is a super-fast, easily customizable, multi-purpose theme that works perfectly with Gutenberg and the most popular page builders as well as WooCommerce",
       "icon": "themeisle.png",
       "dom": [
-          "link[rel='stylesheet'][id*='neve-style-css']",
+          "link[id*='neve-style']",
           "body[class*='neve-theme']"
       ],
-      "html": [
-          "<link[^>]* href=[\\'\"][^']+neve/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
-          "<script[^>]* src=[\\'\"][^']+themes/neve.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
-      ],
+      "scripts": "themes/neve.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://themeisle.com/themes/neve/"
   },

From 46af504560fdd3ad5e12dffcb817fb06fee7b8d7 Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Fri, 23 Jul 2021 16:02:29 +1000
Subject: [PATCH 21/33] Remove html identifiers for Sydney theme

---
 src/technologies.json | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/technologies.json b/src/technologies.json
index 68bb7c517..6c0ada8f7 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -20615,13 +20615,10 @@
       "description": "Sydney is a powerful business theme that provides a fast way for companies or freelancers to create an online presence. Built by aThemes.",
       "icon": "athemes.png",
       "dom": [
-          "link[rel='stylesheet'][id*='sydney-style-css']",
+          "link[id*='sydney-style']",
           "body[class*='sydney-theme']"
       ],
-      "html": [
-          "<link[^>]* href=[\\'\"][^']+sydney/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
-          "<script[^>]* src=[\\'\"][^']+themes/sydney.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
-      ],
+      "scripts": "themes/sydney.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://athemes.com/theme/sydney/"
     },

From ff8f3e193f02f1dd3b03efeaa815f2a6c36d4612 Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Fri, 23 Jul 2021 16:07:21 +1000
Subject: [PATCH 22/33] removed hestia html identifiers

---
 src/technologies.json | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/technologies.json b/src/technologies.json
index 6c0ada8f7..0804b87c6 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -9420,13 +9420,10 @@
       "description": "Hestia is a modern WordPress theme for professionals a multipurpose one-page design, widgetized footer, blog/news page, and a clean look.",
       "icon": "themeisle.png",
       "dom": [
-          "link[rel='stylesheet'][id*='hestia-style-css']",
+          "link[id*='hestia']",
           "body[class*='hestia-theme']"
       ],
-      "html": [
-          "<link[^>]* href=[\\'\"][^']+hestia/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
-          "<script[^>]* src=[\\'\"][^']+themes/hestia.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
-      ],
+      "scripts": "themes/hestia.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://themeisle.com/themes/hestia/"
     },

From 12cb76d61e5327540ee46647d163328cdd5f821d Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Fri, 23 Jul 2021 16:17:52 +1000
Subject: [PATCH 23/33] oceanwp - html identifiers removed

---
 src/technologies.json | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/technologies.json b/src/technologies.json
index 0804b87c6..9b804678f 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -14177,12 +14177,11 @@
         "low",
         "recurring"
       ],
-      "dom": ["link[rel='stylesheet'][id*='oceanwp-style-css']",
-              "body[class*='oceanwp-theme']"
-      ],
-      "html": [
-        "<link[^>]* href=[\\'\"][^']+oceanwp/.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+      "dom": [
+        "link[id*='oceanwp']",
+        "body[class*='oceanwp-theme']"
       ],
+      "scripts": "themes/oceanwp.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://oceanwp.org"
     },

From 398e83e5028badbadf967b526e6730d41f14fd33 Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Fri, 23 Jul 2021 16:46:16 +1000
Subject: [PATCH 24/33] Removed html identifiers from hello elementor

---
 src/technologies.json | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/technologies.json b/src/technologies.json
index 9b804678f..d98614c9c 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -6746,28 +6746,6 @@
       "scripts": "elementor/assets/js/[^/]+\\.js\\?ver=([\\d.]+)$\\;version:\\1",
       "website": "https://elementor.com"
     },
-    "Elementor Hello Theme": {
-      "cats": [
-        80
-      ],
-      "description": "Hello Elementor is a WordPress theme built for the Elementor website builder platform. It uses minimal styling and scripts for maximum speed and design freedom.",
-      "icon": "Hello Elementor.png",
-      "pricing": [
-        "low",
-        "freemium"
-      ],
-      "html": [
-        "<link [^>]*href=(?:\"|')[^\"']*wp-content/themes/hello-elementor/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
-        "<link [^>]*href=(?:\"|')[^\"']*wp-content/themes/elementor-hello/.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
-      ],
-      "dom": [
-        "style[id*='hello-elementor']",
-        "style[id*='elementor-hello']"
-      ],
-      "implies": "Elementor",
-      "requires" : "WordPress",
-      "website": "https://elementor.com/hello-theme/"
-    },
     "Elm": {
       "cats": [
         27,
@@ -9359,6 +9337,24 @@
       "scripts": "hellobar\\.js",
       "website": "http://hellobar.com"
     },
+    "Hello Elementor": {
+      "cats": [
+        80
+      ],
+      "description": "Hello Elementor is a WordPress theme built for the Elementor website builder platform. It uses minimal styling and scripts for maximum speed and design freedom.",
+      "icon": "Hello Elementor.png",
+      "pricing": [
+        "low",
+        "freemium"
+      ],
+      "dom": [
+        "link[id*='hello-elementor']",
+        "link[id*='elementor-hello']"
+      ],
+      "implies": "Elementor",
+      "requires" : "WordPress",
+      "website": "https://elementor.com/hello-theme/"
+    },
     "HelpDocs": {
       "cats": [
         4,

From ddc6f29c16da80795e80ce45d162468a89dcfbfc Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Fri, 23 Jul 2021 17:11:46 +1000
Subject: [PATCH 25/33] removed html identifiers from WP default themes

---
 src/technologies.json | 377 ++++++++++++++++++------------------------
 1 file changed, 164 insertions(+), 213 deletions(-)

diff --git a/src/technologies.json b/src/technologies.json
index d98614c9c..7aee0ee29 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -4978,13 +4978,13 @@
     },
     "ColorMag": {
       "cats": [
-          80
+        80
       ],
       "description": "ColorMag theme is for creating news, magazine, newspaper and other kinds of publishing sites. Compatible with Elementor.",
       "icon": "themegrill.png",
       "dom": [
-          "link[id*='colormag-style']",
-          "body[class*='colormag-theme']"
+        "link[id*='colormag-style']",
+        "body[class*='colormag-theme']"
       ],
       "scripts": "themes/colormag.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
@@ -8147,17 +8147,17 @@
     },
     "GeneratePress": {
       "cats": [
-          80
+        80
       ],
       "description": "GeneratePress is a lightweight WordPress theme that focuses on speed, stability, and accessibility",
       "icon": "generatepress.png",
       "dom": [
-          "link[id*='generatepress-style']",
-          "link[id*='generate-style']",
-          "body[class*='generatepress-theme']"
+        "link[id*='generatepress-style']",
+        "link[id*='generate-style']",
+        "body[class*='generatepress-theme']"
       ],
       "scripts": [
-          "themes/generatepress.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
+        "themes/generatepress.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
       ],
       "requires": "WordPress",
       "website": "https://generatepress.com/"
@@ -9352,7 +9352,7 @@
         "link[id*='elementor-hello']"
       ],
       "implies": "Elementor",
-      "requires" : "WordPress",
+      "requires": "WordPress",
       "website": "https://elementor.com/hello-theme/"
     },
     "HelpDocs": {
@@ -9411,13 +9411,13 @@
     },
     "Hestia": {
       "cats": [
-          80
+        80
       ],
       "description": "Hestia is a modern WordPress theme for professionals a multipurpose one-page design, widgetized footer, blog/news page, and a clean look.",
       "icon": "themeisle.png",
       "dom": [
-          "link[id*='hestia']",
-          "body[class*='hestia-theme']"
+        "link[id*='hestia']",
+        "body[class*='hestia-theme']"
       ],
       "scripts": "themes/hestia.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
@@ -13875,18 +13875,18 @@
     },
     "Neve": {
       "cats": [
-          80
+        80
       ],
       "description": "Neve is a super-fast, easily customizable, multi-purpose theme that works perfectly with Gutenberg and the most popular page builders as well as WooCommerce",
       "icon": "themeisle.png",
       "dom": [
-          "link[id*='neve-style']",
-          "body[class*='neve-theme']"
+        "link[id*='neve-style']",
+        "body[class*='neve-theme']"
       ],
       "scripts": "themes/neve.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://themeisle.com/themes/neve/"
-  },
+    },
     "New Relic": {
       "cats": [
         10
@@ -20602,13 +20602,13 @@
     },
     "Sydney": {
       "cats": [
-          80
+        80
       ],
       "description": "Sydney is a powerful business theme that provides a fast way for companies or freelancers to create an online presence. Built by aThemes.",
       "icon": "athemes.png",
       "dom": [
-          "link[id*='sydney-style']",
-          "body[class*='sydney-theme']"
+        "link[id*='sydney-style']",
+        "body[class*='sydney-theme']"
       ],
       "scripts": "themes/sydney.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
@@ -21628,24 +21628,162 @@
       },
       "scripts": "(turf@[\\d.]+)?/?turf\\.min\\.js",
       "website": "https://turfjs.org/"
-    },    
-    "TwentyTwenty": {
+    },
+    "Twenty Eleven": {
+      "cats": [
+        80
+      ],
+      "description": "Twenty Eleven is the default theme for WordPress in 2011.",
+      "icon": "WordPress.svg",
+      "dom": [
+        "link[id*='twentyeleven-style']",
+        "body[class*='twentyeleven-theme']"
+      ],
+      "scripts": "themes/twentyeleven/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
+      "requires": "WordPress",
+      "website": "https://wordpress.com/theme/twentyeleven"
+    },
+    "Twenty Fifteen": {
+      "cats": [
+        80
+      ],
+      "description": "The annual WordPress theme for 2015 is super-clean, content-focused, and designed to bring a little more simplicity to our blogs.",
+      "icon": "WordPress.svg",
+      "dom": [
+        "link[id*='twentyfifteen-style']",
+        "body[class*='twentyfifteen-theme']"
+      ],
+      "scripts": "themes/twentyfifteen/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
+      "requires": "WordPress",
+      "website": "https://wordpress.com/theme/twentyfifteen"
+    },
+    "Twenty Fourteen": {
+      "cats": [
+        80
+      ],
+      "description": "The default theme for 2014 is a magazine theme with a sleek, modern, and beautifully crafted responsive design.",
+      "icon": "WordPress.svg",
+      "dom": [
+        "link[[id*='twentyfourteen-style']",
+        "body[class*='twentyfourteen-theme']"
+      ],
+      "scripts": "themes/twentyfourteen/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
+      "requires": "WordPress",
+      "website": "https://wordpress.com/theme/twentyfourteen"
+    },
+    "Twenty Nineteen": {
+      "cats": [
+        80
+      ],
+      "description": "Twenty Nineteen is the default WordPress theme for 2019",
+      "icon": "WordPress.svg",
+      "dom": [
+        "link[id*='twentynineteen-style']",
+        "body[class*='twentynineteen-theme']"
+      ],
+      "scripts": "themes/twentynineteen.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
+      "requires": "WordPress",
+      "website": "https://wordpress.com/theme/twentynineteen"
+    },
+    "Twenty Seventeen": {
+      "cats": [
+        80
+      ],
+      "description": "Twenty Seventeen is the default WordPress theme for 2017.",
+      "icon": "WordPress.svg",
+      "dom": [
+        "link[id*='twentyseventeen-style']",
+        "body[class*='twentyseventeen-theme']"
+      ],
+      "scripts": "themes/twentyseventeen/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
+      "requires": "WordPress",
+      "website": "https://wordpress.com/theme/twentyseventeen"
+    },
+    "Twenty Sixteen": {
+      "cats": [
+        80
+      ],
+      "description": "The annual WordPress theme for 2016 is a modern take on an ever-popular layout.",
+      "icon": "WordPress.svg",
+      "dom": [
+        "link[id*='twentysixteen-style']",
+        "body[class*='twentysixteen-theme']"
+      ],
+      "scripts": "themes/twentysixteen/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
+      "requires": "WordPress",
+      "website": "https://wordpress.com/theme/twentysixteen"
+    },
+    "Twenty Thirteen": {
+      "cats": [
+        80
+      ],
+      "description": "The 2013 theme for WordPress.com is colorful, opinionated, and ready to give your blog a warm, welcoming vibe.",
+      "icon": "WordPress.svg",
+      "dom": [
+        "link[id*='twentythirteen-style']",
+        "body[class*='twentythirteen-theme']"
+      ],
+      "scripts": "themes/twentythirteen/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
+      "requires": "WordPress",
+      "website": "https://wordpress.com/theme/twentythirteen"
+    },
+    "Twenty Ten": {
+      "cats": [
+        80
+      ],
+      "description": "Twenty Ten is the default theme for WordPress in 2010.",
+      "icon": "WordPress.svg",
+      "dom": [
+        "link[id*='twentyten-style']",
+        "body[class*='twentyten-theme']"
+      ],
+      "scripts": "themes/twentyten/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
+      "requires": "WordPress",
+      "website": "https://wordpress.com/theme/twentyten"
+    },
+    "Twenty Twelve": {
+      "cats": [
+        80
+      ],
+      "description": "Twenty Twelve is an elegant, readable, and fully responsive theme that makes your site content look its best on any device.",
+      "icon": "WordPress.svg",
+      "dom": [
+        "link[id*='twentytwelve-style']",
+        "body[class*='twentytwelve-theme']"
+      ],    
+      "scripts": "themes/twentytwelve/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
+      "requires": "WordPress",
+      "website": "https://wordpress.com/theme/twentytwelve"
+    },
+    "Twenty Twenty": {
       "cats": [
         80
       ],
       "description": "Twenty Twenty is the default WordPress theme for 2020.",
       "icon": "WordPress.svg",
       "dom": [
-        "link[rel='stylesheet'][id*='twentytwenty-style-css']",
+        "link[id*='twentytwenty-style']",
+        "style[id*='twentytwenty-style']",
         "body[class*='twentytwenty-theme']"
       ],
-      "html": [
-        "<link[^>]* href=[\\'\"][^']+twentytwenty/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
-        "<script[^>]* src=[\\'\"][^']+themes/twentytwenty.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
-      ],
+      "scripts": "themes/twentytwenty/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://wordpress.com/theme/twentytwenty"
     },
+    "Twenty Twenty-One": {
+      "cats": [
+        80
+      ],
+      "description": "Twenty Twenty One is the default WordPress theme for 2021",
+      "icon": "WordPress.svg",
+      "dom": [
+        "link[id*='twentytwentyone-style']",
+        "body[class*='twentytwentyone-theme']"
+      ],
+      "scripts": "themes/twentytwentyone/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
+      "requires": "WordPress",
+      "website": "https://wordpress.com/theme/twentytwentyone"
+    },
     "TwicPics": {
       "cats": [
         31,
@@ -23473,193 +23611,6 @@
       "implies": "WordPress",
       "website": "http://z9.io/wp-super-cache/"
     },
-    "WordPress Twenty Ten": {
-      "cats": [
-          80
-      ],
-      "description": "Twenty Ten is the default theme for WordPress in 2010.",
-      "icon": "WordPress.svg",
-      "dom": [
-          "link[rel='stylesheet'][id*='twentyten-style-css']",
-          "body[class*='twentyten-theme']"
-      ],
-      "html": [
-          "<link[^>]* href=[\\'\"][^']+twentyten/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
-          "<script[^>]* src=[\\'\"][^']+themes/twentyten.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
-      ],
-      "requires": "WordPress",
-      "website": "https://wordpress.com/theme/twentyten"
-  },
-  "WordPress Twenty Eleven": {
-    "cats": [
-        80
-    ],
-    "description": "Twenty Eleven is the default theme for WordPress in 2011.",
-    "icon": "WordPress.svg",
-    "dom": [
-        "link[rel='stylesheet'][id*='twentyeleven-style-css']",
-        "body[class*='twentyeleven-theme']"
-    ],
-    "html": [
-        "<link[^>]* href=[\\'\"][^']+twentyeleven/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
-        "<script[^>]* src=[\\'\"][^']+themes/twentyeleven.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
-    ],
-    "requires": "WordPress",
-    "website": "https://wordpress.com/theme/twentyeleven"
-},
-"WordPress Twenty Twelve": {
-  "cats": [
-      80
-  ],
-  "description": "Twenty Twelve is an elegant, readable, and fully responsive theme that makes your site content look its best on any device.",
-  "icon": "WordPress.svg",
-  "dom": [
-      "link[rel='stylesheet'][id*='twentytwelve-style-css']",
-      "body[class*='twentytwelve-theme']"
-  ],
-  "html": [
-      "<link[^>]* href=[\\'\"][^']+twentytwelve/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
-      "<script[^>]* src=[\\'\"][^']+themes/twentytwelve.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
-  ],
-  "requires": "WordPress",
-  "website": "https://wordpress.com/theme/twentytwelve"
-},
-"WordPress Twenty Thirteen": {
-  "cats": [
-      80
-  ],
-  "description": "The 2013 theme for WordPress.com is colorful, opinionated, and ready to give your blog a warm, welcoming vibe.",
-  "icon": "WordPress.svg",
-  "dom": [
-      "link[rel='stylesheet'][id*='twentythirteen-style-css']",
-      "body[class*='twentythirteen-theme']"
-  ],
-  "html": [
-      "<link[^>]* href=[\\'\"][^']+twentythirteen/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
-      "<script[^>]* src=[\\'\"][^']+themes/twentythirteen.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
-  ],
-  "requires": "WordPress",
-  "website": "https://wordpress.com/theme/twentythirteen"
-},
-    "WordPress Twenty Fourteen": {
-      "cats": [
-          80
-      ],
-      "description": "The default theme for 2014 is a magazine theme with a sleek, modern, and beautifully crafted responsive design.",
-      "icon": "WordPress.svg",
-      "dom": [
-          "link[rel='stylesheet'][id*='twentyfourteen-style-css']",
-          "body[class*='twentyfourteen-theme']"
-      ],
-      "html": [
-          "<link[^>]* href=[\\'\"][^']+twentyfourteen/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
-          "<script[^>]* src=[\\'\"][^']+themes/twentyfourteen.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
-      ],
-      "requires": "WordPress",
-      "website": "https://wordpress.com/theme/twentyfourteen"
-  },
-    "WordPress Twenty Fifteen": {
-      "cats": [
-          80
-      ],
-      "description": "The annual WordPress theme for 2015 is super-clean, content-focused, and designed to bring a little more simplicity to our blogs.",
-      "icon": "WordPress.svg",
-      "dom": [
-          "link[rel='stylesheet'][id*='twentyfifteen-style-css']",
-          "body[class*='twentyfifteen-theme']"
-      ],
-      "html": [
-          "<link[^>]* href=[\\'\"][^']+twentyfifteen/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
-          "<script[^>]* src=[\\'\"][^']+themes/twentyfifteen.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
-      ],
-      "requires": "WordPress",
-      "website": "https://wordpress.com/theme/twentyfifteen"
-  },
-    "WordPress Twenty Sixteen": {
-      "cats": [
-          80
-      ],
-      "description": "The annual WordPress theme for 2016 is a modern take on an ever-popular layout.",
-      "icon": "WordPress.svg",
-      "dom": [
-          "link[rel='stylesheet'][id*='twentysixteen-style-css']",
-          "body[class*='twentysixteen-theme']"
-      ],
-      "html": [
-          "<link[^>]* href=[\\'\"][^']+twentysixteen/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
-          "<script[^>]* src=[\\'\"][^']+themes/twentysixteen.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
-      ],
-      "requires": "WordPress",
-      "website": "https://wordpress.com/theme/twentysixteen"
-  },
-    "WordPress Twenty Seventeen": {
-        "cats": [
-            80
-        ],
-        "description": "Twenty Seventeen is the default WordPress theme for 2017.",
-        "icon": "WordPress.svg",
-        "dom": [
-            "link[rel='stylesheet'][id*='twentyseventeen-style-css']",
-            "body[class*='twentyseventeen-theme']"
-        ],
-        "html": [
-            "<link[^>]* href=[\\'\"][^']+twentyseventeen/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
-            "<script[^>]* src=[\\'\"][^']+themes/twentyseventeen.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
-        ],
-        "requires": "WordPress",
-        "website": "https://wordpress.com/theme/twentyseventeen"
-    },
-  "WordPress Twenty Nineteen": {
-    "cats": [
-        80
-    ],
-    "description": "Twenty Nineteen is the default WordPress theme for 2019",
-    "icon": "WordPress.svg",
-    "dom": [
-        "link[rel='stylesheet'][id*='twentynineteen-style-css']",
-        "body[class*='twentynineteen-theme']"
-    ],
-    "html": [
-        "<link[^>]* href=[\\'\"][^']+twentynineteen/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
-        "<script[^>]* src=[\\'\"][^']+themes/twentynineteen.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
-    ],
-    "requires": "WordPress",
-    "website": "https://wordpress.com/theme/twentynineteen"
-  },
-    "WordPress Twenty Twenty": {
-        "cats": [
-            80
-        ],
-        "description": "Twenty Twenty is the default WordPress theme for 2020",
-        "icon": "WordPress.svg",
-        "dom": [
-            "link[rel='stylesheet'][id*='twentytwenty-style-css']",
-            "body[class*='twentytwenty-theme']"
-        ],
-        "html": [
-            "<link[^>]* href=[\\'\"][^']+twentytwenty/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
-            "<script[^>]* src=[\\'\"][^']+themes/twentytwenty.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
-        ],
-        "requires": "WordPress",
-        "website": "https://wordpress.com/theme/twentytwenty"
-    },
-    "WordPress Twenty Twenty-One": {
-        "cats": [
-            80
-        ],
-        "description": "Twenty Twenty One is the default WordPress theme for 2021",
-        "icon": "WordPress.svg",
-        "dom": [
-            "link[rel='stylesheet'][id*='twentytwentyone-style-css']",
-            "body[class*='twentytwentyone-theme']"
-        ],
-        "html": [
-            "<link[^>]* href=[\\'\"][^']+twentytwentyone/.*\\.css\\?ver=([0-9.]+)\\;version:\\1",
-            "<script[^>]* src=[\\'\"][^']+themes/twentytwentyone.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
-        ],
-        "requires": "WordPress",
-        "website": "https://wordpress.com/theme/twentytwentyone"
-    },
     "WordPress VIP": {
       "cats": [
         62

From 2c690cc851909d8fab242f7dafbb769615d0ea80 Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Tue, 27 Jul 2021 16:02:11 +1000
Subject: [PATCH 26/33] Fixed Astra dom indentifier

---
 src/technologies.json | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/technologies.json b/src/technologies.json
index 7aee0ee29..85d565ae7 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -2435,11 +2435,23 @@
         "low",
         "freemium"
       ],
-      "dom": [
-        "style[id*='astra-theme']",
-        "script[id*='astra-theme']"
-      ],
       "scripts": "themes/astra.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
+      "dom": {
+        "link[href*='themes/astra',style[id*='astra-theme']": {
+          "attributes": { 
+            "href": "astra/.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+          }
+        },
+        "style[id*='astra-theme']": {
+          "text": ""
+        },
+        "body[class*='astra-']": {
+          "text": ""
+        },
+        "script[id*='astra-']": {
+          "text": ""
+        }
+      },
       "requires": "WordPress",
       "website": "https://wpastra.com/"
     },

From 1709a0bf325556617fec9310148c83ac6194de97 Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Wed, 28 Jul 2021 18:57:53 +1000
Subject: [PATCH 27/33] deleted unused code from Astra entry

---
 src/technologies.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/technologies.json b/src/technologies.json
index 85d565ae7..70e995ce4 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -2437,7 +2437,7 @@
       ],
       "scripts": "themes/astra.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "dom": {
-        "link[href*='themes/astra',style[id*='astra-theme']": {
+        "link[href*='themes/astra']": {
           "attributes": { 
             "href": "astra/.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
           }

From 5c5f98e07a54046eff40962579c8c2b73887bb2e Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Thu, 29 Jul 2021 21:32:57 +1000
Subject: [PATCH 28/33] updated all wp theme dom queries

---
 src/technologies.json | 272 ++++++++++++++++++++++++++++++------------
 1 file changed, 198 insertions(+), 74 deletions(-)

diff --git a/src/technologies.json b/src/technologies.json
index 70e995ce4..a1b516cc3 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -4994,10 +4994,16 @@
       ],
       "description": "ColorMag theme is for creating news, magazine, newspaper and other kinds of publishing sites. Compatible with Elementor.",
       "icon": "themegrill.png",
-      "dom": [
-        "link[id*='colormag-style']",
-        "body[class*='colormag-theme']"
-      ],
+      "dom": {
+        "link[id*='colormag']": {
+          "attributes": { 
+            "href": "themes/colormag.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+          }
+        },
+        "body[class*='colormag-theme']": {
+          "text": ""
+        }
+      },
       "scripts": "themes/colormag.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://themegrill.com/themes/colormag/"
@@ -8163,11 +8169,21 @@
       ],
       "description": "GeneratePress is a lightweight WordPress theme that focuses on speed, stability, and accessibility",
       "icon": "generatepress.png",
-      "dom": [
-        "link[id*='generatepress-style']",
-        "link[id*='generate-style']",
-        "body[class*='generatepress-theme']"
-      ],
+      "dom": {
+        "link[id*='generatepress-style']": {
+          "attributes": { 
+            "href": "generatepress.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+          }
+        },
+        "link[id*='generate-style']": {
+          "attributes": { 
+            "href": "generatepress.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+          }
+        },
+        "body[class*='generatepress-theme']": {
+          "text": ""
+        }
+      },
       "scripts": [
         "themes/generatepress.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
       ],
@@ -9359,10 +9375,24 @@
         "low",
         "freemium"
       ],
-      "dom": [
-        "link[id*='hello-elementor']",
-        "link[id*='elementor-hello']"
-      ],
+      "dom": {
+        "link[id*='hello-elementor']": {
+          "attributes": { 
+            "href": "hello-elementor.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+          }
+        },
+        "link[id*='elementor-hello']": {
+          "attributes": { 
+            "href": "elementor-hello.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+          }
+        },
+        "link[id*='hello-elementor']": {
+          "text": ""
+        },
+        "script[id*='hello-elementor']": {
+          "text": ""
+        }
+      },
       "implies": "Elementor",
       "requires": "WordPress",
       "website": "https://elementor.com/hello-theme/"
@@ -9427,10 +9457,16 @@
       ],
       "description": "Hestia is a modern WordPress theme for professionals a multipurpose one-page design, widgetized footer, blog/news page, and a clean look.",
       "icon": "themeisle.png",
-      "dom": [
-        "link[id*='hestia']",
-        "body[class*='hestia-theme']"
-      ],
+      "dom": {
+        "link[id*='hestia']": {
+          "attributes": { 
+            "href": "hestia.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+          }
+        },
+        "body[class*='hestia-theme']": {
+          "text": ""
+        }
+      },
       "scripts": "themes/hestia.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://themeisle.com/themes/hestia/"
@@ -13891,10 +13927,16 @@
       ],
       "description": "Neve is a super-fast, easily customizable, multi-purpose theme that works perfectly with Gutenberg and the most popular page builders as well as WooCommerce",
       "icon": "themeisle.png",
-      "dom": [
-        "link[id*='neve-style']",
-        "body[class*='neve-theme']"
-      ],
+      "dom": {
+        "link[id*='neve-style']": {
+          "attributes": { 
+            "href": "neve.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+          }
+        },
+        "body[class*='neve-theme']": {
+          "text": ""
+        }
+      },
       "scripts": "themes/neve.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://themeisle.com/themes/neve/"
@@ -14185,10 +14227,16 @@
         "low",
         "recurring"
       ],
-      "dom": [
-        "link[id*='oceanwp']",
-        "body[class*='oceanwp-theme']"
-      ],
+      "dom": {
+        "link[id*='oceanwp']": {
+          "attributes": { 
+            "href": "oceanwp.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+          }
+        },
+        "body[class*='oceanwp-theme']": {
+          "text": ""
+        }
+      },
       "scripts": "themes/oceanwp.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://oceanwp.org"
@@ -20618,10 +20666,16 @@
       ],
       "description": "Sydney is a powerful business theme that provides a fast way for companies or freelancers to create an online presence. Built by aThemes.",
       "icon": "athemes.png",
-      "dom": [
-        "link[id*='sydney-style']",
-        "body[class*='sydney-theme']"
-      ],
+      "dom": {
+        "link[id*='sydney']": {
+          "attributes": { 
+            "href": "sydney.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+          }
+        },
+        "body[class*='sydney-theme']": {
+          "text": ""
+        }
+      },
       "scripts": "themes/sydney.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://athemes.com/theme/sydney/"
@@ -21647,10 +21701,16 @@
       ],
       "description": "Twenty Eleven is the default theme for WordPress in 2011.",
       "icon": "WordPress.svg",
-      "dom": [
-        "link[id*='twentyeleven-style']",
-        "body[class*='twentyeleven-theme']"
-      ],
+      "dom": {
+        "link[id*='twentyeleven-style']": {
+          "attributes": { 
+            "href": "themes/twentyeleven.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+          }
+        },
+        "body[class*='twentyeleven-theme']": {
+          "text": ""
+        }
+      },
       "scripts": "themes/twentyeleven/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://wordpress.com/theme/twentyeleven"
@@ -21661,10 +21721,16 @@
       ],
       "description": "The annual WordPress theme for 2015 is super-clean, content-focused, and designed to bring a little more simplicity to our blogs.",
       "icon": "WordPress.svg",
-      "dom": [
-        "link[id*='twentyfifteen-style']",
-        "body[class*='twentyfifteen-theme']"
-      ],
+      "dom": {
+        "link[id*='twentyfifteen-style']": {
+          "attributes": { 
+            "href": "themes/twentyfifteen.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+          }
+        },
+        "body[class*='twentyfifteen-theme']": {
+          "text": ""
+        }
+      },
       "scripts": "themes/twentyfifteen/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://wordpress.com/theme/twentyfifteen"
@@ -21675,10 +21741,16 @@
       ],
       "description": "The default theme for 2014 is a magazine theme with a sleek, modern, and beautifully crafted responsive design.",
       "icon": "WordPress.svg",
-      "dom": [
-        "link[[id*='twentyfourteen-style']",
-        "body[class*='twentyfourteen-theme']"
-      ],
+      "dom": {
+        "link[id*='twentyfourteen-style']": {
+          "attributes": { 
+            "href": "themes/twentyfourteen.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+          }
+        },
+        "body[class*='twentyfourteen-theme']": {
+          "text": ""
+        }
+      },
       "scripts": "themes/twentyfourteen/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://wordpress.com/theme/twentyfourteen"
@@ -21689,10 +21761,16 @@
       ],
       "description": "Twenty Nineteen is the default WordPress theme for 2019",
       "icon": "WordPress.svg",
-      "dom": [
-        "link[id*='twentynineteen-style']",
-        "body[class*='twentynineteen-theme']"
-      ],
+      "dom": {
+        "link[id*='twentynineteen-style']": {
+          "attributes": { 
+            "href": "themes/twentynineteen.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+          }
+        },
+        "body[class*='twentynineteen-theme']": {
+          "text": ""
+        }
+      },
       "scripts": "themes/twentynineteen.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://wordpress.com/theme/twentynineteen"
@@ -21703,10 +21781,16 @@
       ],
       "description": "Twenty Seventeen is the default WordPress theme for 2017.",
       "icon": "WordPress.svg",
-      "dom": [
-        "link[id*='twentyseventeen-style']",
-        "body[class*='twentyseventeen-theme']"
-      ],
+      "dom": {
+        "link[id*='twentyseventeen-style']": {
+          "attributes": { 
+            "href": "themes/twentyseventeen.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+          }
+        },
+        "body[class*='twentyseventeen-theme']": {
+          "text": ""
+        }
+      },
       "scripts": "themes/twentyseventeen/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://wordpress.com/theme/twentyseventeen"
@@ -21717,10 +21801,16 @@
       ],
       "description": "The annual WordPress theme for 2016 is a modern take on an ever-popular layout.",
       "icon": "WordPress.svg",
-      "dom": [
-        "link[id*='twentysixteen-style']",
-        "body[class*='twentysixteen-theme']"
-      ],
+      "dom": {
+        "link[id*='twentysixteen-style']": {
+          "attributes": { 
+            "href": "themes/twentysixteen.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+          }
+        },
+        "body[class*='twentysixteen-theme']": {
+          "text": ""
+        }
+      },
       "scripts": "themes/twentysixteen/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://wordpress.com/theme/twentysixteen"
@@ -21731,10 +21821,16 @@
       ],
       "description": "The 2013 theme for WordPress.com is colorful, opinionated, and ready to give your blog a warm, welcoming vibe.",
       "icon": "WordPress.svg",
-      "dom": [
-        "link[id*='twentythirteen-style']",
-        "body[class*='twentythirteen-theme']"
-      ],
+      "dom": {
+        "link[id*='twentythirteen-style']": {
+          "attributes": { 
+            "href": "themes/twentythirteen.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+          }
+        },
+        "body[class*='twentythirteen-theme']": {
+          "text": ""
+        }
+      },
       "scripts": "themes/twentythirteen/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://wordpress.com/theme/twentythirteen"
@@ -21745,10 +21841,16 @@
       ],
       "description": "Twenty Ten is the default theme for WordPress in 2010.",
       "icon": "WordPress.svg",
-      "dom": [
-        "link[id*='twentyten-style']",
-        "body[class*='twentyten-theme']"
-      ],
+      "dom": {
+        "link[id*='twentyten-style']": {
+          "attributes": { 
+            "href": "themes/twentyten.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+          }
+        },
+        "body[class*='twentyten-theme']": {
+          "text": ""
+        }
+      },
       "scripts": "themes/twentyten/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://wordpress.com/theme/twentyten"
@@ -21759,10 +21861,16 @@
       ],
       "description": "Twenty Twelve is an elegant, readable, and fully responsive theme that makes your site content look its best on any device.",
       "icon": "WordPress.svg",
-      "dom": [
-        "link[id*='twentytwelve-style']",
-        "body[class*='twentytwelve-theme']"
-      ],    
+      "dom": {
+        "link[id*='twentytwelve-style']": {
+          "attributes": { 
+            "href": "themes/twentytwelve.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+          }
+        },
+        "body[class*='twentytwelve-theme']": {
+          "text": ""
+        }
+      },    
       "scripts": "themes/twentytwelve/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://wordpress.com/theme/twentytwelve"
@@ -21773,11 +21881,21 @@
       ],
       "description": "Twenty Twenty is the default WordPress theme for 2020.",
       "icon": "WordPress.svg",
-      "dom": [
-        "link[id*='twentytwenty-style']",
-        "style[id*='twentytwenty-style']",
-        "body[class*='twentytwenty-theme']"
-      ],
+      "dom": {
+        "link[id*='twentytwenty-style']": {
+          "attributes": { 
+            "href": "themes/twentytwenty.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+          }
+        },
+        "style[id*='twentytwenty-style']": {
+          "attributes": { 
+            "href": "themes/twentytwenty.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+          }
+        },
+        "body[class*='twentytwenty-theme']": {
+          "text": ""
+        }
+      }
       "scripts": "themes/twentytwenty/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://wordpress.com/theme/twentytwenty"
@@ -21788,10 +21906,16 @@
       ],
       "description": "Twenty Twenty One is the default WordPress theme for 2021",
       "icon": "WordPress.svg",
-      "dom": [
-        "link[id*='twentytwentyone-style']",
-        "body[class*='twentytwentyone-theme']"
-      ],
+      "dom": {
+        "link[id*='twentytwentyone-style']": {
+          "attributes": { 
+            "href": "themes/twentytwentyone.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+          }
+        },
+        "body[class*='twentytwentyone-theme']": {
+          "text": ""
+        }
+      },
       "scripts": "themes/twentytwentyone/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://wordpress.com/theme/twentytwentyone"

From a4ec3ebb04968ea6d33f3b887609c224cdda3a83 Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Thu, 29 Jul 2021 22:24:51 +1000
Subject: [PATCH 29/33] removed wp default themes for now

---
 src/technologies.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/technologies.json b/src/technologies.json
index a1b516cc3..98442d482 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -8170,7 +8170,7 @@
       "description": "GeneratePress is a lightweight WordPress theme that focuses on speed, stability, and accessibility",
       "icon": "generatepress.png",
       "dom": {
-        "link[id*='generatepress-style']": {
+        "link[id*='generatepress']": {
           "attributes": { 
             "href": "generatepress.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
           }
@@ -21895,7 +21895,7 @@
         "body[class*='twentytwenty-theme']": {
           "text": ""
         }
-      }
+      },
       "scripts": "themes/twentytwenty/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
       "requires": "WordPress",
       "website": "https://wordpress.com/theme/twentytwenty"

From 8edbbfbb74adf73fca5ba2b35dd07682fd65f7b9 Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Thu, 29 Jul 2021 22:25:12 +1000
Subject: [PATCH 30/33] ignore json test file

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index b71c7c1c2..26bcbd9ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ tags
 tags.*
 .idea
 /nbproject/private/
+src/out.json

From 222d1ac644d89f0758c5bfd8f7108a7259f25870 Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Thu, 29 Jul 2021 23:20:07 +1000
Subject: [PATCH 31/33] added optional capture groups to Hello El entry

---
 src/technologies.json | 232 +-----------------------------------------
 1 file changed, 2 insertions(+), 230 deletions(-)

diff --git a/src/technologies.json b/src/technologies.json
index 98442d482..4983445a1 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -9378,17 +9378,14 @@
       "dom": {
         "link[id*='hello-elementor']": {
           "attributes": { 
-            "href": "hello-elementor.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+            "href": "hello-elementor.*\\.css(?:\\?ver=([0-9.]+))\\;version:\\1"
           }
         },
         "link[id*='elementor-hello']": {
           "attributes": { 
-            "href": "elementor-hello.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+            "href": "elementor-hello.*\\.css(?:\\?ver=([0-9.]+))\\;version:\\1"
           }
         },
-        "link[id*='hello-elementor']": {
-          "text": ""
-        },
         "script[id*='hello-elementor']": {
           "text": ""
         }
@@ -21695,231 +21692,6 @@
       "scripts": "(turf@[\\d.]+)?/?turf\\.min\\.js",
       "website": "https://turfjs.org/"
     },
-    "Twenty Eleven": {
-      "cats": [
-        80
-      ],
-      "description": "Twenty Eleven is the default theme for WordPress in 2011.",
-      "icon": "WordPress.svg",
-      "dom": {
-        "link[id*='twentyeleven-style']": {
-          "attributes": { 
-            "href": "themes/twentyeleven.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
-          }
-        },
-        "body[class*='twentyeleven-theme']": {
-          "text": ""
-        }
-      },
-      "scripts": "themes/twentyeleven/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
-      "requires": "WordPress",
-      "website": "https://wordpress.com/theme/twentyeleven"
-    },
-    "Twenty Fifteen": {
-      "cats": [
-        80
-      ],
-      "description": "The annual WordPress theme for 2015 is super-clean, content-focused, and designed to bring a little more simplicity to our blogs.",
-      "icon": "WordPress.svg",
-      "dom": {
-        "link[id*='twentyfifteen-style']": {
-          "attributes": { 
-            "href": "themes/twentyfifteen.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
-          }
-        },
-        "body[class*='twentyfifteen-theme']": {
-          "text": ""
-        }
-      },
-      "scripts": "themes/twentyfifteen/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
-      "requires": "WordPress",
-      "website": "https://wordpress.com/theme/twentyfifteen"
-    },
-    "Twenty Fourteen": {
-      "cats": [
-        80
-      ],
-      "description": "The default theme for 2014 is a magazine theme with a sleek, modern, and beautifully crafted responsive design.",
-      "icon": "WordPress.svg",
-      "dom": {
-        "link[id*='twentyfourteen-style']": {
-          "attributes": { 
-            "href": "themes/twentyfourteen.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
-          }
-        },
-        "body[class*='twentyfourteen-theme']": {
-          "text": ""
-        }
-      },
-      "scripts": "themes/twentyfourteen/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
-      "requires": "WordPress",
-      "website": "https://wordpress.com/theme/twentyfourteen"
-    },
-    "Twenty Nineteen": {
-      "cats": [
-        80
-      ],
-      "description": "Twenty Nineteen is the default WordPress theme for 2019",
-      "icon": "WordPress.svg",
-      "dom": {
-        "link[id*='twentynineteen-style']": {
-          "attributes": { 
-            "href": "themes/twentynineteen.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
-          }
-        },
-        "body[class*='twentynineteen-theme']": {
-          "text": ""
-        }
-      },
-      "scripts": "themes/twentynineteen.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
-      "requires": "WordPress",
-      "website": "https://wordpress.com/theme/twentynineteen"
-    },
-    "Twenty Seventeen": {
-      "cats": [
-        80
-      ],
-      "description": "Twenty Seventeen is the default WordPress theme for 2017.",
-      "icon": "WordPress.svg",
-      "dom": {
-        "link[id*='twentyseventeen-style']": {
-          "attributes": { 
-            "href": "themes/twentyseventeen.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
-          }
-        },
-        "body[class*='twentyseventeen-theme']": {
-          "text": ""
-        }
-      },
-      "scripts": "themes/twentyseventeen/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
-      "requires": "WordPress",
-      "website": "https://wordpress.com/theme/twentyseventeen"
-    },
-    "Twenty Sixteen": {
-      "cats": [
-        80
-      ],
-      "description": "The annual WordPress theme for 2016 is a modern take on an ever-popular layout.",
-      "icon": "WordPress.svg",
-      "dom": {
-        "link[id*='twentysixteen-style']": {
-          "attributes": { 
-            "href": "themes/twentysixteen.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
-          }
-        },
-        "body[class*='twentysixteen-theme']": {
-          "text": ""
-        }
-      },
-      "scripts": "themes/twentysixteen/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
-      "requires": "WordPress",
-      "website": "https://wordpress.com/theme/twentysixteen"
-    },
-    "Twenty Thirteen": {
-      "cats": [
-        80
-      ],
-      "description": "The 2013 theme for WordPress.com is colorful, opinionated, and ready to give your blog a warm, welcoming vibe.",
-      "icon": "WordPress.svg",
-      "dom": {
-        "link[id*='twentythirteen-style']": {
-          "attributes": { 
-            "href": "themes/twentythirteen.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
-          }
-        },
-        "body[class*='twentythirteen-theme']": {
-          "text": ""
-        }
-      },
-      "scripts": "themes/twentythirteen/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
-      "requires": "WordPress",
-      "website": "https://wordpress.com/theme/twentythirteen"
-    },
-    "Twenty Ten": {
-      "cats": [
-        80
-      ],
-      "description": "Twenty Ten is the default theme for WordPress in 2010.",
-      "icon": "WordPress.svg",
-      "dom": {
-        "link[id*='twentyten-style']": {
-          "attributes": { 
-            "href": "themes/twentyten.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
-          }
-        },
-        "body[class*='twentyten-theme']": {
-          "text": ""
-        }
-      },
-      "scripts": "themes/twentyten/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
-      "requires": "WordPress",
-      "website": "https://wordpress.com/theme/twentyten"
-    },
-    "Twenty Twelve": {
-      "cats": [
-        80
-      ],
-      "description": "Twenty Twelve is an elegant, readable, and fully responsive theme that makes your site content look its best on any device.",
-      "icon": "WordPress.svg",
-      "dom": {
-        "link[id*='twentytwelve-style']": {
-          "attributes": { 
-            "href": "themes/twentytwelve.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
-          }
-        },
-        "body[class*='twentytwelve-theme']": {
-          "text": ""
-        }
-      },    
-      "scripts": "themes/twentytwelve/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
-      "requires": "WordPress",
-      "website": "https://wordpress.com/theme/twentytwelve"
-    },
-    "Twenty Twenty": {
-      "cats": [
-        80
-      ],
-      "description": "Twenty Twenty is the default WordPress theme for 2020.",
-      "icon": "WordPress.svg",
-      "dom": {
-        "link[id*='twentytwenty-style']": {
-          "attributes": { 
-            "href": "themes/twentytwenty.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
-          }
-        },
-        "style[id*='twentytwenty-style']": {
-          "attributes": { 
-            "href": "themes/twentytwenty.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
-          }
-        },
-        "body[class*='twentytwenty-theme']": {
-          "text": ""
-        }
-      },
-      "scripts": "themes/twentytwenty/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
-      "requires": "WordPress",
-      "website": "https://wordpress.com/theme/twentytwenty"
-    },
-    "Twenty Twenty-One": {
-      "cats": [
-        80
-      ],
-      "description": "Twenty Twenty One is the default WordPress theme for 2021",
-      "icon": "WordPress.svg",
-      "dom": {
-        "link[id*='twentytwentyone-style']": {
-          "attributes": { 
-            "href": "themes/twentytwentyone.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
-          }
-        },
-        "body[class*='twentytwentyone-theme']": {
-          "text": ""
-        }
-      },
-      "scripts": "themes/twentytwentyone/.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
-      "requires": "WordPress",
-      "website": "https://wordpress.com/theme/twentytwentyone"
-    },
     "TwicPics": {
       "cats": [
         31,

From fef9d6461c6fbaac7667efb7e825dfffbd1f820f Mon Sep 17 00:00:00 2001
From: Rich Hall <rjhall@gmail.com>
Date: Mon, 2 Aug 2021 17:02:57 +1000
Subject: [PATCH 32/33] Made all ver capture groups optional

---
 src/technologies.json | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/technologies.json b/src/technologies.json
index 4983445a1..ab8167f1d 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -2435,11 +2435,11 @@
         "low",
         "freemium"
       ],
-      "scripts": "themes/astra.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
+      "scripts": "themes/astra\\S*\\.js(?:\\?ver=([0-9.]+))?\\;version:\\1",
       "dom": {
         "link[href*='themes/astra']": {
           "attributes": { 
-            "href": "astra/.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+            "href": "astra\\S*\\.css(?:\\?ver=([0-9.]+))?\\;version:\\1"
           }
         },
         "style[id*='astra-theme']": {
@@ -4997,14 +4997,14 @@
       "dom": {
         "link[id*='colormag']": {
           "attributes": { 
-            "href": "themes/colormag.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+            "href": "themes/colormag\\S*\\.css(?:\\?ver=([0-9.]+))?\\;version:\\1"
           }
         },
         "body[class*='colormag-theme']": {
           "text": ""
         }
       },
-      "scripts": "themes/colormag.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
+      "scripts": "themes/colormag.*\\.js(?:\\?ver=([0-9.]+))?\\;version:\\1",
       "requires": "WordPress",
       "website": "https://themegrill.com/themes/colormag/"
     },
@@ -8172,12 +8172,12 @@
       "dom": {
         "link[id*='generatepress']": {
           "attributes": { 
-            "href": "generatepress.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+            "href": "generatepress\\S*\\.css(?:\\?ver=([0-9.]+))?\\;version:\\1"
           }
         },
         "link[id*='generate-style']": {
           "attributes": { 
-            "href": "generatepress.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+            "href": "generatepress\\S*\\.css(?:\\?ver=([0-9.]+))?\\;version:\\1"
           }
         },
         "body[class*='generatepress-theme']": {
@@ -8185,7 +8185,7 @@
         }
       },
       "scripts": [
-        "themes/generatepress.*\\.js\\?ver=([0-9.]+)\\;version:\\1"
+        "themes/generatepress\\S*\\.js(?:\\?ver=([0-9.]+))?\\;version:\\1"
       ],
       "requires": "WordPress",
       "website": "https://generatepress.com/"
@@ -9378,12 +9378,12 @@
       "dom": {
         "link[id*='hello-elementor']": {
           "attributes": { 
-            "href": "hello-elementor.*\\.css(?:\\?ver=([0-9.]+))\\;version:\\1"
+            "href": "hello-elementor\\S*\\.css(?:\\?ver=([0-9.]+))?\\;version:\\1"
           }
         },
         "link[id*='elementor-hello']": {
           "attributes": { 
-            "href": "elementor-hello.*\\.css(?:\\?ver=([0-9.]+))\\;version:\\1"
+            "href": "elementor-hello\\S*\\.css(?:\\?ver=([0-9.]+))?\\;version:\\1"
           }
         },
         "script[id*='hello-elementor']": {
@@ -9457,14 +9457,14 @@
       "dom": {
         "link[id*='hestia']": {
           "attributes": { 
-            "href": "hestia.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+            "href": "hestia\\S*\\.css(?:\\?ver=([0-9.]+))?\\;version:\\1"
           }
         },
         "body[class*='hestia-theme']": {
           "text": ""
         }
       },
-      "scripts": "themes/hestia.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
+      "scripts": "themes/hestia.*\\.js(?:\\?ver=([0-9.]+))?\\;version:\\1",
       "requires": "WordPress",
       "website": "https://themeisle.com/themes/hestia/"
     },
@@ -13927,14 +13927,14 @@
       "dom": {
         "link[id*='neve-style']": {
           "attributes": { 
-            "href": "neve.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+            "href": "neve\\S*\\.css(?:\\?ver=([0-9.]+))?\\;version:\\1"
           }
         },
         "body[class*='neve-theme']": {
           "text": ""
         }
       },
-      "scripts": "themes/neve.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
+      "scripts": "themes/neve\\S*\\.js(?:\\?ver=([0-9.]+))?\\;version:\\1",
       "requires": "WordPress",
       "website": "https://themeisle.com/themes/neve/"
     },
@@ -14227,14 +14227,14 @@
       "dom": {
         "link[id*='oceanwp']": {
           "attributes": { 
-            "href": "oceanwp.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+            "href": "oceanwp\\S*\\.css(?:\\?ver=([0-9.]+))?\\;version:\\1"
           }
         },
         "body[class*='oceanwp-theme']": {
           "text": ""
         }
       },
-      "scripts": "themes/oceanwp.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
+      "scripts": "themes/oceanwp\\S*\\.js(?:\\?ver=([0-9.]+))?\\;version:\\1",
       "requires": "WordPress",
       "website": "https://oceanwp.org"
     },
@@ -20666,14 +20666,14 @@
       "dom": {
         "link[id*='sydney']": {
           "attributes": { 
-            "href": "sydney.*\\.css\\?ver=([0-9.]+)\\;version:\\1"
+            "href": "sydney\\S*\\.css(?:\\?ver=([0-9.]+))?\\;version:\\1"
           }
         },
         "body[class*='sydney-theme']": {
           "text": ""
         }
       },
-      "scripts": "themes/sydney.*\\.js\\?ver=([0-9.]+)\\;version:\\1",
+      "scripts": "themes/sydney\\S*\\.js(?:\\?ver=([0-9.]+))?\\;version:\\1",
       "requires": "WordPress",
       "website": "https://athemes.com/theme/sydney/"
     },

From 5346dadae096bde612bff716a9872e4997f87adf Mon Sep 17 00:00:00 2001
From: Elbert Alias <77259+AliasIO@users.noreply.github.com>
Date: Wed, 4 Aug 2021 08:22:03 +1000
Subject: [PATCH 33/33] Update technologies.json

---
 src/technologies.json | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/technologies.json b/src/technologies.json
index ab8167f1d..c44166385 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -2442,13 +2442,7 @@
             "href": "astra\\S*\\.css(?:\\?ver=([0-9.]+))?\\;version:\\1"
           }
         },
-        "style[id*='astra-theme']": {
-          "text": ""
-        },
-        "body[class*='astra-']": {
-          "text": ""
-        },
-        "script[id*='astra-']": {
+        "style[id*='astra-theme'], body[class*='astra-'], script[id*='astra-']": {
           "text": ""
         }
       },
@@ -25992,4 +25986,4 @@
       "website": "https://www.xt-commerce.com"
     }
   }
-}
\ No newline at end of file
+}