diff --git a/settings.gradle b/settings.gradle
index 9ce8dc4..efefccd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
 }
 
 rootProject.name = 'Website'
diff --git a/website/build.gradle b/website/build.gradle
index c61f943..4257116 100644
--- a/website/build.gradle
+++ b/website/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id 'org.springframework.boot' version '3.0.0'
+    id 'org.springframework.boot' version '3.2.0'
     id 'io.spring.dependency-management' version '1.1.0'
-    id "com.google.cloud.tools.jib" version "3.3.0"
+    id "com.google.cloud.tools.jib" version "3.4.0"
     id 'java'
 }
 
diff --git a/website/src/main/resources/public/images/questions.png b/website/src/main/resources/public/images/questions.png
index acb90fd..ca50649 100644
Binary files a/website/src/main/resources/public/images/questions.png and b/website/src/main/resources/public/images/questions.png differ
diff --git a/website/src/main/resources/public/images/tj_bot.png b/website/src/main/resources/public/images/tj_bot.png
index 93b3330..1f1eed9 100644
Binary files a/website/src/main/resources/public/images/tj_bot.png and b/website/src/main/resources/public/images/tj_bot.png differ
diff --git a/website/src/main/resources/public/index.html b/website/src/main/resources/public/index.html
index f483581..97ea64e 100644
--- a/website/src/main/resources/public/index.html
+++ b/website/src/main/resources/public/index.html
@@ -2,36 +2,39 @@
 <html lang="en">
 
 <head>
-    <title>Together Java - Learn Java, together - Discord</title>
     <meta charset="utf-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
+    <meta name="description"
+          content="Join our vibrant Java learning community on Discord. Get Java help and chat with friendly volunteers about coding and programming."/>
 
+    <!-- Paginatitel -->
+    <title>Learn Java Community - Together Java</title>
+
+    <!-- Favicon -->
     <link rel="apple-touch-icon" sizes="180x180" href="favicons/images/apple-touch-icon.png"/>
     <link rel="icon" type="image/png" sizes="32x32" href="favicons/images/favicon-32x32.png"/>
     <link rel="icon" type="image/png" sizes="16x16" href="images/favicons/favicon-16x16.png"/>
     <link rel="manifest" href="manifest.json"/>
 
-    <meta name="description" content="
-        Need Java help? We got plenty! Join our Discord community.
-        We have lots of friendly volunteers to help you learn Java or chat about everyday things."/>
+    <!-- Keywords -->
     <meta name="keywords" content="Java, Discord, Programming, Coding, Help, Q&A"/>
 
-    <meta property="og:title" content="Together Java - Learn Java, together - Discord"/>
+    <!-- Open Graph en Twitter-meta-tags -->
+    <meta property="og:title" content="Learn Java Community - Together Java"/>
     <meta property="og:image" content="https://togetherjava.org/images/logo_frame.png"/>
     <meta property="og:url" content="https://togetherjava.org"/>
     <meta property="og:type" content="website"/>
     <meta property="og:site_name" content="Together Java"/>
-    <meta property=“og:description“ content="
-        Need Java help? We got plenty! Join our Discord community.
-        We have lots of friendly volunteers to help you learn Java or chat about everyday things."/>
+    <meta property="og:description"
+          content="Join our vibrant Java learning community on Discord. Get Java help and chat with friendly volunteers about coding and programming."/>
 
-    <meta name="twitter:title" content="Together Java - Learn Java, together - Discord"/>
+    <meta name="twitter:title" content="Learn Java Community - Together Java"/>
     <meta name="twitter:image" content="https://togetherjava.org/images/logo_frame.png"/>
     <meta name="twitter:card" content="summary_large_image"/>
-    <meta name="twitter:description" content="
-        Need Java help? We got plenty! Join our Discord community.
-        We have lots of friendly volunteers to help you learn Java or chat about everyday things."/>
+    <meta name="twitter:description"
+          content="Join our vibrant Java learning community on Discord. Get Java help and chat with friendly volunteers about coding and programming."/>
 
+    <!-- Google-site-verificatie -->
     <meta name="google-site-verification" content="_7lSgvyFKM2rjNGXPmTtDdTSyBMDzm1znJEac-z5QBY"/>
 
     <link rel="stylesheet" href="assets/css/main.css"/>
@@ -47,10 +50,10 @@
     <div class="inner">
         <nav>
             <ul>
-                <li><a href="#intro">Welcome</a></li>
-                <li><a href="#one">Community</a></li>
-                <li><a href="#two">Partners</a></li>
-                <li><a href="#three">Contact</a></li>
+                <li><a href="#intro" title="About Us">About Us</a></li>
+                <li><a href="#one" title="Our Community">Our Community</a></li>
+                <li><a href="#two" title="Our Partners">Our Partners</a></li>
+                <li><a href="#three" title="Contact Us">Contact Us</a></li>
             </ul>
         </nav>
     </div>
@@ -63,21 +66,19 @@
     <section id="intro" class="wrapper style1 fullscreen fade-up">
         <div class="inner">
             <h1><span class="image right"><img style="width: 50%" src="images/logo_frame.png"
-                                               alt=""/></span>Together Java</h1>
-            <p>Need Java help? We got plenty!</p>
+                                               alt="Together Java"/></span>Together Java</h1>
+            <p>Get Java help and chat with our friendly community.</p>
             <ul class="actions">
-                <li><a href="https://discord.gg/P3UmanFmvK"
-                       class="button primary icon solid brands fa-discord">
-                    Join us</a></li>
+                <li><a href="https://discord.gg/P3UmanFmvK" class="button primary icon solid brands fa-discord">Join our
+                    Discord</a></li>
             </ul>
             <p><small>
-                Lots of friendly volunteers to help you learn Java or chat about everyday
-                things.</small></p>
+                We have lots of friendly volunteers to help you learn Java or chat about everyday things.</small></p>
             <ul>
-                <li>25.000 members</li>
+                <li>30,000 members</li>
                 <li>300 questions answered weekly</li>
-                <li>50.000 messages per month</li>
-                <li>monthly giveaways</li>
+                <li>50,000 messages per month</li>
+                <li>Monthly giveaways</li>
             </ul>
             <widgetbot
                     server="272761734820003841"
@@ -91,49 +92,38 @@ <h1><span class="image right"><img style="width: 50%" src="images/logo_frame.png
     <!-- One -->
     <section id="one" class="wrapper style2 spotlights">
         <section>
-            <span class="image"><img src="images/questions.png" alt=""
-                                     data-position="left top"/></span>
+        <span class="image"><img src="images/questions.png" alt="Questions and Answers"
+                                 data-position="left top"/></span>
             <div class="content">
                 <div class="inner">
-                    <h2>You need help or have a question? <img src="images/peepo_happy.png" alt=""
-                                                               width="70"/>
+                    <h2>Need Help or Have a Question? <img src="images/peepo_happy.png" alt="Happy Peepo" width="70"/>
                     </h2>
-                    <p>We have a sophisticated Q&A system with over 20 categories to choose
-                        from.</p>
-                    <p>After posting your question, our experts will be with you shortly and provide
-                        help.</p>
+                    <p>Our sophisticated Q&A system offers solutions in over 20 categories.</p>
+                    <p>When you post your question, our experts are here to assist you promptly.</p>
                 </div>
             </div>
         </section>
         <section>
-            <span class="image"><img src="images/cv_example.png" alt=""
-                                     data-position="left top"/></span>
+    <span class="image"><img src="images/cv_example.png" alt="CV Example"
+                             data-position="left top"/></span>
             <div class="content">
                 <div class="inner">
-                    <h2>We help you land a job! <img src="images/peepo_heart.png" alt=""
-                                                     width="70"/></h2>
-                    <p>Our community consists of a lot of people who work with Java in their
-                        day-to-day business.
-                    </p>
-                    <p>Have a chat with them, we can provide you with all the advice you need for
-                        your own professional career as a programmer.</p>
+                    <h2>We Help You Land a Job! <img src="images/peepo_heart.png" alt="Heart Peepo" width="70"/></h2>
+                    <p>Our community consists of many professionals who work with Java in their daily careers.</p>
+                    <p>Engage with them to get valuable advice for your own professional journey as a programmer.</p>
                 </div>
             </div>
         </section>
         <section>
-            <span class="image"><img src="images/tj_bot.png" alt=""
-                                     data-position="left top"/></span>
+    <span class="image"><img src="images/tj_bot.png" alt="TJ Bot"
+                             data-position="left top"/></span>
             <div class="content">
                 <div class="inner">
-                    <h2>Code together <img src="images/peepo_fancy.png" alt="" width="70"/></h2>
-                    <p>Collaborate on our community bot and gain practice experience on a real
-                        project.</p>
-                    <p>The project is big, sophisticated, and most importantly beginner-friendly with
-                        lots of guides.
-                    </p>
+                    <h2>Code Together <img src="images/peepo_fancy.png" alt="Fancy Peepo" width="70"/></h2>
+                    <p>Collaborate on our community bot project and gain practical experience on a real coding project.</p>
+                    <p>The project is substantial, sophisticated, and, most importantly, beginner-friendly with plenty of guides to help you.</p>
                     <ul class="actions">
-                        <li><a href="https://github.com/Together-Java/TJ-Bot"
-                               class="button icon solid brands fa-github">TJ-Bot on GitHub</a></li>
+                        <li><a href="https://github.com/Together-Java/TJ-Bot" class="button icon solid brands fa-github">Explore TJ-Bot on GitHub</a></li>
                     </ul>
                 </div>
             </div>
@@ -143,59 +133,32 @@ <h2>Code together <img src="images/peepo_fancy.png" alt="" width="70"/></h2>
     <!-- Two -->
     <section id="two" class="wrapper style3 fade-up">
         <div class="inner">
-            <h2>Our partnerships</h2>
-            <p>Our community is always seeking out for exciting opportunities to partner up with
-                amazing people and
-                organizations.
-                Through partnerships, we enrich the experience for our users by providing licenses
-                for
-                much-needed
-                products, hosting entertaining events and giving informative talks.
-            </p>
+            <h2>Our Partnerships</h2>
+            <p>Our community is always seeking exciting opportunities to partner with amazing people and organizations. Through partnerships, we enrich the experience for our users by providing licenses for essential products, hosting entertaining events, and delivering informative talks.</p>
             <div class="features">
                 <section>
-                    <span class="icon solid image"><img src="images/jebtrains.png" alt=""
-                                                        width="70"/></span>
+                    <span class="icon solid image"><img src="images/jebtrains.png" alt="JetBrains Logo" width="70"/></span>
                     <h3><a href="https://www.jetbrains.com">JetBrains</a></h3>
-                    <p>We will frequently <strong>give away licenses</strong> to their products,
-                        such as <strong>IntelliJ
-                            IDEA
-                            Ultimate</strong> <img src="images/intellij.png" alt="" width="30"/> on
-                        special
-                        occasions.
-                    </p>
-                    <p>For example as prize for winning a coding contest, or just to
-                        thank you for your contribution to the community.</p>
+                    <p>We frequently <strong>give away licenses</strong> to their products, such as <strong>IntelliJ IDEA Ultimate</strong> <img src="images/intellij.png" alt="IntelliJ IDEA Logo" width="30"/> on special occasions.</p>
+                    <p>For example, as a prize for winning a coding contest or simply to thank you for your contribution to the community.</p>
                 </section>
                 <section>
-						<span class="icon solid image"><img src="images/cloub_builders_logo.png"
-                                                            alt=""
-                                                            width="70"/></span>
+                    <span class="icon solid image"><img src="images/cloub_builders_logo.png" alt="Cloud Builders Logo" width="70"/></span>
                     <h3><a href="https://www.cloud-builders.tech">Cloud Builders</a></h3>
-                    <p>Hosting free Java conferences with expert speakers and many exciting
-                        talks.</p>
-                    <p>All profits go to Ukrainian charity funds
-                        <span style="white-space: nowrap;">💙💛</span>.
-                    </p>
+                    <p>We host free Java conferences with expert speakers and exciting talks.</p>
+                    <p>All profits go to Ukrainian charity funds <span style="white-space: nowrap;">💙💛</span>.</p>
                 </section>
                 <section>
-                    <span class="icon solid image"><img src="images/aoc.svg" alt=""
-                                                        width="70"/></span>
+                    <span class="icon solid image"><img src="images/aoc.svg" alt="Advent of Code Logo" width="70"/></span>
                     <h3><a href="https://adventofcode.com/">Advent of Code</a></h3>
-                    <p>Each year in December, we host AoC within our community with private
-                        leaderboards.</p>
-                    <p>Advent of Code is an Advent calendar of small programming puzzles for a
-                        variety of skill sets
-                        and skill levels that can be solved in any programming language you
-                        like.</p>
+                    <p>Each year in December, we host Advent of Code within our community with private leaderboards.</p>
+                    <p>Advent of Code is an Advent calendar of small programming puzzles for a variety of skill sets and skill levels that can be solved in any programming language you like.</p>
                 </section>
                 <section>
-                    <span class="icon solid image"><img src="images/mooc.png" alt=""
-                                                        width="70"/></span>
+                    <span class="icon solid image"><img src="images/mooc.png" alt="MOOC: Java Programming Logo" width="70"/></span>
                     <h3><a href="https://java-programming.mooc.fi/">MOOC: Java Programming</a></h3>
                     <p>Hands down the best complete and free resource to learn Java.</p>
-                    <p>The University of Helsinki created this course, and they use it to teach
-                        their students programming. It comes with 14 weekly parts and exercises.</p>
+                    <p>The University of Helsinki created this course, and they use it to teach their students programming. It comes with 14 weekly parts and exercises.</p>
                 </section>
             </div>
         </div>
@@ -204,53 +167,47 @@ <h3><a href="https://java-programming.mooc.fi/">MOOC: Java Programming</a></h3>
     <!-- Three -->
     <section id="three" class="wrapper style1 fade-up">
         <div class="inner">
-            <h2>Get in touch</h2>
-                <p>The most reliable way to reach us is by sending us an  <span class="icon solid fa-mail-bulk "></span>
-                            <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#099;&#111;&#110;&#116;&#097;&#099;&#116;&#064;&#116;&#111;&#103;&#101;&#116;&#104;&#101;&#114;&#106;&#097;&#118;&#097;&#046;&#111;&#114;&#103;">Email</a></p>
-                <p>Alternatively, just DM any of our mods on the discord server!</p>
+            <h2>Get in Touch</h2>
+            <p>The most reliable way to reach us is by sending us an <span class="icon solid fa-mail-bulk "></span>
+                <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#099;&#111;&#110;&#116;&#097;&#099;&#116;&#064;&#116;&#111;&#103;&#101;&#116;&#104;&#101;&#114;&#106;&#097;&#118;&#097;&#046;&#111;&#114;&#103;">Email</a>
+            </p>
+            <p>Alternatively, you can send a direct message to any of our moderators on the Discord server!</p>
             <div class="split style1">
                 <section>
-                    <h3>Community</h3>
-                    <p>Reach out to our members at:</p>
+                    <h3>Contact the Community</h3>
+                    <p>Reach out to our members on:</p>
                     <ul class="contact">
                         <li>
                             <span class="icon brands fa-discord"></span>
-                            <span><a
-                                    href="https://discord.gg/P3UmanFmvK">Discord</a></span>
+                            <span><a href="https://discord.gg/P3UmanFmvK">Discord</a></span>
                         </li>
                         <li>
                             <span class="icon brands fa-github"></span>
-                            <span><a
-                                    href="https://github.com/Together-Java">GitHub</a></span>
+                            <span><a href="https://github.com/Together-Java">GitHub</a></span>
                         </li>
                         <li>
                             <span class="icon brands fa-reddit"></span>
-                            <span><a
-                                    href="https://www.reddit.com/r/Togetherjava/">Reddit</a></span>
+                            <span><a href="https://www.reddit.com/r/Togetherjava/">Reddit</a></span>
                         </li>
                     </ul>
                 </section>
                 <section>
-                    <h3>Owners</h3>
-                    <p>Or directly to the people maintaining it:</p>
+                    <h3>Contact the Owners</h3>
+                    <p>Contact the individuals maintaining the community:</p>
                     <ul class="contact">
                         <li>
                             <span class="icon brands fa-github"></span>
-                            <span><a
-                                    href="https://github.com/Doppeey">Doppeey</a></span>
+                            <span><a href="https://github.com/Doppeey">Doppeey</a></span>
                         </li>
                         <li>
                             <span class="icon brands fa-github"></span>
-                            <span><a
-                                    href="https://github.com/Zabuzard">Zabuzard</a></span>
+                            <span><a href="https://github.com/Zabuzard">Zabuzard</a></span>
                             <br>
                             <span class="icon brands fa-stack-overflow"></span>
-                            <span><a
-                                    href="https://stackoverflow.com/users/2411243/Zabuzard?tab=profile">2411243/Zabuzard</a></span>
+                            <span><a href="https://stackoverflow.com/users/2411243/Zabuzard?tab=profile">Stack Overflow</a></span>
                             <br>
                             <span class="icon brands fa-linkedin"></span>
-                            <span><a
-                                    href="https://www.linkedin.com/in/daniel-tischner/">in/daniel-tischner</a></span>
+                            <span><a href="https://www.linkedin.com/in/daniel-tischner/">LinkedIn</a></span>
                         </li>
                     </ul>
                 </section>
@@ -258,13 +215,14 @@ <h3>Owners</h3>
         </div>
     </section>
 
+
 </div>
 
 <!-- Footer -->
 <footer id="footer" class="wrapper style1-alt">
     <div class="inner">
         <ul class="menu">
-            <li>&copy; Together Java. All rights reserved.</li>
+            <li>&copy; 2023 Together Java. All rights reserved.</li>
             <li>Design: <a href="http://html5up.net">HTML5 UP</a></li>
             <li>We are not affiliated, associated, or endorsed with/by Discord or Oracle.</li>
         </ul>
@@ -272,14 +230,15 @@ <h3>Owners</h3>
 </footer>
 
 <!-- Scripts -->
-<script src="assets/js/jquery-3.6.1.min.js"></script>
-<script src="assets/js/jquery.scrollex.min.js"></script>
-<script src="assets/js/jquery.scrolly.min.js"></script>
-<script src="assets/js/browser.min.js"></script>
-<script src="assets/js/breakpoints.min.js"></script>
-<script src="assets/js/util.js"></script>
-<script src="assets/js/main.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/@widgetbot/html-embed"></script>
+<script src="assets/js/jquery-3.6.1.min.js" async></script>
+<script src="assets/js/jquery.scrollex.min.js" async></script>
+<script src="assets/js/jquery.scrolly.min.js" async></script>
+<script src="assets/js/browser.min.js" async></script>
+<script src="assets/js/breakpoints.min.js" async></script>
+<script src="assets/js/util.js" async></script>
+<script src="assets/js/main.js" async></script>
+<script src="https://cdn.jsdelivr.net/npm/@widgetbot/html-embed@1.0.0"></script>
+
 
 </body>
 
