diff --git a/boards/lilygo-t5-epaper-s3-pro/platformio.ini b/boards/lilygo-t5-epaper-s3-pro/platformio.ini
index 42b72ea7..a6079ea1 100644
--- a/boards/lilygo-t5-epaper-s3-pro/platformio.ini
+++ b/boards/lilygo-t5-epaper-s3-pro/platformio.ini
@@ -69,7 +69,7 @@ lib_deps =
 	; epdiy intentionally disabled here in favor of EPD_Painter.
 	;https://github.com/bmorcelli/epdiy
 	;symlink://C:/Projetos/EPD_Painter
-	https://github.com/bmorcelli/EPD_Painter
+	https://github.com/tonywestonuk/EPD_Painter
 
 lib_ignore =
 	GFX Library for Arduino
diff --git a/src/tft.h b/src/tft.h
index 8ed8e7d0..44d028ee 100644
--- a/src/tft.h
+++ b/src/tft.h
@@ -1,7 +1,6 @@
 #ifndef __TFT_H
 #define __TFT_H
 #if defined(USE_EPD_PAINTER)
-#define EPD_PAINTER_ENABLE_AUTO_SHUTDOWN 0
 // #define EPD_PAINTER_PRESET_LILYGO_T5_S3_H752
 // #define EPD_PAINTER_PRESET_LILYGO_T5_S3_GPS
 #include <EPD_Painter_presets.h>
@@ -33,6 +32,7 @@ class Ard_eSPI : public EPD_PainterAdafruit {
         _textsize = 1;
         _textcolor = BLACK;
         _textbgcolor = WHITE;
+        EPD_PainterAdafruit::setAutoShutdown(false);
         bool r = EPD_PainterAdafruit::begin();
         EPD_PainterAdafruit::setQuality(EPD_Painter::Quality::QUALITY_HIGH);
         EPD_PainterAdafruit::clear();
@@ -43,6 +43,7 @@ class Ard_eSPI : public EPD_PainterAdafruit {
     inline void display(bool a = false) {
         (void)a;
         if (xHandle != nullptr) vTaskSuspend(xHandle);
+        clearDirtyAreas(10);
         paint();
         if (xHandle != nullptr) vTaskResume(xHandle);
     }