diff --git a/endpoints/subscriptions/get.php b/endpoints/subscriptions/get.php
index 605866c..27e639d 100644
--- a/endpoints/subscriptions/get.php
+++ b/endpoints/subscriptions/get.php
@@ -82,7 +82,7 @@
                   Add First Subscription
                 </button>
             </div>
-            <?
+            <?php
         }
     }
 
diff --git a/includes/connect.php b/includes/connect.php
index 2d74123..f0b50e7 100644
--- a/includes/connect.php
+++ b/includes/connect.php
@@ -9,5 +9,4 @@ if (!$db) {
     die('Connection to the database failed.');
 }
 
-// $db->close();
 ?>
\ No newline at end of file
diff --git a/login.php b/login.php
index 0db007d..cf99a06 100644
--- a/login.php
+++ b/login.php
@@ -79,11 +79,11 @@ if (isset($_POST['username']) && isset($_POST['password'])) {
     <div class="content">
         <section class="container">
             <header>
-                <? 
+                <?php 
                     if ($theme == "light") {
-                        ?> <img src="images/wallossolid.png" alt="Wallos Logo" title="Wallos - Subscription Tracker" /> <?
+                        ?> <img src="images/wallossolid.png" alt="Wallos Logo" title="Wallos - Subscription Tracker" /> <?php
                     } else {
-                        ?> <img src="images/wallossolidwhite.png" alt="Wallos Logo" title="Wallos - Subscription Tracker" /> <?
+                        ?> <img src="images/wallossolidwhite.png" alt="Wallos Logo" title="Wallos - Subscription Tracker" /> <?php
                     }
                 ?>
                 <p>
diff --git a/registration.php b/registration.php
index 14a440f..60c0581 100644
--- a/registration.php
+++ b/registration.php
@@ -85,11 +85,11 @@ if (isset($_POST['username'])) {
         <div class="content">
             <section class="container">
                 <header>
-                <? 
+                <?php 
                     if ($theme == "light") {
-                        ?> <img src="images/wallossolid.png" alt="Wallos Logo" title="Wallos - Subscription Tracker" /> <?
+                        ?> <img src="images/wallossolid.png" alt="Wallos Logo" title="Wallos - Subscription Tracker" /> <?php
                     } else {
-                        ?> <img src="images/wallossolidwhite.png" alt="Wallos Logo" title="Wallos - Subscription Tracker" /> <?
+                        ?> <img src="images/wallossolidwhite.png" alt="Wallos Logo" title="Wallos - Subscription Tracker" /> <?php
                     }
                 ?>
                     <p>
diff --git a/scripts/settings.js b/scripts/settings.js
index 5e63545..e4d9d34 100644
--- a/scripts/settings.js
+++ b/scripts/settings.js
@@ -13,7 +13,7 @@ function closeAvatarSelect() {
 }
 
 function changeAvatar(number) {
-  document.getElementById("avatarImg").src = "/images/avatars/" + number + ".svg";
+  document.getElementById("avatarImg").src = "images/avatars/" + number + ".svg";
   document.getElementById("avatarUser").value = number;
   closeAvatarSelect();
 }
@@ -425,7 +425,7 @@ document.addEventListener('DOMContentLoaded', function() {
         .then(data => {
           if (data.success) {
             var newAvatar = document.getElementById("avatarUser").value;
-            document.getElementById("avatar").src = "/images/avatars/" + newAvatar + ".svg";
+            document.getElementById("avatar").src = "images/avatars/" + newAvatar + ".svg";
             var newUsername = document.getElementById("username").value;
             document.getElementById("user").textContent = newUsername;
             showSuccessMessage("User details saved");
diff --git a/settings.php b/settings.php
index ba2a7e0..3ea6b3e 100644
--- a/settings.php
+++ b/settings.php
@@ -11,9 +11,9 @@
                     <div class="fields">
                         <div>
                             <div class="user-avatar">
-                                <img src="/images/avatars/<?= $userData['avatar'] ?>.svg" alt="avatar" class="avatar" id="avatarImg" onClick="toggleAvatarSelect()"/>
+                                <img src="images/avatars/<?= $userData['avatar'] ?>.svg" alt="avatar" class="avatar" id="avatarImg" onClick="toggleAvatarSelect()"/>
                                 <span class="edit-avatar" onClick="toggleAvatarSelect()">
-                                    <img src="/images/siteicons/editavatar.png" title="Change avatar" />
+                                    <img src="images/siteicons/editavatar.png" title="Change avatar" />
                                 </span>
                             </div>
                             
@@ -433,7 +433,7 @@
             <div>
                 <input type="button" value="Switch Light / Dark Theme" onClick="switchTheme()">
             </div>
-            <?
+            <?php
                 $hidename = isset($_COOKIE['hideNameOnMobile']) && $_COOKIE['hideNameOnMobile'] === 'true';
                 $monthlyprice = isset($_COOKIE['showMonthlyPrice']) && $_COOKIE['showMonthlyPrice'] === 'true';
                 $convertcurrency = isset($_COOKIE['convertCurrency']) && $_COOKIE['convertCurrency'] === 'true';
@@ -447,13 +447,13 @@
             </div>
             <div>
                 <div class="form-group-inline">
-                    <input type="checkbox" id="monthlyprice" name="monthlyprice" onChange="setShowMonthlyPriceCookie()" <? if ($monthlyprice) echo 'checked'; ?>>
+                    <input type="checkbox" id="monthlyprice" name="monthlyprice" onChange="setShowMonthlyPriceCookie()" <?php if ($monthlyprice) echo 'checked'; ?>>
                     <label for="monthlyprice">Calculate and show monthly price for all subscriptions</label>
                 </div>
             </div>
             <div>
                 <div class="form-group-inline">
-                    <input type="checkbox" id="convertcurrency" name="convertcurrency" onChange="setConvertCurrencyCookie()" <? if ($convertcurrency) echo 'checked'; ?>>
+                    <input type="checkbox" id="convertcurrency" name="convertcurrency" onChange="setConvertCurrencyCookie()" <?php if ($convertcurrency) echo 'checked'; ?>>
                     <label for="convertcurrency">Always convert and show prices on my main currency (slower).</label>
                 </div>
             </div>
@@ -467,7 +467,7 @@
         <div class="account-settings-list">
             <div>
                 <div class="form-group-inline">
-                    <input type="checkbox" id="removebackground" name="removebackground" onChange="setRemoveBackgroundCookie()" <? if ($removebackground) echo 'checked'; ?>>
+                    <input type="checkbox" id="removebackground" name="removebackground" onChange="setRemoveBackgroundCookie()" <?php if ($removebackground) echo 'checked'; ?>>
                     <label for="removebackground">Attempt to remove background of logos from image search (experimental).</label>
                 </div>
             </div>
@@ -489,7 +489,7 @@
                 foreach ($payments as $payment) {
                     ?>
                         <div class="payments-payment">
-                            <img src="/images/uploads/icons/<?= $payment['icon'] ?>"  alt="Logo" />
+                            <img src="images/uploads/icons/<?= $payment['icon'] ?>"  alt="Logo" />
                             <span class="payment-name">
                                 <?= $payment['name'] ?>
                             </span>