diff --git a/public/arf.json b/public/arf.json
index c9df425..2f0c598 100644
--- a/public/arf.json
+++ b/public/arf.json
@@ -64,11 +64,6 @@
         "type": "url",
         "url": "https://www.google.com/search?q=site:amazon.com+%3Cusername%3E"
       },
-      {
-        "name": "Amazon Wishlists",
-        "type": "url",
-        "url": "https://www.amazon.com/gp/registry/search.html/?ie=UTF8&type=wishlist"
-      },
       {
         "name": "Github User (M)",
         "type": "url",
@@ -132,7 +127,7 @@
       {
         "name": "theHarvester (T)",
         "type": "url",
-        "url": "http://www.edge-security.com/theharvester.php"
+        "url": "https://github.com/laramies/theHarvester"
       },
       {
         "name": "Infoga (T)",
@@ -289,11 +284,6 @@
     "children": [
     {
       "children": [
-      {
-        "name": "DNStable",
-        "type": "url",
-        "url": "https://dnstable.com/"
-      },
       {
         "name": "Domain Dossier",
         "type": "url",
@@ -309,31 +299,16 @@
         "type": "url",
         "url": "http://whois.domaintools.com/"
       },
-      {
-        "name": "DNStable",
-        "type": "url",
-        "url": "https://dnstable.com/"
-      },
       {
         "name": "Domain Big Data",
         "type": "url",
         "url": "http://domainbigdata.com/"
       },
-      {
-        "name": "DNS Dumpster",
-        "type": "url",
-        "url": "https://dnsdumpster.com/"
-      },
       {
         "name": "Whoisology",
         "type": "url",
         "url": "https://whoisology.com/#advanced"
       },
-      {
-        "name": "Domain History",
-        "type": "url",
-        "url": "http://www.domainhistory.net/"
-      },
       {
         "name": "Whois ARIN",
         "type": "url",
@@ -342,10 +317,10 @@
       {
         "name": "DNSstuff",
         "type": "url",
-        "url": "http://www.dnsstuff.com/tools"
+        "url": "https://tools.dnsstuff.com/"
       },
       {
-        "name": "Robtex",
+        "name": "Robtex (R)",
         "type": "url",
         "url": "https://www.robtex.com/"
       },
@@ -357,7 +332,7 @@
       {
         "name": "MarkMonitor Whois Search",
         "type": "url",
-        "url": "https://www.markmonitor.com/cgi-bin/affsearch.cgi?"
+        "url": "https://domains.markmonitor.com/whois/"
       },
       {
         "name": "easyWhois",
@@ -375,9 +350,9 @@
         "url": "https://who.is/"
       },
       {
-        "name": "Whoismind",
+        "name": "Whois AMPed",
         "type": "url",
-        "url": "http://www.whoismind.com/"
+        "url": "https://whoisamped.com/"
       },
       {
         "name": "ViewDNS.info",
@@ -417,7 +392,7 @@
       {
         "name": "Recon-ng (T)",
         "type": "url",
-        "url": "https://bitbucket.org/LaNMaSteR53/recon-ng"
+        "url": "https://github.com/lanmaster53/recon-ng"
       },
       {
         "name": "XRay",
@@ -447,7 +422,7 @@
       {
         "name": "theHarvester (T)",
         "type": "url",
-        "url": "http://www.edge-security.com/theharvester.php"
+        "url": "https://github.com/laramies/theHarvester"
       },
       {
         "name": "Pentest-tools.com Subdomains",
@@ -509,6 +484,11 @@
         "type": "url",
         "url": "https://urlscan.io/search/#*"
       },
+      {
+        "name": "Daily DNS Changes",
+        "type": "url",
+        "url": "http://www.dailychanges.com/"
+      },
       {
         "name": "SameID",
         "type": "url",
@@ -540,9 +520,9 @@
         "url": "https://www.certificate-transparency.org/known-logs"
       },
       {
-        "name": "CertDB",
+        "name": "Spyse",
         "type": "url",
-        "url": "https://certdb.com/"
+        "url": "https://spyse.com/search/certificate"
       },
       {
         "name": "Censys",
@@ -558,11 +538,6 @@
         "name": "certgraph (T)",
         "type": "url",
         "url": "https://github.com/lanrat/certgraph"
-      },
-      {
-        "name": "CertDB",
-        "type": "url",
-        "url": "https://certdb.com/"
       }],
       "name": "Certificate Search",
       "type": "folder"
@@ -604,6 +579,11 @@
     },
     {
       "children": [
+      {
+        "name": "AbuseIPDB (Webpage and API)",
+        "type": "url",
+        "url": "https://www.abuseipdb.com/"
+      },
       {
         "name": "UrlQuery.net",
         "type": "url",
@@ -1105,11 +1085,6 @@
           "name": "Sn1per (T)",
           "type": "url",
           "url": "https://github.com/1N3/Sn1per"
-        },
-        {
-          "name": "Mage Scan",
-          "type": "url",
-          "url": "https://magescan.com/"
         }],
         "name": "Scanners",
         "type": "folder"
@@ -1209,11 +1184,6 @@
         "type": "url",
         "url": "https://db-ip.com/"
       },
-      {
-        "name": "ipintel.io",
-        "type": "url",
-        "url": "https://ipintel.io/"
-      },
       {
         "name": "IP Location Finder",
         "type": "url",
@@ -1252,18 +1222,13 @@
       {
         "name": "Spyse",
         "type": "url",
-        "url": "https://spyse.com/"
+        "url": "https://spyse.com/search/ip"
       },
       {
         "name": "Shodan",
         "type": "url",
         "url": "https://www.shodan.io/"
       },
-      {
-        "name": "Portmap",
-        "type": "url",
-        "url": "https://portmap.com/"
-      },  
       {
         "name": "Scans.io",
         "type": "url",
@@ -1293,6 +1258,11 @@
         "name": "Scanless",
         "type": "url",
         "url": "https://github.com/vesche/scanless"
+      },
+      {
+        "name": "Masscan (T)",
+        "type": "url",
+        "url": "https://github.com/robertdavidgraham/masscan"
       }],
       "name": "Host / Port Discovery",
       "type": "folder"
@@ -1443,11 +1413,6 @@
         "name": "MyIPNeighbors",
         "type": "url",
         "url": "http://www.my-ip-neighbors.com/"
-      },
-      {
-        "name": "Same IP",
-        "type": "url",
-        "url": "http://www.sameip.org/"
       }],
       "name": "Neighbor Domains",
       "type": "folder"
@@ -1778,21 +1743,11 @@
           "type": "url",
           "url": "http://fotoforensics.com/"
         },
-        {
-          "name": "Izitru",
-          "type": "url",
-          "url": "http://www.izitru.com/"
-        },
         {
           "name": "Ghiro (T)",
           "type": "url",
           "url": "https://github.com/ghirensics/ghiro"
         },
-        {
-          "name": "Stolen Camera Finder",
-          "type": "url",
-          "url": "http://www.stolencamerafinder.co.uk/"
-        },
         {
           "name": "Camera Trace",
           "type": "url",
@@ -2195,16 +2150,6 @@
         }],
         "name": "Analytics",
         "type": "folder"
-      },
-      {
-        "children": [
-        {
-          "name": "ExtractFace (T)",
-          "type": "url",
-          "url": "http://le-tools.com/ExtractFace.html#download"
-        }],
-        "name": "Archive / Document",
-        "type": "folder"
       }],
       "name": "Facebook",
       "type": "folder"
@@ -2586,11 +2531,6 @@
         "type": "url",
         "url": "http://subreddits.org/"
       },
-      {
-        "name": "Reddit Investigator",
-        "type": "url",
-        "url": "http://www.redditinvestigator.com/"
-      },
       {
         "name": "Reddit Comment History",
         "type": "url",
@@ -2728,11 +2668,6 @@
       }],
       "name": "Search",
       "type": "folder"
-    },
-    {
-      "name": "Social Media Monitoring Wiki",
-      "type": "url",
-      "url": "http://wiki.kenburbary.com/social-meda-monitoring-wiki"
     }],
     "name": "Social Networks",
     "type": "folder"
@@ -2861,11 +2796,6 @@
         "type": "url",
         "url": "http://www.peekyou.com/"
       },
-      {
-        "name": "PeepDB",
-        "type": "url",
-        "url": "http://www.peepdb.com/"
-      },
       {
         "name": "Reverse Genie People",
         "type": "url",
@@ -2961,11 +2891,6 @@
         "type": "url",
         "url": "http://www.genealogy.com/"
       },
-      {
-        "name": "The New Ultimates",
-        "type": "url",
-        "url": "http://www.newultimates.com/"
-      },
       {
         "name": "My Life",
         "type": "url",
@@ -3139,6 +3064,16 @@
       "type": "url",
       "url": "http://www.blackpeoplemeet.com/"
     },
+    {
+      "name": "Bumble",
+      "type": "url",
+      "url": "https://bumble.com/"
+    },
+    {
+      "name": "Hinge",
+      "type": "url",
+      "url": "https://hinge.co/en-gb"
+    },
     {
       "children": [
       {
@@ -3457,11 +3392,6 @@
         "name": "Moose Roots Birth Records",
         "type": "url",
         "url": "http://birth-records.mooseroots.com/"
-      },
-      {
-        "name": "Birth Database",
-        "type": "url",
-        "url": "http://www.birthdatabase.com/"
       }],
       "name": "Birth Records",
       "type": "folder"
@@ -4216,11 +4146,6 @@
       "type": "url",
       "url": "http://openstreetcam.org/"
     },
-    {
-      "name": "Dronetheworld",
-      "type": "url",
-      "url": "http://www.dronetheworld.com/"
-    },
     {
       "name": "Travel by Drone",
       "type": "url",
@@ -5229,7 +5154,7 @@
     {
       "name": "FOCA (T)",
       "type": "url",
-      "url": "https://www.elevenpaths.com/labstools/foca/index.html"
+      "url": "https://github.com/ElevenPaths/FOCA"
     },
     {
       "name": "CodeTwo Outlook Export (T)",
@@ -5701,11 +5626,6 @@
       "type": "url",
       "url": "http://www.totalcraigsearch.com/"
     },
-    {
-      "name": "Backpage",
-      "type": "url",
-      "url": "http://www.backpage.com/"
-    },
     {
       "name": "Search Tempest",
       "type": "url",
@@ -5875,6 +5795,11 @@
         "type": "url",
         "url": "http://www.spiderfoot.net/"
       },
+      {
+        "name": "ThreatPipes (T)",
+        "type": "url",
+        "url": "https://www.threatpipes.com"
+      },
       {
         "name": "Omnibus (T)",
         "type": "url",
@@ -6002,11 +5927,21 @@
       }],
       "name": "Virtual Machines",
       "type": "folder"
+     },
+     {
+      "children": [
+      {
+        "name": "OWASP D4N155 (T)",
+        "type": "url",
+        "url": "https://github.com/OWASP/D4N155"
+      }],
+      "name": "Wordlist",
+      "type": "folder"
     },
     {
       "name": "Paterva / Maltego (T)",
       "type": "url",
-      "url": "http://www.paterva.com/web6/products/maltego.php"
+      "url": "https://www.maltego.com/"
     },
     {
       "name": "Epic Privacy Browser (T)",
@@ -6309,10 +6244,15 @@
       "url": "https://nvd.nist.gov/"
     },
     {
-      "name": "OSVDB: Open Sourced Vulnerability Database",
+      "name": "OSV Vulnerability Library",
       "type": "url",
-      "url": "http://osvdb.org/"
+      "url": "https://osv.dev/list"
     },
+    {
+      "name": "Mend Vulnerability Database",
+      "type": "url",
+      "url": "https://www.mend.io/vulnerability-database/"
+    },    
     {
       "name": "CVE Details",
       "type": "url",
@@ -6492,6 +6432,11 @@
       "name": "Mr.Looquer IOC Feed - 1st Dual Stack Threat Feed",
       "type": "url",
       "url": "https://iocfeed.mrlooquer.com"
+    },
+    {
+      "name": "REScure Cyber Threat Intelligence Project",
+      "type": "url",
+      "url": "https://rescure.me/feeds.html"
     }],
     "name": "Threat Intelligence",
     "type": "folder"
@@ -6731,11 +6676,6 @@
         "type": "url",
         "url": "http://backgroundchecks.org/justdeleteme/"
       },
-      {
-        "name": "Accountkiller.com",
-        "type": "url",
-        "url": "https://www.accountkiller.com/en"
-      },
       {
         "name": "The Internet Privacy Handbook",
         "type": "url",
@@ -6881,11 +6821,6 @@
         "type": "url",
         "url": "http://labs.teehanlax.com/project/hyperlapse"
       },
-      {
-        "name": "Google Maps Streetview Player",
-        "type": "url",
-        "url": "http://brianfolts.com/driver/"
-      },
       {
         "name": "ZeeMaps",
         "type": "url",