diff --git a/src/main/content/contribute.html b/src/main/content/contribute.html
index 5f239d2ce..5e8d4ef25 100644
--- a/src/main/content/contribute.html
+++ b/src/main/content/contribute.html
@@ -14,7 +14,7 @@
     <div class="container">
         <div class="row">
             <div class="col-md-5">
-                <img id="intro_logo" src="{{ "/img/contribute_page_title.svg" | relative }}" class="img-fluid" alt="Contribute">
+                <img id="intro_logo" src="{{ '/img/contribute_page_title.svg' | relative }}" class="img-fluid" alt="Contribute">
             </div>
             <div class="col-md-7">
                 <p id="contribute_intro_paragraph_1">
@@ -102,7 +102,7 @@ <h2 id="tools_and_tests_title_1">{% t contribute.tools_and_test_title1 %}</h2>
             <p id="tools_and_tests_paragraph_1">
                 {% t contribute.tools_and_test_paragraph1 %}
             </p>
-            <img id="tools_and_tests_image" src="{{ "/img/contribute2.jpg" | relative }}" class="img-fluid d-block mx-auto" alt="Four UFOs working together to transport a hammer and a wrench">
+            <img id="tools_and_tests_image" src="{{ '/img/contribute2.jpg' | relative }}" class="img-fluid d-block mx-auto" alt="Four UFOs working together to transport a hammer and a wrench">
         </div>
         <div class="col-md-7">
             <h3 id="tools_and_tests_title_2">{% t contribute.tools_and_test_title2 %}</h3>
diff --git a/src/main/content/guides.html b/src/main/content/guides.html
index 9041204d5..0f91fbe3d 100644
--- a/src/main/content/guides.html
+++ b/src/main/content/guides.html
@@ -45,8 +45,7 @@ <h2 id="guides_title">{% t pages.guides %}</h2>
         {% t guides.description %}
       </p>
     </div>
-    <img id="clouds" src="{{ "/img/guides_clouds.png" | relative }}"
-    alt='clouds'>
+    <img id="clouds" src="{{ '/img/guides_clouds.png' | relative }}" alt='clouds'>
     <div id="guides_search_container" class="col-xs-12 col-sm-5 col-md-6">
       <input
         id="guide_search_input"
diff --git a/src/main/content/start.html b/src/main/content/start.html
index becab526c..6f74906c2 100644
--- a/src/main/content/start.html
+++ b/src/main/content/start.html
@@ -21,9 +21,9 @@
 </script>
 <!-- INTRO -->
 <div id="downloads_intro_background">
-    <img id="leftcloud" class="d-none d-lg-block" src="{{ "/img/home_cloud_1.png" | relative }}" alt="">
-    <img id="rightcloud" class="d-none d-lg-block" src="{{ "/img/home_cloud_1.png" | relative }}" alt="">
-    <img id="rightcloud2" class="d-none d-lg-block" src="{{ "/img/home_cloud_1.png" | relative }}" alt="">
+    <img id="leftcloud" class="d-none d-lg-block" src="{{ '/img/home_cloud_1.png' | relative }}" alt="">
+    <img id="rightcloud" class="d-none d-lg-block" src="{{ '/img/home_cloud_1.png' | relative }}" alt="">
+    <img id="rightcloud2" class="d-none d-lg-block" src="{{ '/img/home_cloud_1.png' | relative }}" alt="">
     <span id="star1" class="star d-none d-lg-block"></span>
     <span id="star2" class="star d-none d-lg-block"></span>
     <span id="star3" class="star d-none d-lg-block"></span>
@@ -110,7 +110,7 @@ <h2 id="_create_a_starter_application" class="section_title"><a class="anchor" h
     <div class="modal-dialog" role="document">
       <div class="modal-content">
         <div class="modal-header">
-          <button type="button" class="close generate-project-modal-close" data-dismiss="modal" aria-label="Close">
+          <button type="button" class="close generate-project-modal-close" data-bs-dismiss="modal" aria-label="Close">
             <span aria-hidden="true">&times;</span>
           </button>
         </div>
@@ -127,7 +127,7 @@ <h3>{% t start.generate_project_modal.heading %}</h3>
             </p>
         </div>
         <div class="modal-footer">
-          <button type="button" id="gen_proj_popup_button" class="btn btn-primary"  data-dismiss="modal">{% t start.generate_project_modal.got_it %}</button>
+          <button type="button" id="gen_proj_popup_button" class="btn btn-primary"  data-bs-dismiss="modal">{% t start.generate_project_modal.got_it %}</button>
         </div>
       </div>
     </div>
@@ -365,13 +365,13 @@ <h2 id="downloads-pkg" class="section_title"><a class="anchor" href="#downloads-
 
 <!-- UFO IMAGES -->
 <div id="bottom_images_container" class="container">
-    <img id="ufo" src="{{ "/img/ufo.png" | relative }}" alt="ufo">
-    <img id="ufobeam" src="{{ "/img/ufo_beam.png" | relative }}" alt="ufo beam">
-    <img id="cow" class src="{{ "/img/cow.png" | relative }}" alt="cow">
-    <img id="cowshadow" src="{{ "/img/cow_shadow.png" | relative }}" alt="cow shadow">
-    <img id="outerbeam" src="{{ "/img/outer_beam.png" | relative }}" alt="outer beam">
-    <img id="bottomleftclouds" src="{{ "/img/bottom_left_clouds.png" | relative }}" alt="bottom left clouds">
-    <img id="bottomrightcloud" src="{{ "/img/bottom_right_cloud.png" | relative }}" alt="bottom right cloud">
+    <img id="ufo" src="{{ '/img/ufo.png' | relative }}" alt="ufo">
+    <img id="ufobeam" src="{{ '/img/ufo_beam.png' | relative }}" alt="ufo beam">
+    <img id="cow" class src="{{ '/img/cow.png' | relative }}" alt="cow">
+    <img id="cowshadow" src="{{ '/img/cow_shadow.png' | relative }}" alt="cow shadow">
+    <img id="outerbeam" src="{{ '/img/outer_beam.png' | relative }}" alt="outer beam">
+    <img id="bottomleftclouds" src="{{ '/img/bottom_left_clouds.png' | relative }}" alt="bottom left clouds">
+    <img id="bottomrightcloud" src="{{ '/img/bottom_right_cloud.png' | relative }}" alt="bottom right cloud">
     <p id="cow_text">
         {% t start.download_package_section.cow_text %}
     </p>
diff --git a/src/main/content/support.html b/src/main/content/support.html
index 37d07a2b9..9e79922da 100644
--- a/src/main/content/support.html
+++ b/src/main/content/support.html
@@ -119,7 +119,7 @@ <h5 class="card-title">{% t global.gitter %}</h5>
                 </div>
             </div>
             <div class="col-xs-12 col-sm-6 col-md-5">
-                <img id="moon_github" src="{{ "/img/moon_github.svg" | relative }}" class="img-fluid" alt="moon_github">
+                <img id="moon_github" src="{{ '/img/moon_github.svg' | relative }}" class="img-fluid" alt="moon_github">
             </div>
         </div>
         
@@ -129,7 +129,7 @@ <h5 class="card-title">{% t global.gitter %}</h5>
 
 <!-- CONTRIBUTE SECTION -->
 <div id="contribute_section">
-        <img id="spaceship" src="{{ "/img/spaceship.svg" | relative }}" class="img-fluid" alt="spaceship">
+        <img id="spaceship" src="{{ '/img/spaceship.svg' | relative }}" class="img-fluid" alt="spaceship">
 
         <div id="contribute_title">
             {% t support.contributor_title %}