diff --git a/tasmota/berry/haspmota/gen_haspmota.sh b/tasmota/berry/haspmota/gen_haspmota.sh
new file mode 100755
index 000000000..7090e2db9
--- /dev/null
+++ b/tasmota/berry/haspmota/gen_haspmota.sh
@@ -0,0 +1,2 @@
+# generate all haspmota tapp files
+rm haspmota_demo.tapp ; zip -j -0 haspmota_demo.tapp ../haspmota_src/haspmota_demo/*
diff --git a/tasmota/berry/haspmota/haspmota.tapp b/tasmota/berry/haspmota/haspmota.tapp
deleted file mode 100644
index 99b247873..000000000
Binary files a/tasmota/berry/haspmota/haspmota.tapp and /dev/null differ
diff --git a/tasmota/berry/haspmota/haspmota_demo.tapp b/tasmota/berry/haspmota/haspmota_demo.tapp
index b25ad84cb..83ce5b983 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/haspmota_widgets.tapp b/tasmota/berry/haspmota/haspmota_widgets.tapp
deleted file mode 100644
index 45212df04..000000000
Binary files a/tasmota/berry/haspmota/haspmota_widgets.tapp and /dev/null differ
diff --git a/tasmota/berry/haspmota/pages.jsonl b/tasmota/berry/haspmota/pages.jsonl
deleted file mode 100644
index 59578d84a..000000000
--- a/tasmota/berry/haspmota/pages.jsonl
+++ /dev/null
@@ -1,33 +0,0 @@
-{"page":0,"comment":"---------- Upper stat line ----------"}
-{"id":0,"text_color":"#FFFFFF"}
-{"id":11,"obj":"label","x":0,"y":0,"w":320,"pad_right":90,"h":22,"bg_color":"#D00000","bg_opa":255,"radius":0,"border_side":0,"text":"Tasmota","text_font":"montserrat-20"}
-
-{"id":15,"obj":"lv_wifi_arcs","x":291,"y":0,"w":29,"h":22,"radius":0,"border_side":0,"bg_color":"#000000","line_color":"#FFFFFF"}
-{"id":16,"obj":"lv_clock","x":232,"y":3,"w":55,"h":16,"radius":0,"border_side":0}
-
-{"comment":"---------- Bottom buttons - prev/home/next ----------"}
-{"id":101,"obj":"btn","x":20,"y":210,"w":80,"h":25,"action":"prev","bg_color":"#1fa3ec","radius":10,"border_side":1,"text":"\uF053","text_font":"montserrat-20"}
-{"id":102,"obj":"btn","x":120,"y":210,"w":80,"h":25,"action":"back","bg_color":"#1fa3ec","radius":10,"border_side":1,"text":"\uF015","text_font":"montserrat-20"}
-{"id":103,"obj":"btn","x":220,"y":210,"w":80,"h":25,"action":"next","bg_color":"#1fa3ec","radius":10,"border_side":1,"text":"\uF054","text_font":"montserrat-20"}
-
-{"page":2,"comment":"---------- Page 2 ----------"}
-{"id":0,"bg_color":"#0000A0","bg_grad_color":"#000000","bg_grad_dir":1,"text_color":"#FFFFFF"}
-
-{"comment":"---------- Wifi status ----------"}
-{"id":20,"obj":"lv_wifi_graph","x":257,"y":25,"w":60,"h":40,"radius":0}
-{"id":21,"obj":"lv_tasmota_info","x":3,"y":25,"w":251,"h":40,"radius":0}
-{"id":22,"obj":"lv_tasmota_log","x":3,"y":68,"w":314,"h":90,"radius":0,"text_font":12}
-
-{"page":1,"comment":"---------- Page 1 ----------"}
-{"id":0,"bg_color":"#0000A0","bg_grad_color":"#000000","bg_grad_dir":1,"text_color":"#FFFFFF"}
-
-{"id":2,"obj":"arc","x":20,"y":65,"w":80,"h":100,"border_side":0,"type":0,"rotation":0,"start_angle":180,"end_angle":0,"start_angle1":180,"value_font":12,"value_ofs_x":0,"value_ofs_y":-14,"bg_opa":0,"text":"--.-°C","min":200,"max":800,"val":0,"val_rule":"ESP32#Temperature","val_rule_formula":"val * 10","text_rule":"ESP32#Temperature","text_rule_format":"%2.1f °C"}
-
-{"id":5,"obj":"label","x":2,"y":35,"w":120,"text":"Temperature","align":1}
-
-{"id":10,"obj":"label","x":172,"y":35,"w":140,"text":"MPU","align":0}
-{"id":11,"obj":"label","x":172,"y":55,"w":140,"text":"x=","align":0,"text_rule":"MPU9250#AX","text_rule_format":"x=%6.3f","text_rule_formula":"val / 1000"}
-{"id":12,"obj":"label","x":172,"y":75,"w":140,"text":"y=","align":0,"text_rule":"MPU9250#AY","text_rule_format":"y=%6.3f","text_rule_formula":"val / 1000"}
-{"id":13,"obj":"label","x":172,"y":95,"w":140,"text":"z=","align":0,"text_rule":"MPU9250#AZ","text_rule_format":"z=%6.3f","text_rule_formula":"val / 1000"}
-
-{"comment":"--- Trigger sensors every 2 seconds ---","berry_run":"tasmota.add_cron('*/2 * * * * *', def () tasmota.publish_rule(tasmota.read_sensors()) end, 'oh_every_5_s')"}
diff --git a/tasmota/berry/haspmota/robotocondensed_latin1.tapp b/tasmota/berry/haspmota/robotocondensed_latin1.tapp
deleted file mode 100644
index e4c8ca84c..000000000
Binary files a/tasmota/berry/haspmota/robotocondensed_latin1.tapp and /dev/null differ
diff --git a/tasmota/berry/haspmota_src/gen_haspmota.sh b/tasmota/berry/haspmota_src/gen_haspmota.sh
deleted file mode 100755
index 47227fbc2..000000000
--- a/tasmota/berry/haspmota_src/gen_haspmota.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/*
-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
deleted file mode 100644
index 99b247873..000000000
Binary files a/tasmota/berry/haspmota_src/haspmota.tapp and /dev/null differ
diff --git a/tasmota/berry/haspmota_src/haspmota_demo.tapp b/tasmota/berry/haspmota_src/haspmota_demo.tapp
deleted file mode 100644
index 5ce30fc56..000000000
Binary files a/tasmota/berry/haspmota_src/haspmota_demo.tapp and /dev/null differ
diff --git a/tasmota/berry/haspmota_src/haspmota_demo/autoexec.be b/tasmota/berry/haspmota_src/haspmota_demo/autoexec.be
index b86ea67a9..321d28950 100644
--- a/tasmota/berry/haspmota_src/haspmota_demo/autoexec.be
+++ b/tasmota/berry/haspmota_src/haspmota_demo/autoexec.be
@@ -1,5 +1,5 @@
 # OpenHASP demo
-# 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_src/haspmota_demo/*
 
 if !tasmota.memory().contains("psram")
     print("HSP: Error: OpenHASP demo requires PSRAM")
diff --git a/tasmota/berry/haspmota_src/haspmota_demo/pages.jsonl b/tasmota/berry/haspmota_src/haspmota_demo/pages.jsonl
index 51b59326d..2d580ac45 100644
--- a/tasmota/berry/haspmota_src/haspmota_demo/pages.jsonl
+++ b/tasmota/berry/haspmota_src/haspmota_demo/pages.jsonl
@@ -3,8 +3,8 @@
 {"id":11,"obj":"label","x":0,"y":0,"w":320,"pad_right":90,"h":22,"bg_color":"#D00000","bg_opa":255,"radius":0,"border_side":0,"text":"Tasmota","text_font":"montserrat-20"}
 
 {"id":15,"obj":"lv_wifi_arcs","x":291,"y":0,"w":29,"h":20,"radius":0,"border_side":0,"bg_color":"#000000","line_color":"#FFFFFF"}
-{"id":16,"obj":"lv_clock","x":208,"y":3,"w":55,"h":16,"radius":0,"border_side":0}
-{"id":17,"obj":"label","x":268,"y":-2,"w":25,"h":20,"text":"\uE02A","align":0,"text_font":"typicons-24"}
+{"id":16,"obj":"lv_clock","x":218,"y":3,"w":55,"h":16,"radius":0,"border_side":0}
+{"id":17,"comment":"-- Battery indicator --","obj":"label","x":275,"y":0,"w":20,"h":20,"text":"\uF2A3","align":0,"text_font":"icons-18"}
 
 {"comment":"---------- Bottom buttons - prev/home/next ----------"}
 {"id":101,"obj":"btn","x":20,"y":210,"w":80,"h":25,"action":"prev","bg_color":"#1fa3ec","radius":10,"border_side":1,"text":"\uF053","text_font":"montserrat-20"}
@@ -33,7 +33,7 @@
 
 {"page":3,"comment":"---------- Page 3 - qrcode ----------"}
 {"id":0,"bg_color":"#0000A0","bg_grad_color":"#000000","bg_grad_dir":1,"text_color":"#FFFFFF"}
-{"id":1,"obj":"qrcode","qr_text":"https://github.com/arendst/Tasmota","x":85,"y":40,"qr_size":150}
+{"id":1,"obj":"qrcode","qr_text":"https://github.com/arendst/Tasmota","x":85,"y":40,"qr_size":150,"qr_light_color":"#FFFFFF","qr_dark_color":"#000000"}
 
 {"page":4,"comment":"---------- Page 4 - fan animation ----------"}
 {"id":0,"bg_color":"#0000A0","bg_grad_color":"#000000","bg_grad_dir":1,"text_color":"#FFFFFF"}
diff --git a/tasmota/berry/haspmota_src/haspmota_widgets.tapp b/tasmota/berry/haspmota_src/haspmota_widgets.tapp
deleted file mode 100644
index 45212df04..000000000
Binary files a/tasmota/berry/haspmota_src/haspmota_widgets.tapp and /dev/null differ