diff --git a/binaries/AP_FW_1.54.bin b/binaries/AP_FW_1.54.bin
index 5364e60c..4ada9ee7 100644
Binary files a/binaries/AP_FW_1.54.bin and b/binaries/AP_FW_1.54.bin differ
diff --git a/binaries/AP_FW_2.9.bin b/binaries/AP_FW_2.9.bin
index 9f7c1eae..b664e285 100644
Binary files a/binaries/AP_FW_2.9.bin and b/binaries/AP_FW_2.9.bin differ
diff --git a/binaries/AP_FW_Nodisplay.bin b/binaries/AP_FW_Nodisplay.bin
index a662da85..3b7d4468 100644
Binary files a/binaries/AP_FW_Nodisplay.bin and b/binaries/AP_FW_Nodisplay.bin differ
diff --git a/binaries/AP_FW_Pack.bin b/binaries/AP_FW_Pack.bin
index 556b10c8..e29ea531 100644
Binary files a/binaries/AP_FW_Pack.bin and b/binaries/AP_FW_Pack.bin differ
diff --git a/binaries/AP_FW_Segmented_UK.bin b/binaries/AP_FW_Segmented_UK.bin
index e3431523..34d1d0a9 100644
Binary files a/binaries/AP_FW_Segmented_UK.bin and b/binaries/AP_FW_Segmented_UK.bin differ
diff --git a/binaries/Tag_FW_1.54.bin b/binaries/Tag_FW_1.54.bin
index 81211f53..3a43e2bb 100644
Binary files a/binaries/Tag_FW_1.54.bin and b/binaries/Tag_FW_1.54.bin differ
diff --git a/binaries/Tag_FW_2.9-uc8151.bin b/binaries/Tag_FW_2.9-uc8151.bin
index 79aa26f1..e8630627 100644
Binary files a/binaries/Tag_FW_2.9-uc8151.bin and b/binaries/Tag_FW_2.9-uc8151.bin differ
diff --git a/binaries/Tag_FW_2.9.bin b/binaries/Tag_FW_2.9.bin
index f2a04d3e..90f1fdd9 100644
Binary files a/binaries/Tag_FW_2.9.bin and b/binaries/Tag_FW_2.9.bin differ
diff --git a/binaries/Tag_FW_4.2.bin b/binaries/Tag_FW_4.2.bin
index 58c84d1b..95e9a3a4 100644
Binary files a/binaries/Tag_FW_4.2.bin and b/binaries/Tag_FW_4.2.bin differ
diff --git a/binaries/Tag_FW_Pack.bin b/binaries/Tag_FW_Pack.bin
index 5ee75202..a45ff79c 100644
Binary files a/binaries/Tag_FW_Pack.bin and b/binaries/Tag_FW_Pack.bin differ
diff --git a/tag_types.h b/tag_types.h
index caada3e5..73d0fb61 100755
--- a/tag_types.h
+++ b/tag_types.h
@@ -1,7 +1,9 @@
-#define SOLUM_154_033 0
-#define SOLUM_29_033 1
-#define SOLUM_42_033 2
+#define SOLUM_154_SSD1619 0
+#define SOLUM_29_SSD1619 0x01
+#define SOLUM_29_UC8151 0x11
+#define SOLUM_42_SSD1619 0x02
 #define SOLUM_SEG_UK 0xF0
+#define SOLUM_SEG_EU 0xF1
 #define SOLUM_NODISPLAY 0xFF
 
 #define CAPABILITY_HAS_EXT_POWER 0x10
diff --git a/zbs243_AP_FW/Makefile b/zbs243_AP_FW/Makefile
index ea233c4b..a6d8074d 100644
--- a/zbs243_AP_FW/Makefile
+++ b/zbs243_AP_FW/Makefile
@@ -1,5 +1,5 @@
 
-BUILD		?= zbs29v033
+BUILD		?= zbs29_ssd1619
 
 #file containing main() must be first!
 SOURCES         += main.c
diff --git a/zbs243_AP_FW/buildfw.sh b/zbs243_AP_FW/buildfw.sh
index 12bc707e..3a08dec7 100755
--- a/zbs243_AP_FW/buildfw.sh
+++ b/zbs243_AP_FW/buildfw.sh
@@ -13,12 +13,12 @@ mv main.bin ../binaries/AP_FW_Nodisplay.bin -v
 make clean > /dev/null
 
 echo -e "\n\nBuilding 1.54 version..."
-make BUILD=zbs154v033 CPU=8051 SOC=zbs243 > /dev/null
+make BUILD=zbs154_ssd1619 CPU=8051 SOC=zbs243 > /dev/null
 mv main.bin ../binaries/AP_FW_1.54.bin -v
 make clean > /dev/null
 
 echo -e "\n\nBuilding 2.9 version..."
-make BUILD=zbs29v033 CPU=8051 SOC=zbs243 > /dev/null
+make BUILD=zbs29_ssd1619 CPU=8051 SOC=zbs243 > /dev/null
 mv main.bin ../binaries/AP_FW_2.9.bin -v
 make clean > /dev/null
 
diff --git a/zbs243_AP_FW/main.c b/zbs243_AP_FW/main.c
index 01f25dfd..61e893f5 100755
--- a/zbs243_AP_FW/main.c
+++ b/zbs243_AP_FW/main.c
@@ -30,7 +30,7 @@
 struct pendingData __xdata pendingDataArr[MAX_PENDING_MACS];
 
 // VERSION GOES HERE!
-uint16_t __xdata version = 0x0015;
+uint16_t __xdata version = 0x0016;
 
 #define RAW_PKT_PADDING 2
 
@@ -802,7 +802,9 @@ void main(void) {
 #endif
         for (uint8_t __xdata c = 0; c < MAX_PENDING_MACS; c++) {
             if (pendingDataArr[c].attemptsLeft == 1) {
-                espNotifyTimeOut(pendingDataArr[c].targetMac);
+                if (pendingDataArr[c].availdatainfo.dataType != DATATYPE_NOUPDATE) {
+                    espNotifyTimeOut(pendingDataArr[c].targetMac);
+                }
                 pendingDataArr[c].attemptsLeft = 0;
             } else if (pendingDataArr[c].attemptsLeft > 1) {
                 pendingDataArr[c].attemptsLeft--;
diff --git a/zbs243_Tag_FW/Makefile b/zbs243_Tag_FW/Makefile
index 97559423..38eddeaf 100644
--- a/zbs243_Tag_FW/Makefile
+++ b/zbs243_Tag_FW/Makefile
@@ -1,5 +1,5 @@
 
-BUILD		?= zbs29v033
+BUILD		?= zbs29_ssd1619
 
 #file containing main() must be first!
 SOURCES		+= main.c eeprom.c drawing.c
diff --git a/zbs243_Tag_FW/buildfw.sh b/zbs243_Tag_FW/buildfw.sh
index 88ad3c75..bca0ada5 100755
--- a/zbs243_Tag_FW/buildfw.sh
+++ b/zbs243_Tag_FW/buildfw.sh
@@ -2,17 +2,17 @@
 make clean > /dev/null
 
 echo -e "\nBuilding 1.54 version..."
-make BUILD=zbs154v033 CPU=8051 SOC=zbs243 > /dev/null
+make BUILD=zbs154_ssd1619 CPU=8051 SOC=zbs243 > /dev/null
 mv main.bin ../binaries/Tag_FW_1.54.bin -v
 make clean > /dev/null
 
 echo -e "\n\nBuilding 2.9 (SSD1619) version..."
-make BUILD=zbs29v033 CPU=8051 SOC=zbs243 > /dev/null
+make BUILD=zbs29_ssd1619 CPU=8051 SOC=zbs243 > /dev/null
 mv main.bin ../binaries/Tag_FW_2.9.bin -v
 make clean > /dev/null
 
 echo -e "\n\nBuilding 4.2 version..."
-make BUILD=zbs42v033 CPU=8051 SOC=zbs243 > /dev/null
+make BUILD=zbs42_ssd1619 CPU=8051 SOC=zbs243 > /dev/null
 mv main.bin ../binaries/Tag_FW_4.2.bin -v
 make clean > /dev/null
 
diff --git a/zbs243_Tag_FW/main.c b/zbs243_Tag_FW/main.c
index e888da30..ce7b32b7 100755
--- a/zbs243_Tag_FW/main.c
+++ b/zbs243_Tag_FW/main.c
@@ -154,19 +154,6 @@ void main() {
         wakeUpReason = WAKEUP_REASON_FIRSTBOOT;
     }
 
-    switch (checkButtonOrJig()) {
-        case DETECT_P1_0_NOTHING:
-            break;
-        case DETECT_P1_0_BUTTON:
-            capabilities |= CAPABILITY_HAS_WAKE_BUTTON;
-            break;
-        case DETECT_P1_0_JIG:
-            // show splash screen?
-            break;
-        default:
-            break;
-    }
-
     wdt10s();
 
     boardGetOwnMac(mSelfMac);
@@ -218,6 +205,24 @@ void main() {
     initializeProto();
     powerDown(INIT_EEPROM);
 
+    switch (checkButtonOrJig()) {
+        case DETECT_P1_0_BUTTON:
+            capabilities |= CAPABILITY_HAS_WAKE_BUTTON;
+            break;
+        case DETECT_P1_0_JIG:
+            wdt120s();
+            // show the screensaver (minimal text to prevent image burn-in)
+            powerUp(INIT_EPD);
+            afterFlashScreenSaver();
+            while (1)
+                ;
+            break;
+        case DETECT_P1_0_NOTHING:
+            break;
+        default:
+            break;
+    }
+
     // show the splashscreen
     powerUp(INIT_EPD);
     showSplashScreen();
diff --git a/zbs243_Tag_FW/userinterface.c b/zbs243_Tag_FW/userinterface.c
index fba7bc0b..1ef87c8c 100755
--- a/zbs243_Tag_FW/userinterface.c
+++ b/zbs243_Tag_FW/userinterface.c
@@ -81,6 +81,32 @@ void addOverlay() {
     }
 }
 
+
+void afterFlashScreenSaver() {
+    selectLUT(EPD_LUT_DEFAULT);
+    clearScreen();
+    setColorMode(EPD_MODE_NORMAL, EPD_MODE_INVERT);
+
+#if (SCREEN_WIDTH == 152)  // 1.54"
+    epdPrintBegin(2, 2, EPD_DIRECTION_X, EPD_SIZE_SINGLE, EPD_COLOR_BLACK);
+    epdpr("OpenEPaperLink");
+    epdPrintEnd();
+#endif
+
+#if (SCREEN_WIDTH == 128)  // 2.9"
+    epdPrintBegin(0, 295, EPD_DIRECTION_Y, EPD_SIZE_SINGLE, EPD_COLOR_BLACK);
+    epdpr("OpenEPaperLink");
+    epdPrintEnd();
+#endif
+#if (SCREEN_WIDTH == 400)  // 4.2"
+    epdPrintBegin(3, 3, EPD_DIRECTION_X, EPD_SIZE_DOUBLE, EPD_COLOR_BLACK);
+    epdpr("OpenEPaperLink");
+    epdPrintEnd();
+#endif
+    drawWithSleep();
+}
+
+
 void showSplashScreen() {
     selectLUT(EPD_LUT_NO_REPEATS);
     clearScreen();
diff --git a/zbs243_Tag_FW/userinterface.h b/zbs243_Tag_FW/userinterface.h
old mode 100644
new mode 100755
index 2149de35..4fb51f27
--- a/zbs243_Tag_FW/userinterface.h
+++ b/zbs243_Tag_FW/userinterface.h
@@ -4,6 +4,7 @@
 
 void addOverlay();
 
+void afterFlashScreenSaver();
 void showSplashScreen();
 void showApplyUpdate();
 void showScanningWindow();
diff --git a/zbs243_shared/board/zbs154v033/board.c b/zbs243_shared/board/zbs154_ssd1619/board.c
similarity index 100%
rename from zbs243_shared/board/zbs154v033/board.c
rename to zbs243_shared/board/zbs154_ssd1619/board.c
diff --git a/zbs243_shared/board/zbs154v033/board.h b/zbs243_shared/board/zbs154_ssd1619/board.h
similarity index 95%
rename from zbs243_shared/board/zbs154v033/board.h
rename to zbs243_shared/board/zbs154_ssd1619/board.h
index 706d78a2..6e8c683e 100755
--- a/zbs243_shared/board/zbs154v033/board.h
+++ b/zbs243_shared/board/zbs154_ssd1619/board.h
@@ -25,7 +25,7 @@
 #define AP_EMULATE_TAG 1
 
 //hw types
-#define HW_TYPE					        SOLUM_154_033
+#define HW_TYPE					        SOLUM_154_SSD1619
 
 #include "../boardCommon.h"
 
diff --git a/zbs243_shared/board/zbs154v033/make.mk b/zbs243_shared/board/zbs154_ssd1619/make.mk
similarity index 100%
rename from zbs243_shared/board/zbs154v033/make.mk
rename to zbs243_shared/board/zbs154_ssd1619/make.mk
diff --git a/zbs243_shared/board/zbs154v033/screen.c b/zbs243_shared/board/zbs154_ssd1619/screen.c
similarity index 100%
rename from zbs243_shared/board/zbs154v033/screen.c
rename to zbs243_shared/board/zbs154_ssd1619/screen.c
diff --git a/zbs243_shared/board/zbs154v033/screen.h b/zbs243_shared/board/zbs154_ssd1619/screen.h
similarity index 100%
rename from zbs243_shared/board/zbs154v033/screen.h
rename to zbs243_shared/board/zbs154_ssd1619/screen.h
diff --git a/zbs243_shared/board/zbs29v033/board.c b/zbs243_shared/board/zbs29_ssd1619/board.c
similarity index 100%
rename from zbs243_shared/board/zbs29v033/board.c
rename to zbs243_shared/board/zbs29_ssd1619/board.c
diff --git a/zbs243_shared/board/zbs29v033/board.h b/zbs243_shared/board/zbs29_ssd1619/board.h
similarity index 95%
rename from zbs243_shared/board/zbs29v033/board.h
rename to zbs243_shared/board/zbs29_ssd1619/board.h
index b7282111..6c78a256 100755
--- a/zbs243_shared/board/zbs29v033/board.h
+++ b/zbs243_shared/board/zbs29_ssd1619/board.h
@@ -24,7 +24,7 @@
 #define AP_EMULATE_TAG 1
 
 //hw types
-#define HW_TYPE					        SOLUM_29_033
+#define HW_TYPE					        SOLUM_29_SSD1619
 
 #include "../boardCommon.h"
 
diff --git a/zbs243_shared/board/zbs29v033/make.mk b/zbs243_shared/board/zbs29_ssd1619/make.mk
similarity index 100%
rename from zbs243_shared/board/zbs29v033/make.mk
rename to zbs243_shared/board/zbs29_ssd1619/make.mk
diff --git a/zbs243_shared/board/zbs29v033/screen.c b/zbs243_shared/board/zbs29_ssd1619/screen.c
similarity index 100%
rename from zbs243_shared/board/zbs29v033/screen.c
rename to zbs243_shared/board/zbs29_ssd1619/screen.c
diff --git a/zbs243_shared/board/zbs29v033/screen.h b/zbs243_shared/board/zbs29_ssd1619/screen.h
similarity index 100%
rename from zbs243_shared/board/zbs29v033/screen.h
rename to zbs243_shared/board/zbs29_ssd1619/screen.h
diff --git a/zbs243_shared/board/zbs29_uc8151/board.h b/zbs243_shared/board/zbs29_uc8151/board.h
index b7282111..82a58130 100755
--- a/zbs243_shared/board/zbs29_uc8151/board.h
+++ b/zbs243_shared/board/zbs29_uc8151/board.h
@@ -24,7 +24,7 @@
 #define AP_EMULATE_TAG 1
 
 //hw types
-#define HW_TYPE					        SOLUM_29_033
+#define HW_TYPE					        SOLUM_29_UC8151
 
 #include "../boardCommon.h"
 
diff --git a/zbs243_shared/board/zbs42v033/board.c b/zbs243_shared/board/zbs42_ssd1619/board.c
similarity index 100%
rename from zbs243_shared/board/zbs42v033/board.c
rename to zbs243_shared/board/zbs42_ssd1619/board.c
diff --git a/zbs243_shared/board/zbs42v033/board.h b/zbs243_shared/board/zbs42_ssd1619/board.h
similarity index 95%
rename from zbs243_shared/board/zbs42v033/board.h
rename to zbs243_shared/board/zbs42_ssd1619/board.h
index cdc1d3bd..7b8ece16 100755
--- a/zbs243_shared/board/zbs42v033/board.h
+++ b/zbs243_shared/board/zbs42_ssd1619/board.h
@@ -25,7 +25,7 @@
 #define AP_EMULATE_TAG 1
 
 //hw types
-#define HW_TYPE					        SOLUM_42_033
+#define HW_TYPE					        SOLUM_42_SSD1619
 
 #include "../boardCommon.h"
 
diff --git a/zbs243_shared/board/zbs42v033/make.mk b/zbs243_shared/board/zbs42_ssd1619/make.mk
similarity index 100%
rename from zbs243_shared/board/zbs42v033/make.mk
rename to zbs243_shared/board/zbs42_ssd1619/make.mk
diff --git a/zbs243_shared/board/zbs42v033/screen.c b/zbs243_shared/board/zbs42_ssd1619/screen.c
similarity index 100%
rename from zbs243_shared/board/zbs42v033/screen.c
rename to zbs243_shared/board/zbs42_ssd1619/screen.c
diff --git a/zbs243_shared/board/zbs42v033/screen.h b/zbs243_shared/board/zbs42_ssd1619/screen.h
similarity index 100%
rename from zbs243_shared/board/zbs42v033/screen.h
rename to zbs243_shared/board/zbs42_ssd1619/screen.h