diff --git a/tasmota/berry/haspmota/haspmota.tapp b/tasmota/berry/haspmota/haspmota.tapp
index 6f3df7dfa..99b247873 100644
Binary files a/tasmota/berry/haspmota/haspmota.tapp and b/tasmota/berry/haspmota/haspmota.tapp differ
diff --git a/tasmota/berry/haspmota/haspmota_demo.tapp b/tasmota/berry/haspmota/haspmota_demo.tapp
index e402c3925..b25ad84cb 100644
Binary files a/tasmota/berry/haspmota/haspmota_demo.tapp and b/tasmota/berry/haspmota/haspmota_demo.tapp differ
diff --git a/tasmota/berry/haspmota_src/gen_haspmota.sh b/tasmota/berry/haspmota_src/gen_haspmota.sh
index c81c0fdac..47227fbc2 100755
--- a/tasmota/berry/haspmota_src/gen_haspmota.sh
+++ b/tasmota/berry/haspmota_src/gen_haspmota.sh
@@ -1,5 +1,5 @@
 # generate all haspmota tapp files
 rm haspmota.tapp; zip -j -0 haspmota.tapp haspmota_core/*
-rm haspmota_demo.tapp ; zip -j -0 haspmota_demo.tapp haspmota_demo/* haspmota_core/haspmota.be
+rm haspmota_demo.tapp ; zip -j -0 haspmota_demo.tapp haspmota_demo/*
 cp haspmota.tapp ../haspmota
 cp haspmota_demo.tapp ../haspmota
diff --git a/tasmota/berry/haspmota_src/haspmota.tapp b/tasmota/berry/haspmota_src/haspmota.tapp
index 6f3df7dfa..99b247873 100644
Binary files a/tasmota/berry/haspmota_src/haspmota.tapp and b/tasmota/berry/haspmota_src/haspmota.tapp differ
diff --git a/tasmota/berry/haspmota_src/haspmota_demo.tapp b/tasmota/berry/haspmota_src/haspmota_demo.tapp
index e402c3925..b25ad84cb 100644
Binary files a/tasmota/berry/haspmota_src/haspmota_demo.tapp and b/tasmota/berry/haspmota_src/haspmota_demo.tapp differ
diff --git a/tasmota/berry/haspmota_src/haspmota_demo/autoexec.be b/tasmota/berry/haspmota_src/haspmota_demo/autoexec.be
index 0bc19a917..dea8d9fdf 100644
--- a/tasmota/berry/haspmota_src/haspmota_demo/autoexec.be
+++ b/tasmota/berry/haspmota_src/haspmota_demo/autoexec.be
@@ -11,7 +11,7 @@ import lv_tasmota_info
 import lv_wifi_graph
 
 import haspmota
-haspmota.start(false, "haspmota_demo.tapp#pages.jsonl")
+haspmota.start(false, tasmota.wd + "pages.jsonl")
 
 var prev_day = -1
 def set_watch()
diff --git a/tasmota/berry/modules/antiburn/antiburn.be b/tasmota/berry/modules/antiburn/antiburn.be
index 68bfa5649..e695df9ca 100644
--- a/tasmota/berry/modules/antiburn/antiburn.be
+++ b/tasmota/berry/modules/antiburn/antiburn.be
@@ -2,8 +2,7 @@ var antiburn = module('antiburn')
 
 antiburn.init = def (m)
     class Antiburn
-        var scr_original
-        var scr_antiburn
+        var antiburn            # the lv_obj object used as a plain color
         var running
         static colors = [
             0x000000,
@@ -20,33 +19,47 @@ antiburn.init = def (m)
                 return
             else
                 lv.start()
-                self.scr_original = lv.scr_act()
-                self.scr_antiburn = lv.obj(0)
-                lv.scr_load(self.scr_antiburn)
-                self.scr_antiburn.add_event_cb(/->self.stop(), lv.EVENT_PRESSED, 0)
+
+                if self.antiburn == nil
+                    var antiburn = lv.obj(lv.layer_top())
+                    antiburn.set_style_radius(0, 0)
+                    antiburn.set_style_border_width(0, 0)
+                    antiburn.set_style_bg_opa(255, 0)
+                    antiburn.set_pos(0, 0)
+                    antiburn.set_width(lv.get_hor_res())
+                    antiburn.set_height(lv.get_ver_res())
+                    
+                    antiburn.add_event_cb(/->self.stop(), lv.EVENT_PRESSED, 0)
+                    self.antiburn = antiburn
+                end
+                self.antiburn.set_style_bg_opa(255, 0)
+                self.antiburn.add_flag(lv.OBJ_FLAG_CLICKABLE)
+                self.antiburn.move_foreground()
+
                 self.running = true
                 self.cycle(0)
             end
         end
         def cycle(i)
-            if !self.running return end
+            if !self.running || self.antiburn == nil return nil end
             if i < 30
-                self.scr_antiburn.set_style_bg_color(lv.color_hex(self.colors[i % 5]), 0)
+                self.antiburn.set_style_bg_color(lv.color_hex(self.colors[i % 5]), 0)
                 tasmota.set_timer(1000, /->self.cycle(i+1))
             else
                 self.stop()
             end
         end
         def stop()
-            if self.running && self.scr_antiburn != nil
-                lv.scr_load(self.scr_original)
+            if self.running && self.antiburn != nil
+                self.antiburn.set_style_bg_opa(0, 0)
+                self.antiburn.clear_flag(lv.OBJ_FLAG_CLICKABLE)
                 self.running = false
-                self.scr_antiburn.del()
-                self.scr_antiburn = nil
+                self.antiburn.del()
+                self.antiburn = nil
             end    
         end
     end
     return Antiburn()
 end
 
-return antiburn
\ No newline at end of file
+return antiburn