diff --git a/hardware/include/MqttClient.hpp b/hardware/include/MqttClient.hpp
index ecb870f..9a4a155 100644
--- a/hardware/include/MqttClient.hpp
+++ b/hardware/include/MqttClient.hpp
@@ -4,6 +4,9 @@
 #include <WiFi.h>
 #include <PubSubClient.h>
 
+#define USER "contaminus"
+#define MQTT_PASSWORD "contaminus"
+
 void MQTT_OnReceived(char *topic, byte *payload, unsigned int length);
 void MQTT_Init(const char *MQTTServerAddress, uint16_t MQTTServerPort);
 void MQTT_Connect(const char *MQTTClientName);
diff --git a/hardware/include/WifiConnection.hpp b/hardware/include/WifiConnection.hpp
index 41faa2c..f5e1129 100644
--- a/hardware/include/WifiConnection.hpp
+++ b/hardware/include/WifiConnection.hpp
@@ -3,4 +3,7 @@
 #include <WiFi.h>
 #include <PubSubClient.h>
 
+#define SSID "DIGIFIBRA-D2ys"
+#define WIFI_PASSWORD "4EEATsyTcZ"
+
 int setupWifi();
\ No newline at end of file
diff --git a/hardware/include/globals.hpp b/hardware/include/globals.hpp
index a67fc2b..bfe14bf 100644
--- a/hardware/include/globals.hpp
+++ b/hardware/include/globals.hpp
@@ -5,12 +5,6 @@
 #define REST_PORT 443
 #define MQTT_PORT 1883
 
-#define USER "contaminus"
-#define MQTT_PASSWORD "contaminus"
-
-#define SSID "DIGIFIBRA-D2ys"
-#define WIFI_PASSWORD "4EEATsyTcZ"
-
 #define MQ7_ID 3
 #define BME280_ID 2
 #define GPS_ID 1
diff --git a/hardware/src/main.cpp b/hardware/src/main.cpp
index 59f09d4..8f647cf 100644
--- a/hardware/src/main.cpp
+++ b/hardware/src/main.cpp
@@ -45,7 +45,7 @@ void loop()
 {
     uint32_t now = millis();
 
-    /*if (now - matrixTimer.lastRun >= matrixTimer.interval)
+    if (now - matrixTimer.lastRun >= matrixTimer.interval)
     {
         if (MAX7219_Animate())
         {
@@ -67,7 +67,7 @@ void loop()
         sendSensorData();
 
         globalTimer.lastRun = now;
-    }*/
+    }
 
     if (now - mqttTimer.lastRun >= mqttTimer.interval)
     {