diff --git a/extras/include.php b/extras/include.php
index 75bf884..a048949 100644
--- a/extras/include.php
+++ b/extras/include.php
@@ -1,6 +1,11 @@
 <?php
 header('Content-Type: text/html; charset=iso-8859-1');
 
-$con = mysql_connect("localhost","extras","extrauser");
-mysql_select_db("forum", $con);
+$mysqli = new mysqli("localhost","extras","extrauser","forum");
+if ($mysqli->connect_errno){
+	echo "Error: Failed to make a MySQL connection: \n";
+	echo "Errno: " . $mysqli->connect_errno . "\n";
+	echo "Error: " . $mysqli->connect_error . "\n";
+	exit;
+}
 ?>
diff --git a/extras/list.php b/extras/list.php
index 8e52a20..1cee6b8 100644
--- a/extras/list.php
+++ b/extras/list.php
@@ -21,9 +21,9 @@ $abfrage = "SELECT u.username, u.email, u.userTitle, v.userOption45, v.userOptio
 		INNER JOIN wcf1_user_option_value AS v ON u.userID = v.userID
 		WHERE g.groupName ='$fachschaft' 
 		ORDER BY v.userOption47";
-$ergebnis = mysql_query($abfrage);
+$ergebnis = $mysqli->query($abfrage);
 
-while($data = mysql_fetch_array($ergebnis)){
+while($data = $ergebnis->fetch_assoc()){
 	echo "<tr>";
 	echo "<td>".$data['userOption47']."</td>";
 	echo "<td>".$data['username']."</td>";
@@ -33,16 +33,17 @@ while($data = mysql_fetch_array($ergebnis)){
 	echo "<td>".$data['userOption28']."</td>";
 	echo "<td>".$data['userOption12']."</td>";
 	echo "<td>".$data['userOption15'];
-if ($data['userOption53'] == "1" || $data['userOption53'] == "Ja") {
-	echo ", Schl&uuml;sselbesitzer";
-}
-						else {echo "";
-						}
-echo "</td>";
+	if ($data['userOption53'] == "1" || $data['userOption53'] == "Ja") {
+		echo ", Schl&uuml;sselbesitzer";
+	} else {
+		echo "";
+	}
+	echo "</td>";
 	echo "</tr>";
 }
 
-mysql_close($con);
+$mysqli->free();
+$mysqli->close();
 
 ?>
 </table>
diff --git a/extras/sowikeys.php b/extras/sowikeys.php
index bb4b172..2e21601 100644
--- a/extras/sowikeys.php
+++ b/extras/sowikeys.php
@@ -18,9 +18,9 @@ $abfrage = "SELECT v.userOption47, v.userOption53
                         FROM wcf1_user AS u, wcf1_user_option_value AS v
                         WHERE u.userID = v.userID AND u.userTitle LIKE '%SOWI%' AND not u.usertitle LIKE '%ex-SOWI%' AND not v.userOption53 LIKE 0 AND not v.userOption53 LIKE  '%Nein%' AND not u.usertitle LIKE '%SOWI-extern%' 
                         ORDER BY v.userOption47";
-$ergebnis = mysql_query($abfrage);
+$ergebnis = $mysqli->query($abfrage);
 
-while($data = mysql_fetch_array($ergebnis)){
+while($data = $ergebnis->fetch_assoc()){
 	echo "<tr>";
 	echo "<td>".$data['userOption47']."</td>";
 	echo "<td> X </td>";
@@ -29,7 +29,8 @@ while($data = mysql_fetch_array($ergebnis)){
 	echo "</tr>";
 }
 
-mysql_close($con);
+$mysqli->free();
+$mysqli->close();
 
 ?>
 </table>
diff --git a/extras/tasks.php b/extras/tasks.php
index aab0db6..ef3449c 100644
--- a/extras/tasks.php
+++ b/extras/tasks.php
@@ -18,41 +18,39 @@ $abfrage = "SELECT u.username, u.email, u.userTitle, v.userOption45, v.userOptio
                         FROM wcf1_user AS u, wcf1_user_option_value AS v
                         WHERE u.userID = v.userID AND u.userTitle LIKE '%$fachschaft%' AND not u.usertitle LIKE '%ex-$fachschaft%' AND not u.usertitle LIKE '%$fachschaft-extern%' 
                         ORDER BY v.amt DESC";
-$ergebnis = mysql_query($abfrage);
+$ergebnis = $mysqli->query($abfrage);
 
-while($data = mysql_fetch_array($ergebnis)){
+while($data = $ergebnis->fetch_assoc()){
 	echo "<tr><td>";
-if ($data['userOption47'] != NULL){
-echo $data['userOption47'];
-}
-else {
-echo "USERNAME:";echo $data['username'];
-}
-echo "</td><td>";
-if ($data['amt'] == "10") {
-echo "Fachschaftssprecher";
-}
-elseif ($data['amt'] == "9") {
-echo "stv. Fachschaftssprecher";
-}
-elseif ($data['amt'] == "3") {
-echo "gew&auml;hltes Mitglied";
-}
-else {echo "ehrenamtliches Mitglied";
-}
-echo "</td>";
-echo "<td>".$data['userOption15']."</td>";
-echo "<td>";
-if ($data['userOption53'] == "1" || $data['userOption53'] == "Ja" ) {
-	echo "Schl&uuml;sselbesitzer";
-}
-						else {echo "";
-						}
-echo "</td>";
+	if ($data['userOption47'] != NULL){
+		echo $data['userOption47'];
+	} else {
+		echo "USERNAME:";echo $data['username'];
+	}
+	echo "</td><td>";
+	if ($data['amt'] == "10") {
+		echo "Fachschaftssprecher";
+	} elseif ($data['amt'] == "9") {
+		echo "stv. Fachschaftssprecher";
+	} elseif ($data['amt'] == "3") {
+		echo "gew&auml;hltes Mitglied";
+	} else {
+		echo "ehrenamtliches Mitglied";
+	}
+	echo "</td>";
+	echo "<td>".$data['userOption15']."</td>";
+	echo "<td>";
+	if ($data['userOption53'] == "1" || $data['userOption53'] == "Ja" ) {
+		echo "Schl&uuml;sselbesitzer";
+	} else {
+		echo "";
+	}
+	echo "</td>";
 	echo "</tr>";
 }
 
-mysql_close($con);
+$mysqli->free();
+$mysqli->close();
 
 ?>
 </table>
diff --git a/extras/wiaikeys.php b/extras/wiaikeys.php
index abdba41..fcde362 100644
--- a/extras/wiaikeys.php
+++ b/extras/wiaikeys.php
@@ -18,9 +18,9 @@ $abfrage = "SELECT v.userOption47, v.userOption53
                         FROM wcf1_user AS u, wcf1_user_option_value AS v
                         WHERE u.userID = v.userID AND u.userTitle LIKE '%WIAI%' AND not u.usertitle LIKE '%ex-WIAI%' AND not v.userOption53 LIKE 0 AND not v.userOption53 LIKE  '%Nein%' AND not u.usertitle LIKE '%WIAI-extern%' 
                         ORDER BY v.userOption47";
-$ergebnis = mysql_query($abfrage);
+$ergebnis = $mysqli->query($abfrage);
 
-while($data = mysql_fetch_array($ergebnis)){
+while($data = $ergebnis->fetch_assoc()){
 	echo "<tr>";
 	echo "<td>".$data['userOption47']."</td>";
 	echo "<td> X </td>";
@@ -29,7 +29,8 @@ while($data = mysql_fetch_array($ergebnis)){
 	echo "</tr>";
 }
 
-mysql_close($con);
+$mysqli->free();
+$mysqli->close();
 
 ?>
 </table>