diff --git a/src/components/home/Newsletter.js b/src/components/Newsletter.js
similarity index 100%
rename from src/components/home/Newsletter.js
rename to src/components/Newsletter.js
diff --git a/src/components/Testimonials.js b/src/components/Testimonials.js
index a0517ecd..36ff3cdf 100644
--- a/src/components/Testimonials.js
+++ b/src/components/Testimonials.js
@@ -25,7 +25,7 @@ const testimonials = [
     author: {
       name: 'Linus Trovalds',
       role: 'Creator of Linux',
-      avatar: require('@/img/avatars/linus-trovalds.jpg').default,
+      avatar: require('@/img/avatars/linus-trovalds.webp').default,
     },
   },
   {
@@ -33,7 +33,7 @@ const testimonials = [
     author: {
       name: 'Steve Jobs',
       role: 'Founder @ Apple Inc.',
-      avatar: require('@/img/avatars/steve-jobs.jpg').default,
+      avatar: require('@/img/avatars/steve-jobs.webp').default,
     },
   },
   {
@@ -41,7 +41,7 @@ const testimonials = [
     author: {
       name: 'Bill Gates',
       role: 'Founder @ Microsoft Inc.',
-      avatar: require('@/img/avatars/bill-gates.jpg').default,
+      avatar: require('@/img/avatars/bill-gates.webp').default,
     },
   },
   {
@@ -49,7 +49,7 @@ const testimonials = [
     author: {
       name: 'Guillermo Rauch',
       role: 'Founder @ Vercel.',
-      avatar: require('@/img/avatars/guillermo-rauch.jpg').default,
+      avatar: require('@/img/avatars/guillermo-rauch.webp').default,
     },
   },
   {
@@ -57,7 +57,7 @@ const testimonials = [
     author: {
       name: 'Martin Fowler',
       role: 'Programmer',
-      avatar: require('@/img/avatars/martin-fowler.jpg').default,
+      avatar: require('@/img/avatars/martin-fowler.webp').default,
     },
   },
   {
@@ -66,7 +66,7 @@ const testimonials = [
     author: {
       name: `Robert C. Martin`,
       role: 'Clean Code: A Handbook of Agile Software Craftsmanship',
-      avatar: require('@/img/avatars/robert-martin.jpg').default,
+      avatar: require('@/img/avatars/robert-martin.webp').default,
     },
   },
   {
@@ -74,7 +74,7 @@ const testimonials = [
     author: {
       name: 'Chris Heilmann',
       role: 'Programmer',
-      avatar: require('@/img/avatars/chris-heilmann.jpg').default,
+      avatar: require('@/img/avatars/chris-heilmann.webp').default,
     },
   },
   {
@@ -82,7 +82,7 @@ const testimonials = [
     author: {
       name: 'Corey House',
       role: `Founder @ ReactJS Consulting`,
-      avatar: require('@/img/avatars/corey-house.jpg').default,
+      avatar: require('@/img/avatars/corey-house.webp').default,
     },
   },
 ]
diff --git a/src/img/avatars/bill-gates.jpg b/src/img/avatars/bill-gates.jpg
deleted file mode 100644
index 53eaa207..00000000
Binary files a/src/img/avatars/bill-gates.jpg and /dev/null differ
diff --git a/src/img/avatars/bill-gates.webp b/src/img/avatars/bill-gates.webp
new file mode 100644
index 00000000..3e49ea5d
Binary files /dev/null and b/src/img/avatars/bill-gates.webp differ
diff --git a/src/img/avatars/chris-heilmann.jpg b/src/img/avatars/chris-heilmann.jpg
deleted file mode 100644
index 951ae852..00000000
Binary files a/src/img/avatars/chris-heilmann.jpg and /dev/null differ
diff --git a/src/img/avatars/chris-heilmann.webp b/src/img/avatars/chris-heilmann.webp
new file mode 100644
index 00000000..d384a124
Binary files /dev/null and b/src/img/avatars/chris-heilmann.webp differ
diff --git a/src/img/avatars/corey-house.jpg b/src/img/avatars/corey-house.jpg
deleted file mode 100644
index 6ad29d8a..00000000
Binary files a/src/img/avatars/corey-house.jpg and /dev/null differ
diff --git a/src/img/avatars/corey-house.webp b/src/img/avatars/corey-house.webp
new file mode 100644
index 00000000..80315123
Binary files /dev/null and b/src/img/avatars/corey-house.webp differ
diff --git a/src/img/avatars/guillermo-rauch.jpg b/src/img/avatars/guillermo-rauch.jpg
deleted file mode 100644
index 30125f89..00000000
Binary files a/src/img/avatars/guillermo-rauch.jpg and /dev/null differ
diff --git a/src/img/avatars/guillermo-rauch.webp b/src/img/avatars/guillermo-rauch.webp
new file mode 100644
index 00000000..1645e2bf
Binary files /dev/null and b/src/img/avatars/guillermo-rauch.webp differ
diff --git a/src/img/avatars/linus-trovalds.jpg b/src/img/avatars/linus-trovalds.jpg
deleted file mode 100644
index 8e0335ff..00000000
Binary files a/src/img/avatars/linus-trovalds.jpg and /dev/null differ
diff --git a/src/img/avatars/linus-trovalds.webp b/src/img/avatars/linus-trovalds.webp
new file mode 100644
index 00000000..2c86222c
Binary files /dev/null and b/src/img/avatars/linus-trovalds.webp differ
diff --git a/src/img/avatars/martin-fowler.jpg b/src/img/avatars/martin-fowler.jpg
deleted file mode 100644
index 759d1be6..00000000
Binary files a/src/img/avatars/martin-fowler.jpg and /dev/null differ
diff --git a/src/img/avatars/martin-fowler.webp b/src/img/avatars/martin-fowler.webp
new file mode 100644
index 00000000..5e00b587
Binary files /dev/null and b/src/img/avatars/martin-fowler.webp differ
diff --git a/src/img/avatars/robert-martin.jpg b/src/img/avatars/robert-martin.jpg
deleted file mode 100644
index d18a9eec..00000000
Binary files a/src/img/avatars/robert-martin.jpg and /dev/null differ
diff --git a/src/img/avatars/robert-martin.webp b/src/img/avatars/robert-martin.webp
new file mode 100644
index 00000000..3f682e70
Binary files /dev/null and b/src/img/avatars/robert-martin.webp differ
diff --git a/src/img/avatars/steve-jobs.jpg b/src/img/avatars/steve-jobs.jpg
deleted file mode 100644
index 10184753..00000000
Binary files a/src/img/avatars/steve-jobs.jpg and /dev/null differ
diff --git a/src/img/avatars/steve-jobs.webp b/src/img/avatars/steve-jobs.webp
new file mode 100644
index 00000000..27b116f1
Binary files /dev/null and b/src/img/avatars/steve-jobs.webp differ
diff --git a/src/pages/index.js b/src/pages/index.js
index 09904270..d2d2ee59 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -2,16 +2,15 @@ import { BigText, InlineCode, Paragraph, Widont } from '@/components/home/common
 import { Footer } from '@/components/home/Footer'
 import { Hero } from '@/components/home/Hero'
 import MenuButton from '@/components/home/Menu'
-import { Newsletter } from '@/components/home/Newsletter'
 import { OpenSource } from '@/components/home/OpenSource'
 import { Logo } from '@/components/Logo'
 import { Search } from '@/components/Search'
 import { Testimonials } from '@/components/Testimonials'
+import ThemeChanger from '@/components/ThemeChanger'
 import Head from 'next/head'
+import Image from 'next/image'
 import NextLink from 'next/link'
 import Router from 'next/router'
-import ThemeChanger from '@/components/ThemeChanger'
-import Image from 'next/image'
 
 export default function Home() {
   return (