diff --git a/lib/libesp32/berry_tasmota/src/embedded/leds.be b/lib/libesp32/berry_tasmota/src/embedded/leds.be
index 23f24ef07..7a1461d90 100644
--- a/lib/libesp32/berry_tasmota/src/embedded/leds.be
+++ b/lib/libesp32/berry_tasmota/src/embedded/leds.be
@@ -318,10 +318,11 @@ class Leds : Leds_ntv
 
       # setbytes(row, bytes)
       # sets the raw bytes for `row`, copying at most 3 or 4 x col  bytes
-      def set_bytes(row, buf, offset)
+      def set_bytes(row, buf, offset, len)
         var h_bytes = self.h * self.pix_size
+        if (len > h_bytes)  len = h_bytes end
         var offset_in_matrix = self.offset + row * h_bytes
-        self.pix_buffer.setbytes(offset_in_matrix, buf, offset, h_bytes)
+        self.pix_buffer.setbytes(offset_in_matrix, buf, offset, len)
       end
 
       # Leds_matrix specific
diff --git a/lib/libesp32/berry_tasmota/src/solidify/solidified_leds.h b/lib/libesp32/berry_tasmota/src/solidify/solidified_leds.h
index 8c8692405..c6caa2eab 100644
--- a/lib/libesp32/berry_tasmota/src/solidify/solidified_leds.h
+++ b/lib/libesp32/berry_tasmota/src/solidify/solidified_leds.h
@@ -1308,8 +1308,8 @@ be_local_closure(Leds_matrix_is_dirty,   /* name */
 ********************************************************************/
 be_local_closure(Leds_matrix_set_bytes,   /* name */
   be_nested_proto(
-    12,                          /* nstack */
-    4,                          /* argc */
+    13,                          /* nstack */
+    5,                          /* argc */
     2,                          /* varg */
     0,                          /* has upvals */
     NULL,                       /* no upvals */
@@ -1325,21 +1325,24 @@ be_local_closure(Leds_matrix_set_bytes,   /* name */
     }),
     &be_const_str_set_bytes,
     &be_const_str_solidified,
-    ( &(const binstruction[14]) {  /* code */
-      0x88100100,  //  0000  GETMBR	R4	R0	K0
-      0x88140101,  //  0001  GETMBR	R5	R0	K1
-      0x08100805,  //  0002  MUL	R4	R4	R5
-      0x88140102,  //  0003  GETMBR	R5	R0	K2
-      0x08180204,  //  0004  MUL	R6	R1	R4
-      0x00140A06,  //  0005  ADD	R5	R5	R6
-      0x88180103,  //  0006  GETMBR	R6	R0	K3
-      0x8C180D04,  //  0007  GETMET	R6	R6	K4
-      0x5C200A00,  //  0008  MOVE	R8	R5
-      0x5C240400,  //  0009  MOVE	R9	R2
-      0x5C280600,  //  000A  MOVE	R10	R3
-      0x5C2C0800,  //  000B  MOVE	R11	R4
-      0x7C180A00,  //  000C  CALL	R6	5
-      0x80000000,  //  000D  RET	0
+    ( &(const binstruction[17]) {  /* code */
+      0x88140100,  //  0000  GETMBR	R5	R0	K0
+      0x88180101,  //  0001  GETMBR	R6	R0	K1
+      0x08140A06,  //  0002  MUL	R5	R5	R6
+      0x24180805,  //  0003  GT	R6	R4	R5
+      0x781A0000,  //  0004  JMPF	R6	#0006
+      0x5C100A00,  //  0005  MOVE	R4	R5
+      0x88180102,  //  0006  GETMBR	R6	R0	K2
+      0x081C0205,  //  0007  MUL	R7	R1	R5
+      0x00180C07,  //  0008  ADD	R6	R6	R7
+      0x881C0103,  //  0009  GETMBR	R7	R0	K3
+      0x8C1C0F04,  //  000A  GETMET	R7	R7	K4
+      0x5C240C00,  //  000B  MOVE	R9	R6
+      0x5C280400,  //  000C  MOVE	R10	R2
+      0x5C2C0600,  //  000D  MOVE	R11	R3
+      0x5C300800,  //  000E  MOVE	R12	R4
+      0x7C1C0A00,  //  000F  CALL	R7	5
+      0x80000000,  //  0010  RET	0
     })
   )
 );
diff --git a/tasmota/berry/artnet/artnet.be b/tasmota/berry/artnet/artnet.be
index 1fcdd5053..b4f36f98b 100644
--- a/tasmota/berry/artnet/artnet.be
+++ b/tasmota/berry/artnet/artnet.be
@@ -38,6 +38,15 @@ class ArtNet
     tasmota.global.sleep = 5
   end
 
+  def stop()
+    import introspect
+    # if usd_server has a stop() method, call it
+    if introspect.get(self.udp_server, "stop")
+      self.udp_server.stop()
+    end
+    self.matrix.clear()
+  end
+
   def fast_loop()
     var universe_start = self.universe_start
     var universe_end = self.universe_end
@@ -82,6 +91,50 @@ class ArtNet
       self.matrix.show()
     end
   end
+
+  static def read_persist()
+    import persist
+    var conf = dyn()
+
+    conf.gpio = persist.find("artnet_gpio", 0)      # gpio number from template
+    conf.rows = persist.find("artnet_rows", 5)      # number of rows (min: 1)
+    conf.cols = persist.find("artnet_cols", 5)      # number of columns (min: 1)
+    conf.offs = persist.find("artnet_offs", 0)      # offset in the led strip where the matrix starts (min: 0)
+    conf.alt  = persist.find("artnet_alt", false)   # are the rows in alternate directions
+
+    conf.univ = persist.find("artnet_univ", 0)      # start universe
+
+    # conf.addr = persist.find("artnet_addr", "uni")  # listening mode, either 'uni' or 'multi' for multicast
+    conf.port = persist.find("artnet_port", 6454)   # UDP port number
+
+    conf.auto = persist.find("artnet_auto", true)  # autorun at startup
+    return conf
+  end
+
+  static def run_from_conf()
+    import persist
+
+    var conf = ArtNet.read_persist()
+    var r = conf.rows
+    var c = conf.cols
+
+    var strip = Leds(r * c, gpio.pin(gpio.WS2812, conf.gpio))
+    var matrix = strip.create_matrix(r, c, conf.offs)
+    if conf.alt  matrix.set_alternate(true)
+    end
+    var dmx = ArtNet(matrix, conf.univ, conf.port)
+
+    global._artnet = dmx
+  end
+
+  static def stop_global()
+    var dmx = global._artnet
+    if type(dmx) == 'instance'
+      dmx.stop()
+      global._artnet = nil  # dereference
+      tasmota.gc()          # force gc
+    end
+  end
 end
 
 return ArtNet