diff --git a/embedded/lib/Display/Screen.cpp b/embedded/lib/Display/Screen.cpp
index 22af48d..08dd4bf 100644
--- a/embedded/lib/Display/Screen.cpp
+++ b/embedded/lib/Display/Screen.cpp
@@ -128,14 +128,13 @@ void Screen::boot()
   _screen->sendBuffer();
 }
 
-void Screen::loop(const float plantHumidity, const float airTemperature, const float airHumidity, const float light)
+void Screen::loop(const float plantHumidity, const float airTemperature, const float airHumidity)
 {
   _screen->clearBuffer();
   // Updating with values
   loopWindow.Update(0,String("Hum: ")+String(plantHumidity,1)+String("%"));
   loopWindow.Update(1,String("Tem: ")+String(airTemperature,1)+String("°C"));
   loopWindow.Update(2,String("Hum: ")+String(airHumidity,1)+String("%"));
-  //loopWindow.Update(3,String("Light: ")+String(light,1)+String("%"));
   // Component
   loopWindow.Display();
   iconWindow.Display();
diff --git a/embedded/lib/Display/Screen.hpp b/embedded/lib/Display/Screen.hpp
index c92c9c5..648bbe6 100644
--- a/embedded/lib/Display/Screen.hpp
+++ b/embedded/lib/Display/Screen.hpp
@@ -54,7 +54,7 @@ namespace Display
         void notConnected();
         void connected(const char *ipaddress, uint8_t timing);
         void boot();
-        void loop(const float plantHumidity, const float airTemperature, const float airHumidity, const float light);
+        void loop(const float plantHumidity, const float airTemperature, const float airHumidity);
         // Getters
         uint16_t getHeight();
         uint16_t getWidth();
diff --git a/embedded/src/main.cpp b/embedded/src/main.cpp
index 2ba7f24..9223e9e 100644
--- a/embedded/src/main.cpp
+++ b/embedded/src/main.cpp
@@ -29,6 +29,10 @@ void setup()
     Serial.println(WiFi.localIP());
     led.setup();
     airSensor.setup();
+
+    // Lights are off when powered
+    led.setColor(0,{0,0,0});
+    led.setColor(1,{0,0,0});
 }
 
 void loop()
@@ -68,16 +72,14 @@ void loop()
     auto soilHumidityData = static_cast<float>(std::any_cast<int>(humidity.getValue()));
     auto airTemperatureData = airSensor.getTemperature();
     auto airHumidityData = airSensor.getHumidity();
-    auto lightData = random(0, 1000) / 10.0;
 
     // Updating the data handler
     dataHandler.updateSoilMoistureData(soilHumidityData);
     dataHandler.updateAirTemperatureData(airTemperatureData);
     dataHandler.updateAirHumidityData(airHumidityData);
-    dataHandler.updateLightData(lightData);
 
     // Screen showing
-    screen.loop(soilHumidityData,airTemperatureData,airHumidityData,lightData);
+    screen.loop((soilHumidityData/950.0f)*100.0f,airTemperatureData,airHumidityData);
     
     // TODO: Add LedComponent management
     if (soilHumidityData < 550) {
@@ -86,6 +88,7 @@ void loop()
         Serial.println("Idle...");
     } else {
         Serial.println("Soil too wet.");
+        Serial.println("Soil too wet.");
     }
 
     serverHandler.loop();