diff --git a/api/server.js b/api/server.js
index 78888d4e..00a8e0ae 100644
--- a/api/server.js
+++ b/api/server.js
@@ -87,11 +87,13 @@ app.get("/sui/api/providers", (req, res) => {
         if (error) throw error;
         res.status(200).send(results);
       });
-
 });
 
 app.get("/sui/api/themes", (req, res) => {
-    res.status(200).send(themes.themes);
+    con.query('SELECT * FROM themes', (error, results, fields) => {
+        if (error) throw error;
+        res.status(200).send(results);
+      });
 });
 
 app.get("/sui/api/personaldata", (req, res) => {
diff --git a/src/assets/functions.js b/src/assets/functions.js
index 441b558f..e4736154 100644
--- a/src/assets/functions.js
+++ b/src/assets/functions.js
@@ -23,8 +23,7 @@ export function greet() {
     let currentTime = new Date();
     let greet = Math.floor(currentTime.getHours() / 6);
     let easterEggChance = Math.floor(Math.random() * 100);
-    let rawgreetings = fetch("/sui/api/messages");
-    let greetings = rawgreetings.json();
+    let greetings = require("../messages.json");
     let timeBased = [];
     let easterEggs = [];
     for (var i = 0; i < greetings.messages.length; i++) {
diff --git a/src/components/PersonalInfo.js b/src/components/PersonalInfo.js
index ee597e98..35f9090a 100644
--- a/src/components/PersonalInfo.js
+++ b/src/components/PersonalInfo.js
@@ -7,7 +7,7 @@ function PersonalInfo() {
   const getData = async () => {
     const response = await fetch("/sui/api/personaldata");
     const data = await response.json();
-    setState(data);
+    setState(data[0]);
   };
 
   useEffect(() => {