diff --git a/migration.md b/migration.md
index e4374e90..1ee02204 100644
--- a/migration.md
+++ b/migration.md
@@ -1,6 +1,6 @@
 We need to move these people over to the data.js file:
 
-https://github.com/wesbos/awesome-uses/blob/website/src/data.js
+https://github.com/wesbos/awesome-uses/blob/master/src/data.js
 
 Grab a random person, and fill out the info as best as possible.
 
diff --git a/readme.md b/readme.md
index 9ec85c64..ed5f14e3 100644
--- a/readme.md
+++ b/readme.md
@@ -30,8 +30,10 @@ This readme is auto-generated from the data.js file, so please don't PR this fil
 # Awesome Uses ![Awesome][awesome-badge]
 
 * [Wes Bos](https://wesbos.com/uses) — Maker of this site. Web Developer, Tutorial Maker, Syntax.fm Podcaster, BBQ Lover
+* [Matt Jennings](https://mattjennings.io/uses) — web dev, hockey | tradebreaker.io
 * [Jason Cory Alvernaz](https://jasoncoryalvernaz.com/uses) — Web Developer, Blogger, YouTuber, and Dog Lover. Not necessarily in that order.
 * [Alessia Bellisario](https://aless.co/uses) — Web engineer, mechanical keyboard builder, plotter art maker.
+* [Sam Cross](https://sam-cross.github.io/uses) — "Developer", IT student, frequent traveller by coach, addicted to music.
 * [Praveen Kumar Purushothaman](https://blog.praveen.science/my-personal-development-environment/) — Cook, Cat Lover, Front End Architect, Full Stack Web Developer Evangelist & Cloud Computing Consultant.
 * [Rene Pot](https://renepot.com/uses) — Developer Evangelist, JavaScript Developer, Cross-Platform App Developer and gamer
 * [Gant Laborde](http://gantlaborde.com/uses/) — Speaker, GDE Web/ML, Podcaster, Trainer, Speaker, Author, Podcaster
@@ -46,7 +48,6 @@ This readme is auto-generated from the data.js file, so please don't PR this fil
 * [Josiah Wiebe](https://jwie.be/uses/) — Designer & developer, lifelong learner.
 * [Benjamin Lannon](https://lannonbr.com/uses/) — Web Developer, Open Source Contributor, Livestreamer
 * [Braden Watkins](https://bradenwatkins.dev/uses) — Student, Full Stack Developer, Lover of all things analog
-* [Rick Calder](https://calder.io) — Full Stack Developer, Amateur Writer mostly hockey and development, Hack Musician
 * [Lauro Silva](https://laurosilva.com/uses) — Software Engineer and Technical Writer
 * [Nuno Maduro](https://nunomaduro.com/uses/) — Software engineer, Open Source contributor, Speaker
 * [Adrian Marin](https://adrianthedev.com/uses) — Product-Minded Software Engineer, Digital nomad, no-nonsense enjoyer of life, friends and family.
@@ -73,7 +74,7 @@ This readme is auto-generated from the data.js file, so please don't PR this fil
 * [Christopher Hranj](https://brodan.biz/uses) — Software Engineer, Blogger, Musician, Ultimate player.
 * [Vincent Ramdhanie](https://vincentramdhanie.com/uses) — Software Developer, Lecturer, Technical Writer and Mentor
 * [Amir R Muntasser](https://arkm.xyz/uses/) — Web Developer, #vuenicorn wizard, Oxford comma enthusiast, and inventor of the ol' razzle dazzle.
-* [Pavel Melnik](https://pavel.dev/uses) — Web developer, Technology enthusiast, Energy Management System expert
+* [Pavel Melnik](https://theopract.gitlab.io/pavel-dev/uses/) — Web developer, Technology enthusiast, Energy Management System expert
 * [Miguel Ángel Durán](https://midu.dev/uses) — Front end passionate, Web Performance freak, casual speaker, <WTFront! /> podcast host, and gamer.
 * [David Llop](https://davidllop.com/uses) — Full stack developer from Girona. Open Source contributor. Always Learning.
 * [Josh Manders](https://joshmanders.com/uses/) — Full Snack Developer and Indie Maker
@@ -86,7 +87,6 @@ This readme is auto-generated from the data.js file, so please don't PR this fil
 * [Erno Salo](https://endormi.io/uses/) — Full Stack Developer and Open Source Contributor
 * [Gokulakrishnan Kalaikovan](https://gokul.site/uses) — Web Developer, GDE, Open Source contributor, Speaker
 * [James Brooks](https://james.brooks.page/uses/) — Software Developer at Laravel and Podcaster
-* [Douglas Andreani](https://andreanidr.com) — Software Engineer and Tinkerer
 * [Byurhan Beyzat](https://byurhanbeyzat.com/uses) — Front-End Developer. Engineer. Occasional blogger.
 * [Richard Palacios G.](https://www.richardpalaciosg.dev/uses) — Web Developer, passionate apprentice, Community co-organizer
 * [Mike Barkmin](https://www.barkmin.eu/uses/) — I'm a passionate developer and researcher at the University of Duisburg-Essen at the chair of Computer Science Education.
@@ -95,7 +95,6 @@ This readme is auto-generated from the data.js file, so please don't PR this fil
 * [Diego Vazquez](https://gist.github.com/diurivj/78ca931c4b20dca1e1e13982fa9c309d) — Young guy who loves code. Full Stack Web Developer. Lead Teacher @ Ironhack
 * [Rafael Quintanilha](https://rafaelquintanilha.com/about#uses) — Software Engineer. Blogs about Web Development, Front-end, React, UI/UX, Accessibility.
 * [Ben Leivian](https://benleivian.com/uses) — A “seasoned” full-stack developer & visual designer 🍔
-* [Mike Williamson](http://dikuw.com/) — Into IoT, BLE, node.js, Android and iOS native apps
 * [Roman Husar](https://seemslikelegit.com/uses) — Tinkering, all the time.
 * [Stephen Senkomago Musoke](https://ssmusoke.com/uses) — Software Engineer, eHealth Technologist, PHP Lover by night, Muganda, Goat Meat for Life, Coffee Drinker
 * [Jérémy Mouzin](https://jeremymouzin.com/uses) — Software Engineer, Tutorial Maker, Entrepreneur, Blogger
@@ -103,7 +102,6 @@ This readme is auto-generated from the data.js file, so please don't PR this fil
 * [Scott Spence](https://scottspence.me#uses) — Father, husband 👨‍👩‍👧 Web Developer. Just In Time learner ❤️ 👍 http://my.pronoun.is/he
 * [Georgi Yanev](https://gyanev.com/uses/) — Software Engineer, FPV Drone Pilot, Blogger, YouTuber
 * [Karl Horky](https://github.com/karlhorky/uses/blob/master/readme.md) — Founder, Teacher at https://upleveled.io
-* [Andrej Jovanovic](https://blog.andrejjovanovic.com/uses) — DevOps System Engineer, Coder, Hardworker
 * [Josh Farrant](https://farrant.me/uses) — Full-Stack JavaScript developer, creator of Shortcuts JS, astrophysicist and private pilot. I turn coffee, alchemy-like, into code.
 * [Martin Chammah](https://martinchammah.dev/uses) — Full Stack Gatsby Developer @ ecomerciar
 * [Pedro Assunção](https://pedroassuncao.com/pages/uses) — Senior Fullstack Software Developer, Tutorial Maker, Blogger
@@ -134,6 +132,15 @@ This readme is auto-generated from the data.js file, so please don't PR this fil
 * [Elliot Bonneville](https://elliotbonneville.com/uses) — Freelance Web Developer / Consultant, educator, lover of coffee, cats, and writing of all kinds.
 * [John Garrett](https://johngarrett.dev/uses) — Arch Duke of Computering, Full Stack Instructor
 * [Dieter Stinglhamber](https://www.dieterstinglhamber.me/uses/) — Developer, human, nerd.
-* [Thomas Weibenfalk](https://www.weibenfalk.com/uses/) — Passionate developer, course creator, youtuber, designer and musician from Sweden
+* [Thomas Weibenfalk](https://www.weibenfalk.com/uses/) — Passionate developer, course creator, youtuber, designer and musician from Sweden
+* [Eduardo Reveles](https://www.osiux.ws/about/uses) — Web Engineer, Husband, Gamer.
+* [Oscar Sánchez](https://devlusaja.com) — Passionate developer, traveler and drummer from Perú
+* [Thomas Maximini](https://www.maxi.io/uses/) — Freelance software developer from Germany.
+* [Philip Theobald](https://www.philiptheobald.com/uses/) — Guitar player, motorcyclist, software engineer, entreprenuer
+* [Alejandro G. Anglada](https://aganglada.com/uses/) — Dad 👪🔥⚡️ Web Engineer ⚛️🚀 #typescript all over the place 👌
+* [Antoni Kepinski](https://kepinski.me/uses/) — Node Fetch maintainer // Into Node.js and Rust
+* [Marcus Obst](https://marcus-obst.de/uses) — Webdeveloper, Music Lover
+* [Pawel Grzybek](https://pawelgrzybek.com/uses/) — Software Engineer
+* [Eric McCormick](https://edm00se.codes/uses/) — Software Developer, IBM Champion, coffee lover, dabbler in all things technology, hobbyist 3d design and printing
 
 [awesome-badge]: https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg
diff --git a/src/data.js b/src/data.js
index c13c3de5..ee050ecb 100644
--- a/src/data.js
+++ b/src/data.js
@@ -36,6 +36,24 @@ const pages = [
       'CSS',
     ],
   },
+  {
+    name: 'Matt Jennings',
+    description:
+      'web dev, hockey | tradebreaker.io',
+    url: 'https://mattjennings.io/uses',
+    twitter: '@mattjennings44',
+    emoji: '🏒',
+    country: '🇨🇦',
+    computer: 'apple',
+    phone: 'iphone',
+    tags: [
+      'Developer',
+      'Full Stack',
+      'JavaScript',
+      'React',
+      'Hockey'
+    ],
+  },
   {
     name: 'Jason Cory Alvernaz',
     description:
@@ -78,6 +96,23 @@ const pages = [
       'Blogger',
     ],
   },
+  {
+  	name: 'Sam Cross',
+  	description: '"Developer", IT student, frequent traveller by coach, addicted to music.',
+  	url: 'https://sam-cross.github.io/uses',
+  	twitter: '@samcrxss',
+  	emoji: '🎵',
+  	country: '🇬🇧',
+  	computer: 'windows',
+  	phone: 'android',
+  	tags: [
+  		'Developer',
+  		'JavaScript',
+  		'React',
+  		'Node',
+  		'CSS',
+  	]
+  },
   {
     name: 'Praveen Kumar Purushothaman',
     description:
@@ -353,26 +388,6 @@ const pages = [
       'Golang',
     ],
   },
-  {
-    name: 'Rick Calder',
-    description:
-      'Full Stack Developer, Amateur Writer mostly hockey and development, Hack Musician',
-    url: 'https://calder.io',
-    twitter: '@calder12',
-    emoji: '🤷🏾‍♂️',
-    country: '🇨🇦',
-    computer: 'windows',
-    phone: 'android',
-    tags: [
-      'Full Stack',
-      'Developer',
-      'Web Developer',
-      'JavaScript',
-      'PHP',
-      'Elixir',
-      'Go',
-    ],
-  },
   {
     name: 'Lauro Silva',
     description: 'Software Engineer and Technical Writer',
@@ -569,8 +584,8 @@ const pages = [
       'Teacher',
       'Back End',
       'Laravel',
-      'Vuejs',
-      'Tailwindcss',
+      'Vue',
+      'Tailwind CSS',
       'PHP',
       'JavaScript',
     ],
@@ -830,7 +845,7 @@ const pages = [
     name: 'Pavel Melnik',
     description:
       'Web developer, Technology enthusiast, Energy Management System expert',
-    url: 'https://pavel.dev/uses',
+    url: 'https://theopract.gitlab.io/pavel-dev/uses/',
     twitter: '@theopract',
     emoji: '🤟',
     country: '🇷🇺',
@@ -863,7 +878,7 @@ const pages = [
       'Full Stack',
       'Engineer',
       'JavaScript',
-      'Typescript',
+      'TypeScript',
       'React',
       'Accessibility',
       'Performance',
@@ -1050,17 +1065,6 @@ const pages = [
       'JavaScript',
     ],
   },
-  {
-    name: 'Douglas Andreani',
-    description: 'Software Engineer and Tinkerer',
-    url: 'https://andreanidr.com',
-    twitter: '@andreanidouglas',
-    emoji: '🐱‍🐉',
-    country: '🇧🇷',
-    computer: 'linux',
-    phone: 'android',
-    tags: ['Developer', 'Back End', 'C', 'Go', 'Rust', 'C#'],
-  },
   {
     name: 'Byurhan Beyzat',
     description: 'Front-End Developer. Engineer. Occasional blogger.',
@@ -1092,7 +1096,7 @@ const pages = [
     phone: 'android',
     tags: [
       'Developer',
-      'Javascript',
+      'JavaScript',
       'Front End',
       'BackEnd',
       'Community',
@@ -1230,24 +1234,6 @@ const pages = [
       'Docker',
     ],
   },
-  {
-    name: 'Mike Williamson',
-    description: 'Into IoT, BLE, node.js, Android and iOS native apps',
-    url: 'http://dikuw.com/',
-    twitter: '@dikuw',
-    emoji: '💻',
-    country: '🇺🇸',
-    computer: 'windows',
-    phone: 'iphone',
-    tags: [
-      'Developer',
-      'Full Stack',
-      'Entrepreneur',
-      'JavaScript',
-      'Node',
-      'CSS',
-    ],
-  },
   {
     name: 'Roman Husar',
     description: 'Tinkering, all the time.',
@@ -1398,26 +1384,6 @@ const pages = [
       'GraphQL',
     ],
   },
-  {
-    name: 'Andrej Jovanovic',
-    description: 'DevOps System Engineer, Coder, Hardworker',
-    url: 'https://blog.andrejjovanovic.com/uses',
-    twitter: '@andrejovanovic1',
-    emoji: '💡',
-    country: '🇭🇷',
-    computer: 'windows',
-    phone: 'android',
-    tags: [
-      'DevOps',
-      'Engineer',
-      'Designer',
-      'Full Stack',
-      'JavaScript',
-      'React',
-      'Python',
-      'Go',
-    ],
-  },
   {
     name: 'Josh Farrant',
     description:
@@ -1544,12 +1510,12 @@ const pages = [
       'Engineer',
       'Teacher',
       'Blogger',
-      'Javascript',
+      'JavaScript',
       'Node',
-      'Typescript',
+      'TypeScript',
       'PHP',
       'React',
-      'GraphQl',
+      'GraphQL',
       'GatsbyJs',
     ],
   },
@@ -1566,8 +1532,8 @@ const pages = [
       'Developer',
       'Angular',
       'YouTuber',
-      'Typescript',
-      'Javascript',
+      'TypeScript',
+      'JavaScript',
       'CSS',
       'Node',
       'Teacher',
@@ -1892,7 +1858,7 @@ const pages = [
     tags: [
       'Developer',
       'Full Stack',
-      'Graphql',
+      'GraphQL',
       'Teacher',
       'Speaker',
       'JavaScript',
@@ -2064,6 +2030,175 @@ const pages = [
       'YouTuber',
     ],
   },
+  {
+    name: 'Eduardo Reveles',
+    description: 'Web Engineer, Husband, Gamer.',
+    url: 'https://www.osiux.ws/about/uses',
+    twitter: '@osiux',
+    emoji: '🐈',
+    country: '🇲🇽',
+    computer: 'linux',
+    phone: 'android',
+    tags: [
+      'Developer',
+      'Full Stack',
+      'PHP',
+      'JavaScript',
+      'Laravel',
+      'React',
+    ],
+  },
+  {
+    name: 'Oscar Sánchez',
+    description:
+      'Passionate developer, traveler and drummer from Perú',
+    url: 'https://devlusaja.com',
+    twitter: '@dev_lusaja',
+    emoji: '💻🛩💪',
+    country: '🇵🇪',
+    computer: 'linux',
+    phone: 'android',
+    tags: [
+      'Developer',
+      'Software Architect',
+      'Python',
+      'PHP',
+      'Docker',
+      'Graphql',
+      'AWS',
+      'Open Source'
+    ],
+  },
+  {
+    name: 'Thomas Maximini',
+    description: 'Freelance software developer from Germany.',
+    url: 'https://www.maxi.io/uses/',
+    twitter: '@tmaximini',
+    emoji: '🐍',
+    country: '🇩🇪',
+    computer: 'apple',
+    phone: 'iphone',
+    tags: ['JavaScript', 'React', 'Blogger', 'GraphQL', 'serverless', 'Node', 'Full Stack']
+  },
+  {
+    name: 'Philip Theobald',
+    description: 'Guitar player, motorcyclist, software engineer, entreprenuer',
+    url: 'https://www.philiptheobald.com/uses/',
+    twitter: '@fylzero',
+    emoji: '🤑',
+    country: '🇺🇸',
+    computer: 'apple',
+    phone: 'android',
+    tags: [
+      'Software Engineer',
+      'Laravel',
+      'Vue',
+      'WordPress'
+    ],
+  },
+  {
+    name: 'Alejandro G. Anglada',
+    description:
+      'Dad 👪🔥⚡️ Web Engineer ⚛️🚀 #typescript all over the place 👌',
+    url: 'https://aganglada.com/uses/',
+    twitter: '@aganglada',
+    emoji: '🔥',
+    country: '🇪🇸',
+    computer: 'apple',
+    phone: 'iphone',
+    tags: [
+      'Engineer',
+      'Front End',
+      'Mentor',
+      'YouTuber',
+      'Writer',
+      'JavaScript',
+      'TypeScript',
+      'Performance',
+      'PWA',
+      'React',
+      'Node',
+      'CSS',
+    ],
+  },
+  {
+    name: 'Antoni Kepinski',
+    description:
+      'Node Fetch maintainer // Into Node.js and Rust',
+    url: 'https://kepinski.me/uses/',
+    twitter: '@dokwadratu',
+    emoji: '⚡',
+    country: '🇵🇱',
+    computer: 'linux',
+    phone: 'iphone',
+    tags: [
+      'JavaScript',
+      'Developer',
+      'TypeScript',
+      'React',
+      'Rust',
+      'Node'
+    ],
+  },
+  {
+    name: 'Marcus Obst',
+    description: 'Webdeveloper, Music Lover',
+    url: 'https://marcus-obst.de/uses',
+    emoji: '🍊',
+    country: '🇩🇪',
+    computer: 'windows',
+    phone: 'iphone',
+    tags: [
+      'Developer',
+      'Full Stack',
+      'PHP',
+      'JavaScript',
+      'CSS',
+      'Vue'
+    ],
+  },
+  {
+    name: 'Pawel Grzybek',
+    description: 'Software Engineer',
+    url: 'https://pawelgrzybek.com/uses/',
+    twitter: '@pawelgrzybek',
+    emoji: '🥑',
+    country: '🇵🇱',
+    computer: 'apple',
+    phone: 'iphone',
+    tags: [
+      'HTML',
+      'CSS',
+      'JavaScript',
+      'Node',
+      'Software Engineer',
+      'Front End',
+      'Back End',
+      'Full Stack',
+      'Blogger',
+    ],
+  },
+  {
+    name: 'Eric McCormick',
+    description: 'Software Developer, IBM Champion, coffee lover, dabbler in all things technology, hobbyist 3d design and printing',
+    url: 'https://edm00se.codes/uses/',
+    twitter: '@edm00se',
+    emoji: '🤔',
+    country: '🇺🇸',
+    computer: 'apple',
+    phone: 'iphone',
+    tags: [
+      'Developer',
+      'Full Stack',
+      'Blogger',
+      'Speaker',
+      'YouTuber',
+      'JavaScript',
+      'Vue',
+      'Node',
+      'CSS',
+    ]
+  },
   {
     name: 'Ben Congdon',
     description: 'Golang, Python, Rust. Runs in the Cloud.',