diff --git a/removed_sites.json b/removed_sites.json
index 4baefbd1..1070391c 100644
--- a/removed_sites.json
+++ b/removed_sites.json
@@ -519,14 +519,6 @@
     "username_claimed": "blue",
     "username_unclaimed": "noonewouldeverusethis7"
   },
-  "Ebay": {
-    "errorMsg": "<title>eBay Profile - error</title>",
-    "errorType": "message",
-    "url": "https://www.ebay.com/usr/{}",
-    "urlMain": "https://www.ebay.com/",
-    "username_claimed": "blue",
-    "username_unclaimed": "noonewouldeverusethis7"
-  },
   "GDProfiles": {
     "errorType": "status_code",
     "url": "https://gdprofiles.com/{}",
diff --git a/removed_sites.md b/removed_sites.md
index b8398eb4..20283dc1 100644
--- a/removed_sites.md
+++ b/removed_sites.md
@@ -1027,20 +1027,6 @@ As of 2021-01-13, Travellerspoint returns false positives
   },
 ```
 
-## Ebay
-
-As of 2021-01-15, Ebay seems to be very laggy and take too long to return a response.
-```
-  "Ebay": {
-    "errorMsg": "<title>eBay Profile - error</title>",
-    "errorType": "message",
-    "url": "https://www.ebay.com/usr/{}",
-    "urlMain": "https://www.ebay.com/",
-    "username_claimed": "blue",
-    "username_unclaimed": "noonewouldeverusethis7"
-  },
-```
-
 ## GDProfiles
 
 As of 2021-06-27, GDProfiles takes way too long to respond. Must be an issue on their side.
diff --git a/sherlock/resources/data.json b/sherlock/resources/data.json
index 6808e24d..3e24ff5d 100644
--- a/sherlock/resources/data.json
+++ b/sherlock/resources/data.json
@@ -43,6 +43,13 @@
     "username_claimed": "blue",
     "username_unclaimed": "noonewouldeverusethis7"
   },
+  "Airbit": {
+    "errorType": "status_code",
+    "url": "https://airbit.com/{}",
+    "urlMain": "https://airbit.com/",
+    "username_claimed": "airbit",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "Airliners": {
     "errorType": "status_code",
     "url": "https://www.airliners.net/user/{}/profile/photos",
@@ -158,6 +165,13 @@
     "username_claimed": "blue",
     "username_unclaimed": "noonewouldeverusethis7"
   },
+  "Autofrage": {
+    "errorType": "status_code",
+    "url": "https://www.autofrage.net/nutzer/{}",
+    "urlMain": "https://www.autofrage.net/",
+    "username_claimed": "autofrage",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "Avizo": {
     "errorType": "response_url",
     "errorUrl": "https://www.avizo.cz/",
@@ -204,6 +218,13 @@
     "username_claimed": "blue",
     "username_unclaimed": "noonewouldeverusethis7"
   },
+  "Bikemap": {
+    "errorType": "status_code",
+    "url": "https://www.bikemap.net/en/u/{}/routes/created/",
+    "urlMain": "https://www.bikemap.net/",
+    "username_claimed": "bikemap",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "BinarySearch": {
     "errorMsg": "{}",
     "errorType": "message",
@@ -463,6 +484,13 @@
     "username_claimed": "blue",
     "username_unclaimed": "noonewouldeverusethis7"
   },
+  "Cryptomator Forum": {
+    "errorType": "status_code",
+    "url": "https://community.cryptomator.org/u/{}",
+    "urlMain": "https://community.cryptomator.org/",
+    "username_claimed": "michael",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "DEV Community": {
     "errorType": "status_code",
     "regexCheck": "^[a-zA-Z][a-zA-Z0-9_-]*$",
@@ -540,6 +568,22 @@
     "username_claimed": "blue",
     "username_unclaimed": "noonewouldeverusethis7"
   },
+  "eBay.com": {
+    "errorMsg": "The User ID you entered was not found. Please check the User ID and try again.",
+    "errorType": "message",
+    "url": "https://www.ebay.com/usr/{}",
+    "urlMain": "https://www.ebay.com/",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
+  "eBay.de": {
+    "errorMsg": "Der eingegebene Nutzername wurde nicht gefunden. Bitte prüfen Sie den Nutzernamen und versuchen Sie es erneut.",
+    "errorType": "message",
+    "url": "https://www.ebay.de/usr/{}",
+    "urlMain": "https://www.ebay.de/",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "Ello": {
     "errorMsg": "We couldn't find the page you're looking for",
     "errorType": "message",
@@ -548,6 +592,13 @@
     "username_claimed": "blue",
     "username_unclaimed": "noonewouldeverusethis7"
   },
+  "Envato Forum": {
+    "errorType": "status_code",
+    "url": "https://forums.envato.com/u/{}",
+    "urlMain": "https://forums.envato.com/",
+    "username_claimed": "enabled",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "Etsy": {
     "errorType": "status_code",
     "url": "https://www.etsy.com/shop/{}",
@@ -586,6 +637,13 @@
     "username_claimed": "hackerman",
     "username_unclaimed": "noonewouldeverusethis7"
   },
+  "Fameswap": {
+    "errorType": "status_code",
+    "url": "https://fameswap.com/user/{}",
+    "urlMain": "https://fameswap.com/",
+    "username_claimed": "fameswap",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "FanCentro": {
     "errorMsg": "var environment",
     "errorType": "message",
@@ -601,6 +659,13 @@
     "username_claimed": "Jungypoo",
     "username_unclaimed": "noonewouldeverusethis7"
   },
+  "Finanzfrage": {
+    "errorType": "status_code",
+    "url": "https://www.finanzfrage.net/nutzer/{}",
+    "urlMain": "https://www.finanzfrage.net/",
+    "username_claimed": "finanzfrage",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "Fiverr": {
     "errorMsg": "\"status\":\"success\"",
     "errorType": "message",
@@ -686,6 +751,14 @@
     "username_claimed": "blue",
     "username_unclaimed": "noonewouldeverusethis"
   },
+  "G2G": {
+    "errorType": "response_url",
+    "errorUrl": "https://www.g2g.com/{}",
+    "url": "https://www.g2g.com/{}",
+    "urlMain": "https://www.g2g.com/",
+    "username_claimed": "user",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "GNOME VCS": {
     "errorType": "response_url",
     "errorUrl": "https://gitlab.gnome.org/{}",
@@ -717,6 +790,27 @@
     "username_claimed": "blue",
     "username_unclaimed": "noonewouldeverusethis"
   },
+  "Genius (Artists)": {
+    "errorType": "status_code",
+    "url": "https://genius.com/artists/{}",
+    "urlMain": "https://genius.com/",
+    "username_claimed": "genius",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
+  "Genius (Users)": {
+    "errorType": "status_code",
+    "url": "https://genius.com/{}",
+    "urlMain": "https://genius.com/",
+    "username_claimed": "genius",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
+  "Gesundheitsfrage": {
+    "errorType": "status_code",
+    "url": "https://www.gesundheitsfrage.net/nutzer/{}",
+    "urlMain": "https://www.gesundheitsfrage.net/",
+    "username_claimed": "gutefrage",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "GetMyUni": {
     "errorType": "status_code",
     "url": "https://www.getmyuni.com/user/{}",
@@ -724,6 +818,14 @@
     "username_claimed": "Upneet.Grover17",
     "username_unclaimed": "noonewouldeverusethis7"
   },
+  "Ghost": {
+    "errorMsg": "Domain Error",
+    "errorType": "message",
+    "url": "https://{}.ghost.io/",
+    "urlMain": "https://ghost.org/",
+    "username_claimed": "troyhunt",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "Giphy": {
     "errorType": "status_code",
     "url": "https://giphy.com/{}",
@@ -731,6 +833,13 @@
     "username_claimed": "blue",
     "username_unclaimed": "noonewouldeverusethis7"
   },
+  "GitBook": {
+    "errorType": "status_code",
+    "url": "https://{}.gitbook.io/",
+    "urlMain": "https://gitbook.com/",
+    "username_claimed": "gitbook",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "GitHub": {
     "errorType": "status_code",
     "regexCheck": "^[a-zA-Z0-9](?:[a-zA-Z0-9]|-(?=[a-zA-Z0-9])){0,38}$",
@@ -778,6 +887,14 @@
     "username_claimed": "jetbrains",
     "username_unclaimed": "noonewouldeverusethis7"
   },
+  "Grailed": {
+    "errorType": "response_url",
+    "errorUrl": "https://www.grailed.com/{}",
+    "url": "https://www.grailed.com/{}",
+    "urlMain": "https://www.grailed.com/",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "Gravatar": {
     "errorType": "status_code",
     "regexCheck": "^((?!\\.).)*$",
@@ -808,6 +925,13 @@
     "username_claimed": "blue",
     "username_unclaimed": "noonewouldeverusethis7"
   },
+  "Gutefrage": {
+    "errorType": "status_code",
+    "url": "https://www.gutefrage.net/nutzer/{}",
+    "urlMain": "https://www.gutefrage.net/",
+    "username_claimed": "gutefrage",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "HEXRPG": {
     "errorMsg": "Error : User ",
     "errorType": "message",
@@ -934,6 +1058,13 @@
     "username_claimed": "blue",
     "username_unclaimed": "noonewouldeverusethis7"
   },
+  "Ionic Forum": {
+    "errorType": "status_code",
+    "url": "https://forum.ionicframework.com/u/{}",
+    "urlMain": "https://forum.ionicframework.com/",
+    "username_claimed": "theblue222",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "Issuu": {
     "errorType": "status_code",
     "url": "https://issuu.com/{}",
@@ -972,6 +1103,20 @@
     "username_claimed": "jenny",
     "username_unclaimed": "noonewouldeverusethis7"
   },
+  "Joplin Forum": {
+    "errorType": "status_code",
+    "url": "https://discourse.joplinapp.org/u/{}",
+    "urlMain": "https://discourse.joplinapp.org/",
+    "username_claimed": "laurent",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
+  "KEAKR": {
+    "errorType": "status_code",
+    "url": "https://www.keakr.com/en/profile/{}",
+    "urlMain": "https://www.keakr.com/",
+    "username_claimed": "beats",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "Kaggle": {
     "errorType": "status_code",
     "url": "https://www.kaggle.com/{}",
@@ -1048,6 +1193,14 @@
     "username_claimed": "anne",
     "username_unclaimed": "noonewouldeverusethis7"
   },
+  "Listed": {
+    "errorType": "response_url",
+    "errorUrl": "https://listed.to/@{}",
+    "url": "https://listed.to/@{}",
+    "urlMain": "https://listed.to/",
+    "username_claimed": "listed",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "LiveJournal": {
     "errorType": "status_code",
     "regexCheck": "^[a-zA-Z][a-zA-Z0-9_-]*$",
@@ -1072,6 +1225,21 @@
     "username_claimed": "blue",
     "username_unclaimed": "noonewouldeverusethis7"
   },
+  "LottieFiles": {
+    "errorType": "status_code",
+    "url": "https://lottiefiles.com/{}",
+    "urlMain": "https://lottiefiles.com/",
+    "username_claimed": "lottiefiles",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
+  "Mapify": {
+    "errorType": "response_url",
+    "errorUrl": "https://mapify.travel/{}",
+    "url": "https://mapify.travel/{}",
+    "urlMain": "https://mapify.travel/",
+    "username_claimed": "mapify",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "Medium": {
     "errorMsg": "<body",
     "errorType": "message",
@@ -1096,6 +1264,13 @@
     "username_claimed": "jenny",
     "username_unclaimed": "noonewouldeverusethis7"
   },
+  "Motorradfrage": {
+    "errorType": "status_code",
+    "url": "https://www.motorradfrage.net/nutzer/{}",
+    "urlMain": "https://www.motorradfrage.net/",
+    "username_claimed": "gutefrage",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "Munzee": {
     "errorType": "status_code",
     "url": "https://www.munzee.com/m/{}",
@@ -1163,6 +1338,13 @@
     "username_claimed": "blue",
     "username_unclaimed": "noonewould"
   },
+  "Needrom": {
+    "errorType": "status_code",
+    "url": "https://www.needrom.com/author/{}/",
+    "urlMain": "https://www.needrom.com/",
+    "username_claimed": "needrom",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "Newgrounds": {
     "errorType": "status_code",
     "regexCheck": "^[a-zA-Z][a-zA-Z0-9_-]*$",
@@ -1210,6 +1392,13 @@
     "username_claimed": "blue",
     "username_unclaimed": "noonewouldeverusethis7"
   },
+  "OGUsers": {
+    "errorType": "status_code",
+    "url": "https://ogusers.com/{}",
+    "urlMain": "https://ogusers.com/",
+    "username_claimed": "ogusers",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "OK": {
     "errorType": "status_code",
     "regexCheck": "^[a-zA-Z][a-zA-Z0-9_.-]*$",
@@ -1416,6 +1605,13 @@
     "username_claimed": "blue",
     "username_unclaimed": "noonewouldeverusethis7"
   },
+  "Rclone Forum": {
+    "errorType": "status_code",
+    "url": "https://forum.rclone.org/u/{}",
+    "urlMain": "https://forum.rclone.org/",
+    "username_claimed": "ncw",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "Redbubble": {
     "errorType": "status_code",
     "url": "https://www.redbubble.com/people/{}",
@@ -1434,6 +1630,13 @@
     "username_claimed": "blue",
     "username_unclaimed": "noonewouldeverusethis7"
   },
+  "Reisefrage": {
+    "errorType": "status_code",
+    "url": "https://www.reisefrage.net/nutzer/{}",
+    "urlMain": "https://www.reisefrage.net/",
+    "username_claimed": "reisefrage",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "Replit.com": {
     "errorType": "status_code",
     "url": "https://replit.com/@{}",
@@ -1490,6 +1693,13 @@
     "username_claimed": "Blue",
     "username_unclaimed": "noonewouldev"
   },
+  "SWAPD": {
+    "errorType": "status_code",
+    "url": "https://swapd.co/u/{}",
+    "urlMain": "https://swapd.co/",
+    "username_claimed": "swapd",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "Sbazar.cz": {
     "errorType": "status_code",
     "url": "https://www.sbazar.cz/{}",
@@ -1519,6 +1729,13 @@
     "username_claimed": "blue",
     "username_unclaimed": "noonewouldeverusethis"
   },
+  "Shpock": {
+    "errorType": "status_code",
+    "url": "https://www.shpock.com/shop/{}/items",
+    "urlMain": "https://www.shpock.com/",
+    "username_claimed": "user",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "Signal": {
     "errorMsg": "Oops! That page doesn\u2019t exist or is private.",
     "errorType": "message",
@@ -1617,6 +1834,13 @@
     "username_claimed": "3Tau",
     "username_unclaimed": "noonewould"
   },
+  "Splice": {
+    "errorType": "status_code",
+    "url": "https://splice.com/{}",
+    "urlMain": "https://splice.com/",
+    "username_claimed": "splice",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "Splits.io": {
     "errorType": "status_code",
     "url": "https://splits.io/users/{}",
@@ -1631,6 +1855,13 @@
     "username_claimed": "blue",
     "username_unclaimed": "noonewouldeverusethis7"
   },
+  "Sportlerfrage": {
+    "errorType": "status_code",
+    "url": "https://www.sportlerfrage.net/nutzer/{}",
+    "urlMain": "https://www.sportlerfrage.net/",
+    "username_claimed": "sportlerfrage",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "SportsRU": {
     "errorType": "status_code",
     "url": "https://www.sports.ru/profile/{}/",
@@ -1700,6 +1931,13 @@
     "username_claimed": "kevin",
     "username_unclaimed": "noonewouldeverusethi"
   },
+  "TRAKTRAIN": {
+    "errorType": "status_code",
+    "url": "https://traktrain.com/{}",
+    "urlMain": "https://traktrain.com/",
+    "username_claimed": "traktrain",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "Telegram": {
     "errorMsg": "<meta property=\"og:description\" content=\"\">",
     "errorType": "message",
@@ -1724,6 +1962,13 @@
     "username_claimed": "red",
     "username_unclaimed": "impossibleusername"
   },
+  "ThemeForest": {
+    "errorType": "status_code",
+    "url": "https://themeforest.net/user/{}",
+    "urlMain": "https://themeforest.net/",
+    "username_claimed": "user",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "TikTok": {
     "errorType": "status_code",
     "url": "https://tiktok.com/@{}",