diff --git a/auth/loginsql.php b/auth/loginsql.php
index b550ecd..0aba4bd 100644
--- a/auth/loginsql.php
+++ b/auth/loginsql.php
@@ -7,35 +7,37 @@
 
 include('../config.php');
 
-if ($usr&&$pw)
+if ($usr && $pw)
 {
-$conn = new mysqli($servername, $username, $password, $dbname);
-if ($conn->connect_error) {
-  die("Connection failed: " . $conn->connect_error);
-}
-$query = mysqli_query($conn, "SELECT * FROM login WHERE username = '".$usr."'");
-$numrows = mysqli_num_rows($query);
+    $conn = new mysqli($servername, $username, $password, $dbname);
+    if ($conn->connect_error) {
+        die("Connection failed: " . $conn->connect_error);
+    }
 
+    $stmt = $conn->prepare("SELECT * FROM login WHERE username = ?");
+    $stmt->bind_param("s", $usr);
+    $stmt->execute();
+    $result = $stmt->get_result();
 
-while ($row = mysqli_fetch_assoc($query))
-{
-    $dbusername = $row['username'];
-    $dbpassword = $row['password'];
-    $dbsalt1 = $row['salt1'];
-    $dbsalt2 = $row['salt2'];
-    $hashsaltusergivenpassword = hash('sha512', $dbsalt1 . $pw . $dbsalt2);
-}
-if ($usr==$dbusername&&$hashsaltusergivenpassword==$dbpassword)
-{
-    $_SESSION['logged_in_user'] = $usr;
-    $_SESSION['hashed_pass'] = $dbpassword;
-    header("refresh:0;url=/");
-}
-else {
-    echo "<h2>Invalid User or Password</h2>";
-}
+    while ($row = $result->fetch_assoc())
+    {
+        $dbusername = $row['username'];
+        $dbpassword = $row['password'];
+        $dbsalt1 = $row['salt1'];
+        $dbsalt2 = $row['salt2'];
+        $hashsaltusergivenpassword = hash('sha512', $dbsalt1 . $pw . $dbsalt2);
+    }
 
-die();
-}
+    if ($usr == $dbusername && $hashsaltusergivenpassword == $dbpassword)
+    {
+        $_SESSION['logged_in_user'] = $usr;
+        $_SESSION['hashed_pass'] = $dbpassword;
+        header("refresh:0;url=/");
+    }
+    else {
+        echo "<h2>Invalid User or Password</h2>";
+    }
 
+    die();
+}
 ?>
\ No newline at end of file
diff --git a/auth/signupsql.php b/auth/signupsql.php
index 2d983fb..3905306 100644
--- a/auth/signupsql.php
+++ b/auth/signupsql.php
@@ -25,16 +25,18 @@ function getName($n) {
   die("Connection failed: " . $conn->connect_error);
 }
 
-$select = mysqli_query($conn, "SELECT * FROM login WHERE username = '".$_POST['name']."'");
-if(mysqli_num_rows($select)) {
+$stmt = $conn->prepare("SELECT * FROM login WHERE username = ?");
+$stmt->bind_param("s", $_POST['name']);
+$stmt->execute();
+$result = $stmt->get_result();
+if($result->num_rows) {
     header( "refresh:2;url=signup.html" );
     exit('<h2>This username already exists</h2>');
 }
 
-$sql = "INSERT INTO login (username, password, salt1, salt2, videoshadow)
-VALUES ('$usr', '$pw', '$salt1', '$salt2', 'on')";
-
-if ($conn->query($sql) === TRUE) {
+$stmt = $conn->prepare("INSERT INTO login (username, password, salt1, salt2, videoshadow) VALUES (?, ?, ?, ?, 'on')");
+$stmt->bind_param("ssss", $usr, $pw, $salt1, $salt2);
+if ($stmt->execute() === TRUE) {
       echo "<h2>Welcome $usr. Redirecting Soon...</h2>";
     $_SESSION['logged_in_user'] = $usr;
     $_SESSION['hashed_pass'] = $pw;
diff --git a/channel/index.php b/channel/index.php
index 823a1d8..97e23a6 100644
--- a/channel/index.php
+++ b/channel/index.php
@@ -7,19 +7,21 @@
     if ($conn->connect_error) {
       die("Connection failed: " . $conn->connect_error);
     }
-    $query = mysqli_query($conn, "SELECT * FROM login WHERE username = '".$_SESSION['logged_in_user']."'");
-    $numrows = mysqli_num_rows($query);
-    while ($row = mysqli_fetch_assoc($query))
+    $stmt = $conn->prepare("SELECT * FROM login WHERE username = ?");
+    $stmt->bind_param("s", $_SESSION['logged_in_user']);
+    $stmt->execute();
+    $result = $stmt->get_result();
+    while ($row = $result->fetch_assoc())
     {   
         $pwrow = $row['password'];
     }
     if ($_SESSION['hashed_pass'] == $pwrow) {
-        } else {
-            session_destroy();
-        }
     } else {
         session_destroy();
     }
+} else {
+    session_destroy();
+}
 
 if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on')
 $link = "https";
@@ -43,27 +45,29 @@
 
 <?php
 if ($useSQL == true) {
-$dbsenduser = $_SESSION['logged_in_user'];
-$conn = new mysqli($servername, $username, $password, $dbname);
-if ($conn->connect_error) {
-  die("Connection failed: " . $conn->connect_error);
-}
-if (isset($_SESSION['logged_in_user']))
-{
-$conn = new mysqli($servername, $username, $password, $dbname);
-if ($conn->connect_error) {
-  die("Connection failed: " . $conn->connect_error);
-}
-$query = mysqli_query($conn, "SELECT * FROM login WHERE username = '".$_SESSION['logged_in_user']."'");
-$numrows = mysqli_num_rows($query);
-while ($row = mysqli_fetch_assoc($query))
-{
-    $themerow = $row['theme'];
-    $regionrow = $row['region'];
-}
-$row = mysqli_fetch_assoc($query);
-$numrows = mysqli_num_rows($query);
-}
+    $dbsenduser = $_SESSION['logged_in_user'];
+    $conn = new mysqli($servername, $username, $password, $dbname);
+    if ($conn->connect_error) {
+      die("Connection failed: " . $conn->connect_error);
+    }
+    if (isset($_SESSION['logged_in_user']))
+    {
+    $conn = new mysqli($servername, $username, $password, $dbname);
+    if ($conn->connect_error) {
+      die("Connection failed: " . $conn->connect_error);
+    }
+    $stmt = $conn->prepare("SELECT * FROM login WHERE username = ?");
+    $stmt->bind_param("s", $_SESSION['logged_in_user']);
+    $stmt->execute();
+    $result = $stmt->get_result();
+    while ($row = $result->fetch_assoc())
+    {
+        $themerow = $row['theme'];
+        $regionrow = $row['region'];
+        $loadcomments = $row['loadcomments'];
+        $userproxysetting = $row['proxy'];
+        $playerrow = $row['player'];
+    }
     if(strcmp($themerow, 'blue') == 0)
     {
         echo '<link rel="stylesheet" href="../styles/homeblue.css">';
@@ -77,7 +81,8 @@
     } else {
         echo '<link rel="stylesheet" href="../styles/home'.$defaultTheme.'.css">';
     }
-                ?>
+}
+?>
     <body>
 <div class="w3-sidebar w3-bar-block w3-collapse w3-card sidebar" style="width:55px;" id="mySidebar">
   <button class="w3-bar-item w3-button w3-large w3-hide-large" onclick="w3_close()">&times;</button>
diff --git a/history.php b/history.php
index 9eb3ed8..dad994e 100644
--- a/history.php
+++ b/history.php
@@ -1,20 +1,27 @@
 <?php
 session_start();  
 include('config.php');
-$conn = new mysqli($servername, $username, $password, $dbname);
-if ($conn->connect_error) {
-  die("Connection failed: " . $conn->connect_error);
-}
-$query = mysqli_query($conn, "SELECT * FROM login WHERE username = '".$_SESSION['logged_in_user']."'");
-$numrows = mysqli_num_rows($query);
-while ($row = mysqli_fetch_assoc($query))
-{   
-    $pwrow = $row['password'];
-}
-if ($_SESSION['hashed_pass'] == $pwrow) {
+
+if ($useSQL == true) {
+    $conn = new mysqli($servername, $username, $password, $dbname);
+    if ($conn->connect_error) {
+      die("Connection failed: " . $conn->connect_error);
+    }
+    $stmt = $conn->prepare("SELECT * FROM login WHERE username = ?");
+    $stmt->bind_param("s", $_SESSION['logged_in_user']);
+    $stmt->execute();
+    $result = $stmt->get_result();
+    while ($row = $result->fetch_assoc())
+    {   
+        $pwrow = $row['password'];
+    }
+    if ($_SESSION['hashed_pass'] == $pwrow) {
     } else {
         session_destroy();
     }
+} else {
+    session_destroy();
+}
 ?>
 <!DOCTYPE HTML>
 <html>
@@ -25,7 +32,7 @@
 <link rel="stylesheet" href="/styles/-bootstrap.min.css">
 <link rel="stylesheet" href="/styles/-googlesymbols.css">
 
-        <?php
+<?php
 $dbsenduser = $_SESSION['logged_in_user'];
 $conn = new mysqli($servername, $username, $password, $dbname);
 if ($conn->connect_error) {
@@ -37,14 +44,16 @@
 if ($conn->connect_error) {
   die("Connection failed: " . $conn->connect_error);
 }
-$query = mysqli_query($conn, "SELECT * FROM login WHERE username = '".$_SESSION['logged_in_user']."'");
-$numrows = mysqli_num_rows($query);
-while ($row = mysqli_fetch_assoc($query))
+$stmt = $conn->prepare("SELECT * FROM login WHERE username = ?");
+$stmt->bind_param("s", $_SESSION['logged_in_user']);
+$stmt->execute();
+$result = $stmt->get_result();
+$numrows = $result->num_rows;
+while ($row = $result->fetch_assoc())
 {
     $themerow = $row['theme'];
 }
-$row = mysqli_fetch_assoc($query);
-$numrows = mysqli_num_rows($query);
+$numrows = $result->num_rows;
 }
 if(strcmp($themerow, 'blue') == 0)
 {
@@ -56,7 +65,7 @@
 {
     echo '<link rel="stylesheet" href="../styles/player'.$defaultTheme.'.css">';
 } 
-                ?>
+?>
 
     <body>
 <div class="w3-sidebar w3-bar-block w3-collapse w3-card sidebar" style="width:55px;" id="mySidebar">
diff --git a/index.php b/index.php
index 4c2b119..c26b876 100644
--- a/index.php
+++ b/index.php
@@ -1,25 +1,27 @@
 <?php
+session_start();  
 include('config.php');
-session_start();
 
 if ($useSQL == true) {
     $conn = new mysqli($servername, $username, $password, $dbname);
     if ($conn->connect_error) {
       die("Connection failed: " . $conn->connect_error);
     }
-    $query = mysqli_query($conn, "SELECT * FROM login WHERE username = '".$_SESSION['logged_in_user']."'");
-    $numrows = mysqli_num_rows($query);
-    while ($row = mysqli_fetch_assoc($query))
+    $stmt = $conn->prepare("SELECT * FROM login WHERE username = ?");
+    $stmt->bind_param("s", $_SESSION['logged_in_user']);
+    $stmt->execute();
+    $result = $stmt->get_result();
+    while ($row = $result->fetch_assoc())
     {   
         $pwrow = $row['password'];
     }
     if ($_SESSION['hashed_pass'] == $pwrow) {
-        } else {
-            session_destroy();
-        }
     } else {
         session_destroy();
     }
+} else {
+    session_destroy();
+}
 
 $keyword = $_POST['keyword'] ?? "";
 if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on')
@@ -43,27 +45,29 @@
 
 <?php
 if ($useSQL == true) {
-$dbsenduser = $_SESSION['logged_in_user'];
-$conn = new mysqli($servername, $username, $password, $dbname);
-if ($conn->connect_error) {
-  die("Connection failed: " . $conn->connect_error);
-}
-if (isset($_SESSION['logged_in_user']))
-{
-$conn = new mysqli($servername, $username, $password, $dbname);
-if ($conn->connect_error) {
-  die("Connection failed: " . $conn->connect_error);
-}
-$query = mysqli_query($conn, "SELECT * FROM login WHERE username = '".$_SESSION['logged_in_user']."'");
-$numrows = mysqli_num_rows($query);
-while ($row = mysqli_fetch_assoc($query))
-{
-    $themerow = $row['theme'];
-    $regionrow = $row['region'];
-}
-$row = mysqli_fetch_assoc($query);
-$numrows = mysqli_num_rows($query);
-}
+    $dbsenduser = $_SESSION['logged_in_user'];
+    $conn = new mysqli($servername, $username, $password, $dbname);
+    if ($conn->connect_error) {
+      die("Connection failed: " . $conn->connect_error);
+    }
+    if (isset($_SESSION['logged_in_user']))
+    {
+    $conn = new mysqli($servername, $username, $password, $dbname);
+    if ($conn->connect_error) {
+      die("Connection failed: " . $conn->connect_error);
+    }
+    $stmt = $conn->prepare("SELECT * FROM login WHERE username = ?");
+    $stmt->bind_param("s", $_SESSION['logged_in_user']);
+    $stmt->execute();
+    $result = $stmt->get_result();
+    while ($row = $result->fetch_assoc())
+    {
+        $themerow = $row['theme'];
+        $regionrow = $row['region'];
+        $loadcomments = $row['loadcomments'];
+        $userproxysetting = $row['proxy'];
+        $playerrow = $row['player'];
+    }
     if(strcmp($themerow, 'blue') == 0)
     {
         echo '<link rel="stylesheet" href="../styles/homeblue.css">';
@@ -76,7 +80,9 @@
     } 
     } else {
         echo '<link rel="stylesheet" href="../styles/home'.$defaultTheme.'.css">';
-    }?>
+    }
+}
+?>
     <body>
 
 
@@ -287,7 +293,7 @@
             </div>
         </div>
         <br><div class="videos-data-container footer w3-animate-left">
-            Liberatube Version 1.8 beta · Licensed under AGPLv3 on GitHub · Credits: Dominic Wajda (GoldDominik893).<br>
+            Liberatube Version 1.8 · Licensed under AGPLv3 on GitHub · Credits: Dominic Wajda (GoldDominik893).<br>
             This website is optimised for mobile users and does not collect any user data apart from<br> watch history which doesn't exist yet and you will be able to turn it off when logged in.
             <br><a href="https://matrix.to/#/#libreratube:matrix.org">Join the Matrix</a> <a href="https://discord.gg/z4cCk5c5Zj">or discord</a> · <a href="https://invidious.io">Invidious</a> · <a href="https://github.com/GoldDominik893/liberatube">GitHub</a> · <a href="/donate.html">Donate to the Liberatube project</a><br>
             Have you noticed a bug or want to see a new feature? <a href="https://github.com/GoldDominik893/liberatube/issues">Open and issue on GitHub</a>
diff --git a/playlist/index.php b/playlist/index.php
index aa11d52..bdb5174 100644
--- a/playlist/index.php
+++ b/playlist/index.php
@@ -7,19 +7,21 @@
     if ($conn->connect_error) {
       die("Connection failed: " . $conn->connect_error);
     }
-    $query = mysqli_query($conn, "SELECT * FROM login WHERE username = '".$_SESSION['logged_in_user']."'");
-    $numrows = mysqli_num_rows($query);
-    while ($row = mysqli_fetch_assoc($query))
+    $stmt = $conn->prepare("SELECT * FROM login WHERE username = ?");
+    $stmt->bind_param("s", $_SESSION['logged_in_user']);
+    $stmt->execute();
+    $result = $stmt->get_result();
+    while ($row = $result->fetch_assoc())
     {   
         $pwrow = $row['password'];
     }
     if ($_SESSION['hashed_pass'] == $pwrow) {
-        } else {
-            session_destroy();
-        }
     } else {
         session_destroy();
     }
+} else {
+    session_destroy();
+}
 
 if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on')
 $link = "https";
@@ -54,15 +56,17 @@
     if ($conn->connect_error) {
       die("Connection failed: " . $conn->connect_error);
     }
-    $query = mysqli_query($conn, "SELECT * FROM login WHERE username = '".$_SESSION['logged_in_user']."'");
-    $numrows = mysqli_num_rows($query);
-    while ($row = mysqli_fetch_assoc($query))
+    $stmt = $conn->prepare("SELECT * FROM login WHERE username = ?");
+    $stmt->bind_param("s", $_SESSION['logged_in_user']);
+    $stmt->execute();
+    $result = $stmt->get_result();
+    while ($row = $result->fetch_assoc())
     {
         $themerow = $row['theme'];
         $regionrow = $row['region'];
-    }
-    $row = mysqli_fetch_assoc($query);
-    $numrows = mysqli_num_rows($query);
+        $loadcomments = $row['loadcomments'];
+        $userproxysetting = $row['proxy'];
+        $playerrow = $row['player'];
     }
     if(strcmp($themerow, 'blue') == 0)
     {
@@ -77,7 +81,8 @@
     } else {
         echo '<link rel="stylesheet" href="../styles/home'.$defaultTheme.'.css">';
     }
-                ?>
+}
+?>
     <body>
 <div class="w3-sidebar w3-bar-block w3-collapse w3-card sidebar" style="width:55px;" id="mySidebar">
   <button class="w3-bar-item w3-button w3-large w3-hide-large" onclick="w3_close()">&times;</button>
diff --git a/playlists.php b/playlists.php
index be8e014..3d95846 100644
--- a/playlists.php
+++ b/playlists.php
@@ -1,20 +1,27 @@
 <?php
 session_start();  
 include('config.php');
-$conn = new mysqli($servername, $username, $password, $dbname);
-if ($conn->connect_error) {
-  die("Connection failed: " . $conn->connect_error);
-}
-$query = mysqli_query($conn, "SELECT * FROM login WHERE username = '".$_SESSION['logged_in_user']."'");
-$numrows = mysqli_num_rows($query);
-while ($row = mysqli_fetch_assoc($query))
-{   
-    $pwrow = $row['password'];
-}
-if ($_SESSION['hashed_pass'] == $pwrow) {
+
+if ($useSQL == true) {
+    $conn = new mysqli($servername, $username, $password, $dbname);
+    if ($conn->connect_error) {
+      die("Connection failed: " . $conn->connect_error);
+    }
+    $stmt = $conn->prepare("SELECT * FROM login WHERE username = ?");
+    $stmt->bind_param("s", $_SESSION['logged_in_user']);
+    $stmt->execute();
+    $result = $stmt->get_result();
+    while ($row = $result->fetch_assoc())
+    {   
+        $pwrow = $row['password'];
+    }
+    if ($_SESSION['hashed_pass'] == $pwrow) {
     } else {
         session_destroy();
     }
+} else {
+    session_destroy();
+}
 ?>
 <!DOCTYPE HTML>
 <html>
@@ -25,7 +32,7 @@
 <link rel="stylesheet" href="/styles/-bootstrap.min.css">
 <link rel="stylesheet" href="/styles/-googlesymbols.css">
 
-        <?php
+<?php
 $dbsenduser = $_SESSION['logged_in_user'];
 $conn = new mysqli($servername, $username, $password, $dbname);
 if ($conn->connect_error) {
@@ -37,14 +44,16 @@
 if ($conn->connect_error) {
   die("Connection failed: " . $conn->connect_error);
 }
-$query = mysqli_query($conn, "SELECT * FROM login WHERE username = '".$_SESSION['logged_in_user']."'");
-$numrows = mysqli_num_rows($query);
-while ($row = mysqli_fetch_assoc($query))
+$stmt = $conn->prepare("SELECT * FROM login WHERE username = ?");
+$stmt->bind_param("s", $_SESSION['logged_in_user']);
+$stmt->execute();
+$result = $stmt->get_result();
+$numrows = $result->num_rows;
+while ($row = $result->fetch_assoc())
 {
     $themerow = $row['theme'];
 }
-$row = mysqli_fetch_assoc($query);
-$numrows = mysqli_num_rows($query);
+$numrows = $result->num_rows;
 }
 if(strcmp($themerow, 'blue') == 0)
 {
@@ -56,7 +65,7 @@
 {
     echo '<link rel="stylesheet" href="../styles/player'.$defaultTheme.'.css">';
 } 
-                ?>
+?>
     <body>
 <div class="w3-sidebar w3-bar-block w3-collapse w3-card sidebar" style="width:55px;" id="mySidebar">
   <button class="w3-bar-item w3-button w3-large w3-hide-large" onclick="w3_close()">&times;</button>
diff --git a/search/index.php b/search/index.php
index 78eff06..c02d677 100644
--- a/search/index.php
+++ b/search/index.php
@@ -7,19 +7,21 @@
     if ($conn->connect_error) {
       die("Connection failed: " . $conn->connect_error);
     }
-    $query = mysqli_query($conn, "SELECT * FROM login WHERE username = '".$_SESSION['logged_in_user']."'");
-    $numrows = mysqli_num_rows($query);
-    while ($row = mysqli_fetch_assoc($query))
+    $stmt = $conn->prepare("SELECT * FROM login WHERE username = ?");
+    $stmt->bind_param("s", $_SESSION['logged_in_user']);
+    $stmt->execute();
+    $result = $stmt->get_result();
+    while ($row = $result->fetch_assoc())
     {   
         $pwrow = $row['password'];
     }
     if ($_SESSION['hashed_pass'] == $pwrow) {
-        } else {
-            session_destroy();
-        }
     } else {
         session_destroy();
     }
+} else {
+    session_destroy();
+}
 
     if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on')
         $link = "https";
@@ -42,7 +44,8 @@
 <link rel="stylesheet" href="/styles/-bootstrap.min.css">
 <link rel="stylesheet" href="/styles/-googlesymbols.css">
         <script src="/scripts/sidebar.js"></script>
-        <?php
+
+<?php
 if ($useSQL == true) {
     $dbsenduser = $_SESSION['logged_in_user'];
     $conn = new mysqli($servername, $username, $password, $dbname);
@@ -55,15 +58,17 @@
     if ($conn->connect_error) {
       die("Connection failed: " . $conn->connect_error);
     }
-    $query = mysqli_query($conn, "SELECT * FROM login WHERE username = '".$_SESSION['logged_in_user']."'");
-    $numrows = mysqli_num_rows($query);
-    while ($row = mysqli_fetch_assoc($query))
+    $stmt = $conn->prepare("SELECT * FROM login WHERE username = ?");
+    $stmt->bind_param("s", $_SESSION['logged_in_user']);
+    $stmt->execute();
+    $result = $stmt->get_result();
+    while ($row = $result->fetch_assoc())
     {
         $themerow = $row['theme'];
         $regionrow = $row['region'];
-    }
-    $row = mysqli_fetch_assoc($query);
-    $numrows = mysqli_num_rows($query);
+        $loadcomments = $row['loadcomments'];
+        $userproxysetting = $row['proxy'];
+        $playerrow = $row['player'];
     }
     if(strcmp($themerow, 'blue') == 0)
     {
@@ -78,7 +83,8 @@
     } else {
         echo '<link rel="stylesheet" href="../styles/home'.$defaultTheme.'.css">';
     }
-                ?>
+}
+?>
 
 <div class="w3-sidebar w3-bar-block w3-collapse w3-card sidebar" style="width:55px;" id="mySidebar">
   <button class="w3-bar-item w3-button w3-large w3-hide-large" onclick="w3_close()">&times;</button>
diff --git a/settings.php b/settings.php
index 7fecf28..e6c6a3c 100644
--- a/settings.php
+++ b/settings.php
@@ -1,20 +1,27 @@
 <?php
 session_start();  
 include('config.php');
-$conn = new mysqli($servername, $username, $password, $dbname);
-if ($conn->connect_error) {
-  die("Connection failed: " . $conn->connect_error);
-}
-$query = mysqli_query($conn, "SELECT * FROM login WHERE username = '".$_SESSION['logged_in_user']."'");
-$numrows = mysqli_num_rows($query);
-while ($row = mysqli_fetch_assoc($query))
-{   
-    $pwrow = $row['password'];
-}
-if ($_SESSION['hashed_pass'] == $pwrow) {
+
+if ($useSQL == true) {
+    $conn = new mysqli($servername, $username, $password, $dbname);
+    if ($conn->connect_error) {
+      die("Connection failed: " . $conn->connect_error);
+    }
+    $stmt = $conn->prepare("SELECT * FROM login WHERE username = ?");
+    $stmt->bind_param("s", $_SESSION['logged_in_user']);
+    $stmt->execute();
+    $result = $stmt->get_result();
+    while ($row = $result->fetch_assoc())
+    {   
+        $pwrow = $row['password'];
+    }
+    if ($_SESSION['hashed_pass'] == $pwrow) {
     } else {
         session_destroy();
     }
+} else {
+    session_destroy();
+}
 
 $nothing = ""
 ?>
@@ -36,9 +43,12 @@
 if ($conn->connect_error) {
   die("Connection failed: " . $conn->connect_error);
 }
-$query = mysqli_query($conn, "SELECT * FROM login WHERE username = '".$_SESSION['logged_in_user']."'");
-$numrows = mysqli_num_rows($query);
-while ($row = mysqli_fetch_assoc($query))
+$stmt = $conn->prepare("SELECT * FROM login WHERE username = ?");
+$stmt->bind_param("s", $_SESSION['logged_in_user']);
+$stmt->execute();
+$result = $stmt->get_result();
+$numrows = $result->num_rows;
+while ($row = $result->fetch_assoc())
 {
     $themerow = $row['theme'];
     $langrow = $row['lang'];
@@ -48,8 +58,7 @@
     $regionrow = $row['region'];
     $loadcommentsrow = $row['loadcomments'];
 }
-$row = mysqli_fetch_assoc($query);
-$numrows = mysqli_num_rows($query);
+$numrows = $result->num_rows;
 }
 ?>
 
@@ -318,19 +327,22 @@
 if ($conn->connect_error) {
   die("Connection failed: " . $conn->connect_error);
 }
-$select = mysqli_query($conn, "SELECT * FROM login WHERE username = '".$_POST['name']."'");
-if(mysqli_num_rows($select)) {
+$stmt = $conn->prepare("SELECT * FROM login WHERE username = ?");
+$stmt->bind_param("s", $_POST['name']);
+$stmt->execute();
+$result = $stmt->get_result();
+if($result->num_rows) {
 }
-$sql = "UPDATE login
-SET theme = '$theme', lang = '$lang', region = '$uregion', proxy = '$torfproxy', player = '$uplayertype', videoshadow = '$uvideoshadow', loadcomments = '$uloadcomments'
-WHERE username = '$dbsenduser';";
-if ($conn->query($sql) === TRUE) {   
+$stmt = $conn->prepare("UPDATE login SET theme = ?, lang = ?, region = ?, proxy = ?, player = ?, videoshadow = ?, loadcomments = ? WHERE username = ?");
+$stmt->bind_param("ssssssss", $theme, $lang, $uregion, $torfproxy, $uplayertype, $uvideoshadow, $uloadcomments, $dbsenduser);
+if ($stmt->execute() === TRUE) {   
 } else {
   echo "Error: <br>" . $conn->error;
 }
 $conn->close();
 }
-include('../config.php');
+?>
+<?php
 $dbsenduser = $_SESSION['logged_in_user'];
 $conn = new mysqli($servername, $username, $password, $dbname);
 if ($conn->connect_error) {
@@ -342,14 +354,16 @@
 if ($conn->connect_error) {
   die("Connection failed: " . $conn->connect_error);
 }
-$query = mysqli_query($conn, "SELECT * FROM login WHERE username = '".$_SESSION['logged_in_user']."'");
-$numrows = mysqli_num_rows($query);
-while ($row = mysqli_fetch_assoc($query))
+$stmt = $conn->prepare("SELECT * FROM login WHERE username = ?");
+$stmt->bind_param("s", $_SESSION['logged_in_user']);
+$stmt->execute();
+$result = $stmt->get_result();
+$numrows = $result->num_rows;
+while ($row = $result->fetch_assoc())
 {
     $themerow = $row['theme'];
 }
-$row = mysqli_fetch_assoc($query);
-$numrows = mysqli_num_rows($query);
+$numrows = $result->num_rows;
 }
 if(strcmp($themerow, 'blue') == 0)
 {
@@ -361,4 +375,4 @@
 {
     echo '<link rel="stylesheet" href="../styles/player'.$defaultTheme.'.css">';
 } 
-                ?>
\ No newline at end of file
+?>
\ No newline at end of file
diff --git a/subscriptions.php b/subscriptions.php
index bdad3fd..b3bfbd9 100644
--- a/subscriptions.php
+++ b/subscriptions.php
@@ -1,20 +1,28 @@
 <?php
 session_start();  
 include('config.php');
-$conn = new mysqli($servername, $username, $password, $dbname);
-if ($conn->connect_error) {
-  die("Connection failed: " . $conn->connect_error);
-}
-$query = mysqli_query($conn, "SELECT * FROM login WHERE username = '".$_SESSION['logged_in_user']."'");
-$numrows = mysqli_num_rows($query);
-while ($row = mysqli_fetch_assoc($query))
-{   
-    $pwrow = $row['password'];
-}
-if ($_SESSION['hashed_pass'] == $pwrow) {
+
+if ($useSQL == true) {
+    $conn = new mysqli($servername, $username, $password, $dbname);
+    if ($conn->connect_error) {
+      die("Connection failed: " . $conn->connect_error);
+    }
+    $stmt = $conn->prepare("SELECT * FROM login WHERE username = ?");
+    $stmt->bind_param("s", $_SESSION['logged_in_user']);
+    $stmt->execute();
+    $result = $stmt->get_result();
+    while ($row = $result->fetch_assoc())
+    {   
+        $pwrow = $row['password'];
+    }
+    if ($_SESSION['hashed_pass'] == $pwrow) {
     } else {
         session_destroy();
     }
+} else {
+    session_destroy();
+}
+
 ?>
 <!DOCTYPE HTML>
 <html>
@@ -24,7 +32,7 @@
 <link rel="stylesheet" href="/styles/-w3.css">
 <link rel="stylesheet" href="/styles/-bootstrap.min.css">
 <link rel="stylesheet" href="/styles/-googlesymbols.css">
-        <?php
+<?php
 $dbsenduser = $_SESSION['logged_in_user'];
 $conn = new mysqli($servername, $username, $password, $dbname);
 if ($conn->connect_error) {
@@ -36,14 +44,16 @@
 if ($conn->connect_error) {
   die("Connection failed: " . $conn->connect_error);
 }
-$query = mysqli_query($conn, "SELECT * FROM login WHERE username = '".$_SESSION['logged_in_user']."'");
-$numrows = mysqli_num_rows($query);
-while ($row = mysqli_fetch_assoc($query))
+$stmt = $conn->prepare("SELECT * FROM login WHERE username = ?");
+$stmt->bind_param("s", $_SESSION['logged_in_user']);
+$stmt->execute();
+$result = $stmt->get_result();
+$numrows = $result->num_rows;
+while ($row = $result->fetch_assoc())
 {
     $themerow = $row['theme'];
 }
-$row = mysqli_fetch_assoc($query);
-$numrows = mysqli_num_rows($query);
+$numrows = $result->num_rows;
 }
 if(strcmp($themerow, 'blue') == 0)
 {
@@ -55,7 +65,7 @@
 {
     echo '<link rel="stylesheet" href="../styles/player'.$defaultTheme.'.css">';
 } 
-                ?>
+?>
 
     <body>
 
diff --git a/watch/index.php b/watch/index.php
index 21d9484..b38f305 100644
--- a/watch/index.php
+++ b/watch/index.php
@@ -7,19 +7,21 @@
     if ($conn->connect_error) {
       die("Connection failed: " . $conn->connect_error);
     }
-    $query = mysqli_query($conn, "SELECT * FROM login WHERE username = '".$_SESSION['logged_in_user']."'");
-    $numrows = mysqli_num_rows($query);
-    while ($row = mysqli_fetch_assoc($query))
+    $stmt = $conn->prepare("SELECT * FROM login WHERE username = ?");
+    $stmt->bind_param("s", $_SESSION['logged_in_user']);
+    $stmt->execute();
+    $result = $stmt->get_result();
+    while ($row = $result->fetch_assoc())
     {   
         $pwrow = $row['password'];
     }
     if ($_SESSION['hashed_pass'] == $pwrow) {
-        } else {
-            session_destroy();
-        }
     } else {
         session_destroy();
     }
+} else {
+    session_destroy();
+}
 
     if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on')
         $link = "https";
@@ -158,19 +160,17 @@
     if ($conn->connect_error) {
       die("Connection failed: " . $conn->connect_error);
     }
-    $query = mysqli_query($conn, "SELECT * FROM login WHERE username = '".$_SESSION['logged_in_user']."'");
-    $numrows = mysqli_num_rows($query);
-    while ($row = mysqli_fetch_assoc($query))
+    $stmt = $conn->prepare("SELECT * FROM login WHERE username = ?");
+    $stmt->bind_param("s", $_SESSION['logged_in_user']);
+    $stmt->execute();
+    $result = $stmt->get_result();
+    while ($row = $result->fetch_assoc())
     {
         $themerow = $row['theme'];
         $regionrow = $row['region'];
         $loadcomments = $row['loadcomments'];
         $userproxysetting = $row['proxy'];
         $playerrow = $row['player'];
-
-    }
-    $row = mysqli_fetch_assoc($query);
-    $numrows = mysqli_num_rows($query);
     }
     if(strcmp($themerow, 'blue') == 0)
     {
@@ -185,7 +185,8 @@
     } else {
         echo '<link rel="stylesheet" href="../styles/player'.$defaultTheme.'.css">';
     }
-                ?>
+}
+?>
 
 <div class="w3-sidebar w3-bar-block w3-collapse w3-card sidebar" style="width:55px;" id="mySidebar">
   <button class="w3-bar-item w3-button w3-large w3-hide-large" onclick="w3_close()">&times;</button>