diff --git a/examples/bitmaps/NeoPixelBitmap/NeoPixelBitmap.ino b/examples/bitmaps/NeoPixelBitmap/NeoPixelBitmap.ino
index b5bb22e..5efb1ea 100644
--- a/examples/bitmaps/NeoPixelBitmap/NeoPixelBitmap.ino
+++ b/examples/bitmaps/NeoPixelBitmap/NeoPixelBitmap.ino
@@ -16,28 +16,23 @@
 
 const int chipSelect = 8; // make sure to set this to your SD carder reader CS
 
-//typedef NeoGrbFeature MyPixelColorFeature;
-typedef NeoGrbwFeature MyPixelColorFeature;
-
 const uint16_t PixelCount = 144; // the sample images are meant for 144 pixels
-const uint16_t PixelPin = 2;
+const uint16_t PixelPin = 2; // for esp8266 the pin is ignored with most methods
 const uint16_t AnimCount = 1; // we only need one
 
-NeoPixelBus<MyPixelColorFeature, NeoWs2812xMethod> strip(PixelCount, PixelPin);
-// for esp8266 omit the pin
-//NeoPixelBus<MyPixelColorFeature, NeoWs2812xMethod> strip(PixelCount);
+NeoPixelBus<NeoGrbFeature, NeoWs2812xMethod> strip(PixelCount, PixelPin);
 NeoPixelAnimator animations(AnimCount); // NeoPixel animation management object
 
-// our NeoBitmapFile will use the same color feature as NeoPixelBus and
-// we want it to use the SD File object 
-NeoBitmapFile<MyPixelColorFeature::ColorObject, File> image;
+// our NeoBitmapFile will use the RgbColor
+NeoBitmapFile<RgbColor, File> image;
 
+// animation state
 uint16_t animState;
 
 void LoopAnimUpdate(const AnimationParam& param)
 {
     // wait for this animation to complete,
-    // we are using it as a timer of sorts
+    // we are using it as a timer
     if (param.state == AnimationState_Completed)
     {
         // done, time to restart this position tracking animation/timer
@@ -49,7 +44,8 @@ void LoopAnimUpdate(const AnimationParam& param)
     }
 }
 
-void setup() {
+void setup() 
+{
     Serial.begin(115200);
     while (!Serial); // wait for serial attach
 
@@ -89,10 +85,11 @@ void setup() {
     animations.StartAnimation(0, 30, LoopAnimUpdate);
 }
 
-void loop() {
+void loop() 
+{
     // this is all that is needed to keep it running
     // and avoiding using delay() is always a good thing for
-    // any timing related routines
+    // any timing related solutions
     animations.UpdateAnimations();
     strip.Show();
 }
\ No newline at end of file
diff --git a/examples/bitmaps/NeoPixelBufferCylon/CylonGrbw.h b/examples/bitmaps/NeoPixelBufferCylon/CylonGrbw.h
deleted file mode 100644
index 9314f2f..0000000
--- a/examples/bitmaps/NeoPixelBufferCylon/CylonGrbw.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// To recreate the data below, use the Paint.Net plugin "Arduino Progmem NeoPixel FileType" 
-// to save as/export the included Cylon.pdn
-// Paint.Net - http://www.getpaint.net/download.html#download
-// Plugin - http://forums.getpaint.net/index.php?/topic/107921-arduino-neopixel-sketch-exporter/
-// This uses Flatten, GRBW, Hexadecimal
-//
-
-const uint16_t myImageWidth = 16;
-const uint16_t myImageHeight = 20;
-const uint8_t PROGMEM myImage[] = {  // (16 x 20) GRBW in Hexadecimal
-        0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x3f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/examples/bitmaps/NeoPixelBufferShader/NeoPixelBufferShader.ino b/examples/bitmaps/NeoPixelBufferShader/NeoPixelBufferShader.ino
index 112da41..8158a85 100644
--- a/examples/bitmaps/NeoPixelBufferShader/NeoPixelBufferShader.ino
+++ b/examples/bitmaps/NeoPixelBufferShader/NeoPixelBufferShader.ino
@@ -1,6 +1,6 @@
 // NeoPixelBufferShader
 // This example will provide a shader class to the NeoPixelBuffer that will dim and brighten
-// the pixels that are in the buffer (a device independant bitmap)
+// the pixels that are in the buffer
 // It is just a demonstration of using a custom shader
 
 #include <NeoPixelBus.h>
@@ -11,10 +11,10 @@ const uint8_t PixelPin = 2;  // make sure to set this to the correct pin, ignore
 // three element GRB pixels, change to your needs
 NeoPixelBus<NeoGrbFeature, NeoWs2812xMethod> strip(PixelCount, PixelPin);
 
-// the buffer object, 
-// defined to use memory with the same feature as the strip
+// the buffer object, a NeoDib
+// defined to use memory with the same color object as the strip
 // initialized with the same number of pixels as our strip
-NeoBuffer<NeoBufferMethod<RgbColor>> image(8, 8, NULL);
+NeoDib<RgbColor> image(8, 8, NULL);
 
 const RgbColor BrightRed(255, 0, 0);
 const RgbColor BrightGreen(0, 255, 0);
@@ -45,11 +45,11 @@ public:
 
     // required for a shader object, it will be called for
     // every pixel
-    RgbColor Apply(const RgbColor& color)
+    RgbColor Apply(const RgbColor& colorSrc, [[maybe_unused]] const RgbColor& colorDest)
     {
         // to apply our brightness shader, 
         // use the source color, modify, and return it 
-        return color.Dim(_brightness);
+        return colorSrc.Dim(_brightness);
     }
 
     // provide an accessor to set brightness
diff --git a/examples/bitmaps/NeoPixelBufferCylon/Cylon.pdn b/examples/bitmaps/NeoPixelSpriteSheet/Cylon.pdn
similarity index 100%
rename from examples/bitmaps/NeoPixelBufferCylon/Cylon.pdn
rename to examples/bitmaps/NeoPixelSpriteSheet/Cylon.pdn
diff --git a/examples/bitmaps/NeoPixelBufferCylon/CylonGrb.h b/examples/bitmaps/NeoPixelSpriteSheet/CylonRgb.h
similarity index 67%
rename from examples/bitmaps/NeoPixelBufferCylon/CylonGrb.h
rename to examples/bitmaps/NeoPixelSpriteSheet/CylonRgb.h
index 852c209..8e55b1f 100644
--- a/examples/bitmaps/NeoPixelBufferCylon/CylonGrb.h
+++ b/examples/bitmaps/NeoPixelSpriteSheet/CylonRgb.h
@@ -2,29 +2,31 @@
 // to save as/export the included Cylon.pdn
 // Paint.Net - http://www.getpaint.net/download.html#download
 // Plugin - http://forums.getpaint.net/index.php?/topic/107921-arduino-neopixel-sketch-exporter/
-// This uses Flatten, GRB, Hexadecimal
+// This uses Flatten, RGB, Hexadecimal
 //
 
 const uint16_t myImageWidth = 16;
 const uint16_t myImageHeight = 20;
-const uint8_t PROGMEM myImage[] = {  // (16 x 20) GRB in Hexadecimal
-        0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x3f, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x7f, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x7f, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x7f, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x7f, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x7f, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x7f, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x3f, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xff, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xff, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xff, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xff, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xff, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+const uint8_t PROGMEM myImage[] = {  // (16 x 20) RGB in Hexadecimal
+//        R0    G0    B0    R1    G1    B1    R2    G2    B2    R3    G3    B3    R4    G4    B4    R5    G5    B5    R6    G6    B6    R7    G7    B7    R8    G8    B8    R9    G9    B9   R10   G10   B10   R11   G11   B11   R12   G12   B12   R13   G13   B13   R14   G14   B14   R15   G15   B15
+        0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x3f, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x7f, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x7f, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x7f, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x7f, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x7f, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x7f, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x3f, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xff, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xff, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xff, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xff, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xff, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 
+};
diff --git a/examples/bitmaps/NeoPixelBufferCylon/NeoPixelBufferCylon.ino b/examples/bitmaps/NeoPixelSpriteSheet/NeoPixelSpriteSheet.ino
similarity index 55%
rename from examples/bitmaps/NeoPixelBufferCylon/NeoPixelBufferCylon.ino
rename to examples/bitmaps/NeoPixelSpriteSheet/NeoPixelSpriteSheet.ino
index 59cbbe0..88b8d67 100644
--- a/examples/bitmaps/NeoPixelBufferCylon/NeoPixelBufferCylon.ino
+++ b/examples/bitmaps/NeoPixelSpriteSheet/NeoPixelSpriteSheet.ino
@@ -1,45 +1,37 @@
-// NeoPixelBufferCylon
-// This example will move a Cylon Red Eye back and forth across the 
+// NeoPixelSpriteSheet
+// This example will use a NeoVerticalSpriteSheet to animate a 
+// moving Cylon Red Eye back and forth across the 
 // the full collection of pixels on the strip. 
 //
-// This will demonstrate the use of the NeoVerticalSpriteSheet 
-// 
+
 
 #include <NeoPixelBus.h>
 #include <NeoPixelAnimator.h>
 
-// The actual image is contained in the data structure in one of the Cylon*.h files
-// You will need to use the one that has the same color feature as your NeoPixelBus
-// There are two provided, but you can create your own easily enough using 
-// free versions of Paint.Net and the plugin 
-#include "CylonGrb.h"
-typedef NeoGrbFeature MyPixelColorFeature;
+// The actual image is contained in the data structure in the CylonRgb.h file
+#include "CylonRgb.h"
 
-// #include "CylonGrbw.h"
-// typedef NeoGrbwFeature MyPixelColorFeature;
-
-const uint16_t PixelCount = 16; // the sample images are meant for 16 pixels
-const uint16_t PixelPin = 2;
+const uint16_t PixelCount = myImageWidth; // the sample images are meant for 16 pixels, so we use the same for pixelcount
+const uint16_t PixelPin = 2; // for esp8266 the pin is ignored in most methods
 const uint16_t AnimCount = 1; // we only need one
 
-NeoPixelBus<MyPixelColorFeature, NeoWs2812xMethod> strip(PixelCount, PixelPin);
-// for esp8266 omit the pin
-//NeoPixelBus<MyPixelColorFeature, NeoWs2812xMethod> strip(PixelCount);
+NeoPixelBus<NeoGrbFeature, NeoWs2812xMethod> strip(PixelCount, PixelPin);
 NeoPixelAnimator animations(AnimCount); // NeoPixel animation management object
 
 // sprite sheet stored in progmem using the same pixel feature as the NeoPixelBus
-NeoVerticalSpriteSheet<NeoBufferProgmemMethod<MyPixelColorFeature::ColorObject>> spriteSheet(
+NeoVerticalSpriteSheet_P<RgbColor> spriteSheet(
     myImageWidth, // image width and sprite width since its vertical sprite sheet
     myImageHeight,  // image height
-    1, // sprite is only one pixel high
+    1, // sprite is only one pixel high in this example
     myImage);
 
+// animation state
 uint16_t indexSprite;
 
 void LoopAnimUpdate(const AnimationParam& param)
 {
     // wait for this animation to complete,
-    // we are using it as a timer of sorts
+    // we are using it as a timer
     if (param.state == AnimationState_Completed)
     {
         // done, time to restart this position tracking animation/timer
@@ -67,7 +59,7 @@ void loop()
 {
     // this is all that is needed to keep it running
     // and avoiding using delay() is always a good thing for
-    // any timing related routines
+    // any timing related solutions
     animations.UpdateAnimations();
     strip.Show();
 }
diff --git a/examples/sevensegment/NeoSegmentFade/NeoSegmentFade.ino b/examples/sevensegment/NeoSegmentFade/NeoSegmentFade.ino
index fd74cad..709efdf 100644
--- a/examples/sevensegment/NeoSegmentFade/NeoSegmentFade.ino
+++ b/examples/sevensegment/NeoSegmentFade/NeoSegmentFade.ino
@@ -63,15 +63,11 @@ public:
     {  
     }
 
-    SevenSegDigit Apply(uint16_t indexDigit, SevenSegDigit digit)
+    SevenSegDigit Apply(const SevenSegDigit& digitSrcA, const SevenSegDigit& digitSrcB)
     {
-        // since we call EndingDigits.Render below, the digit argument is
-        // from the EndingDigits so no need to call GetPixelColor to get it
-        // create a digit that is a blend between the last seconds
-        // value and the next seconds value using the BlendAmount
         SevenSegDigit blendDigit = SevenSegDigit::LinearBlend(
-            StartingDigits.GetPixelColor(indexDigit),
-            digit,
+            digitSrcA,
+            digitSrcB,
             BlendAmount);
 
         return blendDigit;
@@ -88,7 +84,8 @@ void FadeAnimation(const AnimationParam& param)
     // set the shader property BlendAmount to the animation progress
     blendShader.BlendAmount = param.progress;
     // apply it to the strip at the SecondsDigit location
-    EndingDigits.Render<SevenSegmentFeature, DigitBlendShader>(strip, 
+    StartingDigits.Render<SevenSegDigit, DigitBlendShader>(strip,
+        EndingDigits, // using a second source
         blendShader, 
         SecondsDigit);
 }
diff --git a/src/internal/buffers/NeoBitmapFile.h b/src/internal/buffers/NeoBitmapFile.h
index 9466496..f78c821 100644
--- a/src/internal/buffers/NeoBitmapFile.h
+++ b/src/internal/buffers/NeoBitmapFile.h
@@ -214,7 +214,7 @@ public:
                 {
                     if (readPixel(&color))
                     {
-                        color = shader.Apply(color);
+                        color = shader.Apply(color, destBuffer.Pixels[indexPixel]);
                         xSrc++;
                     }
                 }
@@ -230,9 +230,9 @@ public:
         int16_t ySrc,
         int16_t wSrc)
     {
-        NeoShaderNop<T_COLOR_OBJECT, T_COLOR_OBJECT> shaderNop;
+        NeoShaderNop<T_COLOR_OBJECT> shaderNop;
 
-        Render<NeoShaderNop<T_COLOR_OBJECT, T_COLOR_OBJECT>>(destBuffer, shaderNop, indexPixel, xSrc, ySrc, wSrc);
+        Render<NeoShaderNop<T_COLOR_OBJECT>>(destBuffer, shaderNop, indexPixel, xSrc, ySrc, wSrc);
     };
 
     template <typename T_SHADER> void Render(NeoBufferContext<T_COLOR_OBJECT> destBuffer,
@@ -261,17 +261,16 @@ public:
 
                     if (static_cast<uint16_t>(xFile) < _width)
                     {
-                        if (readPixel(&color))
+                        if (indexDest < destPixelCount)
                         {
-                            color = shader.Apply(indexDest, color);
-                            xFile++;
+                            if (readPixel(&color))
+                            {
+                                color = shader.Apply(color, destBuffer.Pixels[indexDest]);
+                                xFile++;
+                            }
+                            destBuffer.Pixels[indexDest] = color;
                         }
                     }
-
-                    if (indexDest < destPixelCount)
-                    {
-                        destBuffer.Pixels[indexDest] = color;
-                    }
                 }
             }
         }
@@ -286,9 +285,9 @@ public:
         int16_t hSrc,
         LayoutMapCallback layoutMap)
     {
-        NeoShaderNop<T_COLOR_OBJECT, T_COLOR_OBJECT> shaderNop;
+        NeoShaderNop<T_COLOR_OBJECT> shaderNop;
 
-        Render<NeoShaderNop<T_COLOR_OBJECT, T_COLOR_OBJECT>>(destBuffer,
+        Render<NeoShaderNop<T_COLOR_OBJECT>>(destBuffer,
             shaderNop, 
             xDest,
             yDest,
diff --git a/src/internal/buffers/NeoBuffer.h b/src/internal/buffers/NeoBuffer.h
index df0762f..7f34bca 100644
--- a/src/internal/buffers/NeoBuffer.h
+++ b/src/internal/buffers/NeoBuffer.h
@@ -157,7 +157,7 @@ public:
     }
 
     template <typename T_SHADER> 
-    void Render(NeoBufferContext<typename T_BUFFER_METHOD::ColorObject> destBuffer, T_SHADER& shader)
+    void Render(NeoBufferContext<typename T_BUFFER_METHOD::ColorObject> destBuffer, T_SHADER& shader, uint16_t startIndex = 0)
     {
         uint16_t countPixels = destBuffer.PixelCount;
 
@@ -169,7 +169,27 @@ public:
         for (uint16_t indexPixel = 0; indexPixel < countPixels; indexPixel++)
         {
             typename T_BUFFER_METHOD::ColorObject color = _method.GetPixelColor(indexPixel);
-            destBuffer.Pixels[indexPixel] = shader.Apply(color);
+            destBuffer.Pixels[indexPixel + startIndex] = shader.Apply(color, destBuffer.Pixels[indexPixel + startIndex]);
+        }
+    }
+
+    template <typename T_SHADER>
+    void Render(NeoBufferContext<typename T_BUFFER_METHOD::ColorObject> destBuffer, 
+        NeoBufferContext<typename T_BUFFER_METHOD::ColorObject> srcBufferB,
+        T_SHADER& shader, 
+        uint16_t startIndex = 0)
+    {
+        uint16_t countPixels = destBuffer.PixelCount;
+
+        if (countPixels > _method.PixelCount())
+        {
+            countPixels = _method.PixelCount();
+        }
+
+        for (uint16_t indexPixel = 0; indexPixel < countPixels; indexPixel++)
+        {
+            typename T_BUFFER_METHOD::ColorObject color = _method.GetPixelColor(indexPixel);
+            destBuffer.Pixels[indexPixel + startIndex] = shader.Apply(color, srcBufferB.Pixels[indexPixel]);
         }
     }
 
@@ -191,4 +211,5 @@ public:
 
 private:
     T_BUFFER_METHOD _method;
-};
\ No newline at end of file
+};
+
diff --git a/src/internal/buffers/NeoBufferMethods.h b/src/internal/buffers/NeoBufferMethods.h
index 13b721d..2f91a04 100644
--- a/src/internal/buffers/NeoBufferMethods.h
+++ b/src/internal/buffers/NeoBufferMethods.h
@@ -153,5 +153,16 @@ private:
     T_COLOR_OBJECT* _pixels;
 };
 
+template <typename T_COLOR_OBJECT>
+class NeoDib : public NeoBuffer<NeoBufferMethod<T_COLOR_OBJECT>>
+{
+public:
+    NeoDib(uint16_t width,
+        uint16_t height = 1,
+        PGM_VOID_P pixels = nullptr) :
+        NeoBuffer<NeoBufferMethod<T_COLOR_OBJECT>>(width, height, pixels)
+    {
 
+    }
+};
 
diff --git a/src/internal/buffers/NeoBufferProgmemMethod.h b/src/internal/buffers/NeoBufferProgmemMethod.h
index df37927..107c58c 100644
--- a/src/internal/buffers/NeoBufferProgmemMethod.h
+++ b/src/internal/buffers/NeoBufferProgmemMethod.h
@@ -111,4 +111,17 @@ private:
     const uint16_t _width;
     const uint16_t _height;
     PGM_VOID_P _pixels;
+};
+
+template <typename T_COLOR_OBJECT>
+class NeoDib_P : public NeoBuffer<NeoBufferProgmemMethod<T_COLOR_OBJECT>>
+{
+public:
+    NeoDib_P(uint16_t width,
+        uint16_t height,
+        PGM_VOID_P pixels) :
+        NeoBuffer<NeoBufferProgmemMethod<T_COLOR_OBJECT>>(width, height, pixels)
+    {
+
+    }
 };
\ No newline at end of file
diff --git a/src/internal/buffers/NeoShaderNop.h b/src/internal/buffers/NeoShaderNop.h
index acf1057..820bd17 100644
--- a/src/internal/buffers/NeoShaderNop.h
+++ b/src/internal/buffers/NeoShaderNop.h
@@ -25,13 +25,23 @@ License along with NeoPixel.  If not, see
 -------------------------------------------------------------------------*/
 #pragma once
 
-template <typename T_EXPOSED_COLOR_OBJECT, typename T_FEATURE_COLOR_OBJECT> 
+template <typename T_SRC_COLOR_OBJECT, typename T_DEST_COLOR_OBJECT = T_SRC_COLOR_OBJECT>
 class NeoShaderNop
 {
 public:
-    static T_FEATURE_COLOR_OBJECT Apply(const T_EXPOSED_COLOR_OBJECT& color)
+    // This method signature is used by NeoPixelBus/NeoPixelBusLg where the 
+    // destination color is never considered as its just not available
+    static T_DEST_COLOR_OBJECT Apply(const T_SRC_COLOR_OBJECT& color)
     {
         return color;
     };
+
+    // This method segnature is used by Render methods where the 
+    // colorSrcB color is either the previous destination color or a 
+    // secondary source color
+    static T_DEST_COLOR_OBJECT Apply(const T_SRC_COLOR_OBJECT& colorSrc, [[maybe_unused]] const T_DEST_COLOR_OBJECT& colorAlternate)
+    {
+        return colorSrc;
+    };
 };
 
diff --git a/src/internal/buffers/NeoVerticalSpriteSheet.h b/src/internal/buffers/NeoVerticalSpriteSheet.h
index 91e6d04..f6663c1 100644
--- a/src/internal/buffers/NeoVerticalSpriteSheet.h
+++ b/src/internal/buffers/NeoVerticalSpriteSheet.h
@@ -29,10 +29,10 @@ License along with NeoPixel.  If not, see
 //      NeoBufferMethod
 //      NeoBufferProgmemMethod
 //
-template<typename T_BUFFER_METHOD> class NeoVerticalSpriteSheet
+template<typename T_BUFFER_METHOD> class NeoVerticalSpriteSheetBuffer
 {
 public:
-    NeoVerticalSpriteSheet(uint16_t width,
+    NeoVerticalSpriteSheetBuffer(uint16_t width,
         uint16_t height,
         uint16_t spriteHeight,
         PGM_VOID_P pixels) :
@@ -177,4 +177,30 @@ private:
         }
         return result;
     }
+};
+
+template <typename T_COLOR_OBJECT>
+class NeoVerticalSpriteSheet : public NeoVerticalSpriteSheetBuffer<NeoBufferMethod<T_COLOR_OBJECT>>
+{
+public:
+    NeoVerticalSpriteSheet(uint16_t width,
+        uint16_t height,
+        uint16_t spriteHeight,
+        PGM_VOID_P pixels) :
+        NeoVerticalSpriteSheetBuffer<NeoBufferMethod<T_COLOR_OBJECT>>(width, height, spriteHeight, pixels)
+    {
+    }
+};
+
+template <typename T_COLOR_OBJECT>
+class NeoVerticalSpriteSheet_P : public NeoVerticalSpriteSheetBuffer<NeoBufferProgmemMethod<T_COLOR_OBJECT>>
+{
+public:
+    NeoVerticalSpriteSheet_P(uint16_t width,
+        uint16_t height,
+        uint16_t spriteHeight,
+        PGM_VOID_P pixels) :
+        NeoVerticalSpriteSheetBuffer<NeoBufferProgmemMethod<T_COLOR_OBJECT>>(width, height, spriteHeight, pixels)
+    {
+    }
 };
\ No newline at end of file