diff --git a/platformio.ini b/platformio.ini
index 0788516b..c8fd17c9 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -851,7 +851,7 @@ lib_deps_M =
   OneWire@~2.3.5 ; used for USERMOD_FOUR_LINE_DISPLAY and USERMOD_DALLASTEMPERATURE
   olikraus/U8g2 @ ^2.28.8 ; used for USERMOD_FOUR_LINE_DISPLAY 
   ElectronicCats/MPU6050 @ 0.6.0 ; used for USERMOD_MPU6050_IMU
-  https://github.com/netmindz/animartrix.git#f4089cb53110a5cc1c41173918ac73040dc86cbc ; TODO: set based on USERMOD_ANIMARTRIX flag and git hash
+  https://github.com/netmindz/animartrix.git#5d7a7f1475d51404a9b7d139d6ea1b1206d98056 ; TODO: set based on USERMOD_ANIMARTRIX flag and git hash
 
 lib_deps_V4_M =
   ;https://github.com/blazoncek/OneWire.git ; includes bugfixes for inconsistent readings
diff --git a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h
index 82c860c6..bbb344a8 100644
--- a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h
+++ b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h
@@ -65,15 +65,15 @@ class ANIMartRIXMod:public ANIMartRIX {
 	public:
 	void initEffect() {
 	  if (SEGENV.call == 0) {
-		bool serpentine = false;
-		SEGMENT.setUpLeds();
-		SEGMENT.fill(BLACK);
-		init(SEGMENT.virtualWidth(), SEGMENT.virtualHeight(), SEGMENT.leds, serpentine);
+		init(SEGMENT.virtualWidth(), SEGMENT.virtualHeight(), false);
 	  }
 	}
-	void output() {
-		SEGMENT.fadeToBlackBy(0);
+	void setPixelColor(int x, int y, rgb pixel) {
+		SEGMENT.setPixelColorXY(x, y, CRGB(pixel.red, pixel.green, pixel.blue));
 	}
+	void setPixelColor(int index, rgb pixel) {
+		SEGMENT.setPixelColor(index, CRGB(pixel.red, pixel.green, pixel.blue));
+  	}
 
 	// Add any extra custom effects not part of the ANIMartRIX libary here
 };
@@ -82,312 +82,261 @@ ANIMartRIXMod anim;
 uint16_t mode_Module_Experiment10() {
 	anim.initEffect(); 
 	anim.Module_Experiment10();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Module_Experiment9() { 
 	anim.initEffect(); 
 	anim.Module_Experiment9();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Module_Experiment8() { 
 	anim.initEffect(); 
 	anim.Module_Experiment8();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Module_Experiment7() { 
 	anim.initEffect(); 
 	anim.Module_Experiment7();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Module_Experiment6() { 
 	anim.initEffect(); 
 	anim.Module_Experiment6();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Module_Experiment5() { 
 	anim.initEffect(); 
 	anim.Module_Experiment5();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Module_Experiment4() { 
 	anim.initEffect(); 
 	anim.Module_Experiment4();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Zoom2() { 
 	anim.initEffect(); 
 	anim.Zoom2();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Module_Experiment3() { 
 	anim.initEffect(); 
 	anim.Module_Experiment3();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Module_Experiment2() { 
 	anim.initEffect(); 
 	anim.Module_Experiment2();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Module_Experiment1() { 
 	anim.initEffect(); 
 	anim.Module_Experiment1();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Parametric_Water() { 
 	anim.initEffect(); 
 	anim.Parametric_Water();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Water() { 
 	anim.initEffect(); 
 	anim.Water();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Complex_Kaleido_6() { 
 	anim.initEffect(); 
 	anim.Complex_Kaleido_6();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Complex_Kaleido_5() { 
 	anim.initEffect(); 
 	anim.Complex_Kaleido_5();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Complex_Kaleido_4() { 
 	anim.initEffect(); 
 	anim.Complex_Kaleido_4();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Complex_Kaleido_3() { 
 	anim.initEffect(); 
 	anim.Complex_Kaleido_3();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Complex_Kaleido_2() { 
 	anim.initEffect(); 
 	anim.Complex_Kaleido_2();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Complex_Kaleido() { 
 	anim.initEffect(); 
 	anim.Complex_Kaleido();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_SM10() { 
 	anim.initEffect(); 
 	anim.SM10();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_SM9() { 
 	anim.initEffect(); 
 	anim.SM9();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_SM8() { 
 	anim.initEffect(); 
 	anim.SM8();
-	anim.output();
 	return FRAMETIME;
 }
 // uint16_t mode_SM7() { 
 //	anim.initEffect(); 
 // 	anim.SM7();
-//	anim.output();
+//
 //	return FRAMETIME;
 // }
 uint16_t mode_SM6() { 
 	anim.initEffect(); 
 	anim.SM6();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_SM5() { 
 	anim.initEffect(); 
 	anim.SM5();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_SM4() { 
 	anim.initEffect(); 
 	anim.SM4();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_SM3() { 
 	anim.initEffect(); 
 	anim.SM3();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_SM2() { 
 	anim.initEffect(); 
 	anim.SM2();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_SM1() { 
 	anim.initEffect(); 
 	anim.SM1();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Big_Caleido() { 
 	anim.initEffect(); 	
 	anim.Big_Caleido();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_RGB_Blobs5() { 
 	anim.RGB_Blobs5();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_RGB_Blobs4() { 
 	anim.initEffect(); 
 	anim.RGB_Blobs4();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_RGB_Blobs3() { 
 	anim.initEffect(); 
 	anim.RGB_Blobs3();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_RGB_Blobs2() { 
 	anim.initEffect(); 
 	anim.RGB_Blobs2();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_RGB_Blobs() { 
 	anim.initEffect(); 
 	anim.RGB_Blobs();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Polar_Waves() { 
 	anim.initEffect(); 
 	anim.Polar_Waves();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Slow_Fade() { 
 	anim.initEffect(); 
 	anim.Slow_Fade();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Zoom() { 
 	anim.initEffect(); 
 	anim.Zoom();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Hot_Blob() { 
 	anim.initEffect(); 
 	anim.Hot_Blob();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Spiralus2() { 
 	anim.initEffect(); 
 	anim.Spiralus2();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Spiralus() { 
 	anim.initEffect(); 
 	anim.Spiralus();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Yves() { 
 	anim.initEffect(); 
 	anim.Yves();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Scaledemo1() { 
 	anim.initEffect(); 
 	anim.Scaledemo1();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Lava1() { 
 	anim.initEffect(); 
 	anim.Lava1();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Caleido3() { 
 	anim.initEffect(); 
 	anim.Caleido3();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Caleido2() { 
 	anim.initEffect(); 
 	anim.Caleido2();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Caleido1() { 
 	anim.initEffect(); 
 	anim.Caleido1();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Distance_Experiment() { 
 	anim.initEffect(); 
 	anim.Distance_Experiment();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Center_Field() { 
 	anim.initEffect(); 
 	anim.Center_Field();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Waves() { 
 	anim.initEffect(); 
 	anim.Waves();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Chasing_Spirals() { 
 	anim.initEffect(); 
 	anim.Chasing_Spirals();
-	anim.output();
 	return FRAMETIME;
 }
 uint16_t mode_Rotating_Blob() { 
 	anim.initEffect(); 
 	anim.Rotating_Blob();
-	anim.output();
 	return FRAMETIME;
 }