StoneOrbits · Unreal-Dan · Dec 8, 2023 · Nov 17, 2023 · Nov 17, 2023 · Nov 17, 2023
diff --git a/VortexEngine/src/Leds/LedTypes.h b/VortexEngine/src/Leds/LedTypes.h
@@ -161,6 +161,9 @@ enum Pair : uint8_t
 #define isEven(pos) ((pos % 2) == 0)
 #define isOdd(pos) ((pos % 2) != 0)
 
+// check if an led is orbit even
+#define isOrbitEven(pos) ((MAP_LED(pos) & MAP_RINGS_EVEN) == MAP_LED(pos))
+
 // convert a pair to even or odd led position
 #define pairEven(pair) (LedPos)((uint32_t)pair * 2)
 #define pairOdd(pair) (LedPos)(((uint32_t)pair * 2) + 1)
@@ -371,8 +374,8 @@ inline LedPos mapGetNextLed(LedMap map, LedPos pos)
                          MAP_LED(LED_16) | MAP_LED(LED_18) | MAP_LED(LED_23) | MAP_LED(LED_25))
 #define MAP_RING_EDGE   (MAP_LED(LED_3) | MAP_LED(LED_10) | MAP_LED(LED_17) | MAP_LED(LED_24))
 
-#define MAP_RINGS_ODD   (MAP_RING_INNER | MAP_RING_OUTER)
-#define MAP_RINGS_EVEN  (MAP_RING_MIDDLE | MAP_RING_EDGE)
+#define MAP_RINGS_EVEN  (MAP_RING_INNER | MAP_RING_OUTER)
+#define MAP_RINGS_ODD   (MAP_RING_MIDDLE | MAP_RING_EDGE)
 
 // led quadrant maps
 #define MAP_QUADRANT_1  (MAP_LED(LED_0) | MAP_LED(LED_1) | MAP_LED(LED_2) | MAP_LED(LED_3) | \

diff --git a/VortexEngine/src/Log/Log.cpp b/VortexEngine/src/Log/Log.cpp
@@ -11,6 +11,10 @@
 #include "VortexLib.h"
 #endif
 
+#ifdef VORTEX_EMBEDDED
+#include <Arduino.h>
+#endif
+
 #if LOGGING_LEVEL > 0
 void InfoMsg(const char *msg, ...)
 {

diff --git a/VortexEngine/src/Menus/Menu.cpp b/VortexEngine/src/Menus/Menu.cpp
@@ -203,6 +203,7 @@ void Menu::onLongClick()
 
 void Menu::onLongClick2()
 {
+  leaveMenu(false);
 }
 
 void Menu::leaveMenu(bool doSave)
@@ -254,7 +255,7 @@ void Menu::blinkSelection(uint32_t offMs, uint32_t onMs)
 // this adds the currently targeted ledPermutation to the selected leds
 void Menu::addSelectionMask() {
   // if selecting any of the individual leds then toggle
-  uint32_t mask = ledPermutations[m_ledSelection];
+  LedMap mask = ledPermutations[m_ledSelection];
   // checks if only 1 b it is set in the target mask
   if ((mask & (mask - 1)) == 0) {
     // if there's only one bit set then toggle that location

diff --git a/VortexEngine/src/Menus/MenuList/PatternSelect.cpp b/VortexEngine/src/Menus/MenuList/PatternSelect.cpp
@@ -140,7 +140,9 @@ void PatternSelect::nextPattern()
   if (isMultiLedPatternID(newID)) {
     m_previewMode.setPattern(newID);
   } else {
+    // TODO: clear multi a better way
     m_previewMode.setPatternMap(m_targetLeds, newID);
+    m_previewMode.clearPattern(LED_MULTI);
   }
   m_previewMode.init();
   DEBUG_LOGF("Iterated to pattern id %d", newID);
@@ -201,14 +203,10 @@ void PatternSelect::onLongClick()
     break;
   case STATE_PICK_PATTERN:
     // need to save the new pattern if it's different from current
-    needsSave = (cur->getPatternID() != m_newPatternID);
-    // store the new pattern in the mode
-    cur->setPattern(m_newPatternID);
-    cur->init();
-    DEBUG_LOGF("Saving pattern %u", m_newPatternID);
-    // go back to beginning for next time
-    m_state = STATE_PICK_LIST;
-    // done in the pattern select menu
+    needsSave = (cur->getPatternID() != m_previewMode.getPatternID());
+    // update the current mode with the new pattern
+    Modes::updateCurMode(&m_previewMode);
+    // then done here, save if the mode was different
     leaveMenu(needsSave);
     break;
   }

diff --git a/VortexEngine/src/Menus/MenuList/Randomizer.cpp b/VortexEngine/src/Menus/MenuList/Randomizer.cpp
@@ -298,6 +298,26 @@ PatternID Randomizer::rollMultiPatternID(Random &ctx)
   return (PatternID)ctx.next8(PATTERN_MULTI_FIRST, PATTERN_MULTI_LAST);
 }
 
+#define NUM_MAPS (sizeof(maps) / sizeof(maps[0]))
+
+LedMap maps[] = {
+  MAP_ALL_FACE,
+  MAP_ALL_BOT,
+  MAP_ALL_TOP,
+  MAP_LINE_1,
+  MAP_LINE_2,
+  MAP_QUADRANT_1,
+  MAP_QUADRANT_2,
+  MAP_QUADRANT_3,
+  MAP_QUADRANT_4,
+  MAP_RINGS_EVEN,
+  MAP_RINGS_ODD,
+  MAP_RING_INNER,
+  MAP_RING_MIDDLE,
+  MAP_RING_OUTER,
+  MAP_RING_EDGE
+};
+
 bool Randomizer::reRoll()
 {
   MAP_FOREACH_LED(m_targetLeds) {
@@ -326,18 +346,75 @@ bool Randomizer::reRoll()
     }
   }
   if (m_targetLeds == MAP_LED(LED_MULTI)) {
+    // choose if the result is comprised of multiple single-led patterns
+    // or a single mutliled pattern
+    bool splitMultiRandomize = m_multiRandCtx.next8() > 128;
+    LedMap randomMap;
+    LedMap inverseMap;
+    if (splitMultiRandomize) {
+      m_previewMode.clearPattern();
+      // choose a random led map
+      randomMap = maps[m_multiRandCtx.next8(0, (NUM_MAPS - 1))];
+      inverseMap = MAP_INVERSE(randomMap);
+    }
     if (m_flags & RANDOMIZE_PATTERN) {
-      // TODO: Advanced multi led patterns?
-      if (!m_previewMode.setPattern(rollMultiPatternID(m_multiRandCtx), LED_MULTI)) {
-        ERROR_LOG("Failed to roll new pattern");
-        return false;
+      if (splitMultiRandomize) {
+        // roll a first pattern
+        PatternID firstPattern = rollPatternID(m_multiRandCtx);
+        // set each led in the map to the pattern
+        MAP_FOREACH_LED(randomMap) {
+          if (!m_previewMode.setPattern(firstPattern, pos)) {
+            ERROR_LOG("Failed to roll new pattern");
+            return false;
+          }
+        }
+        // roll a second pattern and reverse the led map
+        PatternID secondPattern = rollPatternID(m_multiRandCtx);
+        // set the remaining leds to the 2nd pattern
+        MAP_FOREACH_LED(inverseMap) {
+          if (!m_previewMode.setPattern(secondPattern, pos)) {
+            ERROR_LOG("Failed to roll new pattern");
+            return false;
+          }
+        }
+      } else {
+        if (m_advanced) {
+          // dynamically generate parameters for mutli led pattern ids
+          //if (!rollMultiPattern(m_multiRandCtx, &m_previewMode)) {
+          //  ERROR_LOG("Failed to roll new pattern");
+          //  return false;
+          //}
+        } else {
+          // randomly select a multi led pattern id
+          if (!m_previewMode.setPattern(rollMultiPatternID(m_multiRandCtx), LED_MULTI)) {
+            ERROR_LOG("Failed to roll new pattern");
+            return false;
+          }
+        }
       }
     }
     if (m_flags & RANDOMIZE_COLORSET) {
       // roll a new colorset
-      if (!m_previewMode.setColorset(rollColorset(m_multiRandCtx), LED_MULTI)) {
-        ERROR_LOG("Failed to roll new colorset");
-        return false;
+      if (splitMultiRandomize) {
+        Colorset firstSet = rollColorset(m_multiRandCtx);
+        Colorset secondSet = rollColorset(m_multiRandCtx);
+        MAP_FOREACH_LED(randomMap) {
+          if (!m_previewMode.setColorset(firstSet, pos)) {
+            ERROR_LOG("Failed to roll new colorset");
+            return false;
+          }
+        }
+        MAP_FOREACH_LED(inverseMap) {
+          if (!m_previewMode.setColorset(secondSet, pos)) {
+            ERROR_LOG("Failed to roll new colorset");
+            return false;
+          }
+        }
+      } else {
+        if (!m_previewMode.setColorset(rollColorset(m_multiRandCtx), LED_MULTI)) {
+          ERROR_LOG("Failed to roll new colorset");
+          return false;
+        }
       }
     }
   }

diff --git a/VortexEngine/src/Modes/DefaultModes.cpp b/VortexEngine/src/Modes/DefaultModes.cpp
@@ -6,10 +6,12 @@
 // the gloveset upon factory reset
 const default_mode_entry default_modes[MAX_MODES] = {
   {
-    PATTERN_BOUNCE, 3, {
-      HSV(0, 255, 255),
-      HSV(96, 255, 255),
-      HSV(160, 255, 255)
+    PATTERN_VORTEX, 5, {
+      RGB_RED,
+      RGB_GREEN,
+      RGB_BLUE,
+      0xABAA00,
+      0x5500AB
     }
   },
 
@@ -128,6 +130,7 @@ const default_mode_entry default_modes[MAX_MODES] = {
       0x13000A
     }
   },
+
   {
     PATTERN_GHOSTCRUSH, 7, {
       0x26004B,

diff --git a/VortexEngine/src/Patterns/Multi/CompoundPattern.cpp b/VortexEngine/src/Patterns/Multi/CompoundPattern.cpp
@@ -84,8 +84,8 @@ void CompoundPattern::setEvensOdds(PatternID evenPattern, PatternID oddPattern,
 {
   // Set the evenPattern on all evens and oddPattern on all odds
   for (LedPos p = LED_FIRST; p <= LED_LAST; p++) {
-    const PatternArgs *args = isEven(p) ? evenArgs : oddArgs;
-    PatternID id = isEven(p) ? evenPattern : oddPattern;
+    const PatternArgs *args = isOrbitEven(p) ? evenArgs : oddArgs;
+    PatternID id = isOrbitEven(p) ? evenPattern : oddPattern;
     setPatternAt(p, PatternBuilder::makeSingle(id, args));
   }
 }
diff --git a/VortexEngine/src/Patterns/Multi/CrossDopsPattern.cpp b/VortexEngine/src/Patterns/Multi/CrossDopsPattern.cpp
@@ -19,7 +19,7 @@ void CrossDopsPattern::init()
 {
   BlinkStepPattern::init();
   // Alternating evens and odds mapping of leds to turn on/off
-  m_ledMap = MAP_PAIR_EVENS;
+  m_ledMap = MAP_LINE_1;
   // start colorset at index 0 so cur() works
   m_colorset.setCurIndex(0);
 }

diff --git a/VortexEngine/src/Patterns/Multi/DoubleStrobePattern.cpp b/VortexEngine/src/Patterns/Multi/DoubleStrobePattern.cpp
@@ -24,6 +24,6 @@ void DoubleStrobePattern::init()
 
 void DoubleStrobePattern::blinkOn()
 {
-  Leds::setAllOdds(m_colorset.cur());
-  Leds::setAllEvens(m_colorset.peekNext());
+  Leds::setMap(MAP_RINGS_ODD, m_colorset.cur());
+  Leds::setMap(MAP_RINGS_EVEN, m_colorset.peekNext());
 }
diff --git a/VortexEngine/src/Patterns/Multi/DripMorphPattern.cpp b/VortexEngine/src/Patterns/Multi/DripMorphPattern.cpp
@@ -74,8 +74,8 @@ void DripMorphPattern::blinkOn()
   //       always over/under shoot
   m_cur.hue += m_speed * sign;
   // set the target led with the current HSV color
-  Leds::setAllEvens(m_cur);
-  Leds::setAllOdds(m_colorset.cur());
+  Leds::setMap(MAP_RINGS_EVEN, m_cur);
+  Leds::setMap(MAP_RINGS_ODD, m_colorset.cur());
 }
 
 void DripMorphPattern::blinkOff()

diff --git a/VortexEngine/src/Patterns/Multi/DripPattern.cpp b/VortexEngine/src/Patterns/Multi/DripPattern.cpp
@@ -26,8 +26,8 @@ void DripPattern::init()
 void DripPattern::blinkOn()
 {
   if (!m_sync) {
-    Leds::setAllEvens(m_colorset.cur());
-    Leds::setAllOdds(m_colorset.peekNext());
+    Leds::setMap(MAP_RINGS_EVEN, m_colorset.cur());
+    Leds::setMap(MAP_RINGS_ODD, m_colorset.peekNext());
   } else {
     Leds::setAll(m_colorset.cur());
   }

diff --git a/VortexEngine/src/Patterns/Multi/FillPattern.cpp b/VortexEngine/src/Patterns/Multi/FillPattern.cpp
@@ -28,13 +28,14 @@ void FillPattern::init()
 
 void FillPattern::blinkOn()
 {
-  Leds::setQuadrants(QUADRANT_FIRST, (Quadrant)m_progress, m_colorset.peekNext());
-  Leds::setQuadrants((Quadrant)m_progress, QUADRANT_LAST, m_colorset.cur());
+  LedPos edgePos = (LedPos)(m_progress * (LED_COUNT / 4));
+  Leds::setRange(LED_FIRST, edgePos, m_colorset.peekNext());
+  Leds::setRange(edgePos, LED_LAST, m_colorset.cur());
 }
 
 void FillPattern::poststep()
 {
-  m_progress = (m_progress + 1) % PAIR_COUNT;
+  m_progress = (m_progress + 1) % 4;
   if (m_progress == 0) {
     m_colorset.getNext();
   }

diff --git a/VortexEngine/src/Patterns/Multi/HueShiftPattern.cpp b/VortexEngine/src/Patterns/Multi/HueShiftPattern.cpp
@@ -9,13 +9,16 @@ HueShiftPattern::HueShiftPattern(const PatternArgs &args) :
   MultiLedPattern(args),
   m_blinkOnDuration(0),
   m_blinkOffDuration(0),
+  m_blendDelay(0),
+  m_delayCounter(0),
   m_blinkTimer(),
   m_cur(0),
   m_next(0)
 {
   m_patternID = PATTERN_HUE_SCROLL;
   REGISTER_ARG(m_blinkOnDuration);
   REGISTER_ARG(m_blinkOffDuration);
+  REGISTER_ARG(m_blendDelay);
   setArgs(args);
 }
 
@@ -65,8 +68,17 @@ void HueShiftPattern::play()
   //       it will cause oscillation around the target hue
   //       because it will never reach the target hue and
   //       always over/under shoot
-  m_cur.hue += sign;
-  HSVColor showColor = m_cur;
+  // only increment every blendDelay times
+  int timetest = ((Time::getCurtime() - 1) % m_blendDelay);
+  ++m_delayCounter;
+  if (m_delayCounter >= m_blendDelay) {
+    m_delayCounter = 0;
+    m_cur.hue += sign;
+  }
+  HSVColor showColor;
+  showColor.hue = m_cur.hue;
+  showColor.sat = 255;
+  showColor.val = 255;
   // set the target led with the current HSV color
   for (LedPos pos = LED_FIRST; pos < LED_COUNT; ++pos) {
     Leds::setIndex(pos, hsv_to_rgb_generic(showColor));

diff --git a/VortexEngine/src/Patterns/Multi/HueShiftPattern.h b/VortexEngine/src/Patterns/Multi/HueShiftPattern.h
@@ -21,6 +21,8 @@ class HueShiftPattern : public MultiLedPattern
 private:
   uint8_t m_blinkOnDuration;
   uint8_t m_blinkOffDuration;
+  uint8_t m_blendDelay;
+  uint8_t m_delayCounter;
 
   Timer m_blinkTimer;
 

diff --git a/VortexEngine/src/Patterns/Multi/MeteorPattern.cpp b/VortexEngine/src/Patterns/Multi/MeteorPattern.cpp
@@ -34,8 +34,10 @@ void MeteorPattern::blinkOff()
 
 void MeteorPattern::poststep()
 {
-  // when a new meteor is created it is incerted into the stash so the blinking pattern is not interrupted
-  LedPos target = (LedPos)m_randCtx.next8(LED_FIRST, LED_LAST);
-  RGBColor col = m_colorset.getNext();
-  m_stash.setIndex(target, col);
+  for (uint8_t meteorCount = 0; meteorCount < (LED_COUNT / 2); ++meteorCount) {
+    // when a new meteor is created it is incerted into the stash so the blinking pattern is not interrupted
+    LedPos target = (LedPos)m_randCtx.next8(LED_FIRST, LED_LAST);
+    RGBColor col = m_colorset.getNext();
+    m_stash.setIndex(target, col);
+  }
 }
diff --git a/VortexEngine/src/Patterns/Multi/Sequencer/ChaserPattern.cpp b/VortexEngine/src/Patterns/Multi/Sequencer/ChaserPattern.cpp
@@ -1,50 +1,51 @@
 #include "ChaserPattern.h"
 
+// This controls the ratio of chaser dots to LED_COUNT. Default 1 chaser per 7 LEDs. Range: 1-LED_COUNT.
+#define CHASER_RATIO 7
+
+
 // This pattern aims to be a demonstration of the sequencer.
 // There are always many ways to implement a pattern, it's best
 // to choose the method that is most suitable for the pattern.
 ChaserPattern::ChaserPattern(const PatternArgs &args) :
   SequencedPattern(args)
 {
   setArgs(args);
+
+  // Makes sure there is at least 1 chaser
+  uint32_t numChasers = LED_COUNT / CHASER_RATIO;
+  if (!numChasers) {
+    numChasers = 1;
+  }
   // set the pattern ID
   //m_patternID = PATTERN_CHASER;
-  // There are 8 steps in the chaser, so iterate 8 times and generate
+  // There are LED_COUNT steps in the chaser, so iterate LED_COUNT times and generate
   // a pattern map for each step. A colorset map can also be applied
   // to override certain colors for specific steps, but that's not
   // what is being done here
-  for (uint8_t i = 0; i < 8; ++i) {
-    // Each step all fingers are dops except for one, so start with a
-    // Pattern Map that has dops on all fingers. A Pattern Map will map
+  for (uint8_t i = 0; i < (LED_COUNT / numChasers); ++i) {
+    // Each step all LEDs are dops except for one, so start with a
+    // Pattern Map that has dops on all LEDs. A Pattern Map will map
     // a Pattern ID to each LED on the device, then we will override a
     // different entry each step with the Pattern ID for Solid0.
     PatternMap patMap(PATTERN_DOPS);
-    // Override a single finger in the pattern map with the Solid0 pattern
+    // Override a single LED in the pattern map with the Solid0 pattern
     // which will use the 0th color from the colorset as the solid color.
     // An LedMap is a bitmap that indicates which leds are turned on or off
     // at any given time. This will generate an Led Map based on the current
-    // step index like this:
-    //
-    //  step -> finger index -> target leds -> LedMap
-    // -----------------------------------------------------
-    //     0         0             0, 1        00 00 00 00 11
-    //     1         1             2, 3        00 00 00 11 00
-    //     2         2             4, 5        00 00 11 00 00
-    //     3         3             6, 7        00 11 00 00 00
-    //     4         4             8, 9        11 00 00 00 00
-    //     5         3             6, 7        00 11 00 00 00
-    //     6         2             4, 5        00 00 11 00 00
-    //     7         1             2, 3        00 00 00 11 00
-    LedMap overrideLeds = 0; //MAP_PAIR((Pair)((i < 5) ? i : (8 - i)));
-    // Then this API is used to override specific positions in the Pattern Map
-    // with a different pattern ID, we use the Led Map generated above to tell
-    // setPatternAt() which indices to override with Solid0
-    patMap.setPatternAt(PATTERN_SOLID, overrideLeds);
+    LedMap overrideLeds = MAP_LED_NONE; 
+    // This creates an led map with 1 chaser per CHASER_RATIO (default 7) leds in LED_COUNT
+    for (uint8_t chaserCount = 0; chaserCount < numChasers; ++chaserCount) {
+      // Then this API is used to override specific positions in the Pattern Map
+      // with a different pattern ID, we use the Led Map generated above to tell
+      // setPatternAt() which indices to override with Solid0
+      patMap.setPatternAt(PATTERN_SOLID, MAP_LED((i + (chaserCount * CHASER_RATIO)) % LED_COUNT));
+    }
     // Then finally we add this pattern mapping to the sequence in a new step
-    // that will last 300ms, this means all 8 steps will be 300ms each.
+    // that will last 300ms, this means all LED_COUNT steps will be 300ms each.
     // The last parameter of addStep() is omitted, that parameter could be used
     // to override the colorset for specific Leds on any given step. Since it
     // is omitted that means this pattern will use whichever colorset is chosen
-    m_sequence.addStep(300, patMap);
+    m_sequence.addStep(150, patMap);
   }
 }
diff --git a/VortexEngine/src/Patterns/Multi/VortexPattern.cpp b/VortexEngine/src/Patterns/Multi/VortexPattern.cpp
@@ -32,17 +32,13 @@ void VortexPattern::init()
 
 void VortexPattern::blinkOn()
 {
-  // Sets an LED at opposite ends of the strip and progresses towards the center
-  Leds::setIndex((LedPos)m_progress, m_colorset.peekNext());
-  Leds::setIndex((LedPos)(LED_LAST - m_progress), m_colorset.peekNext());
+  Leds::setRing((Ring)(RING_LAST - m_progress), m_colorset.peekNext());
 }
 
 void VortexPattern::poststep()
 {
-  // step till the middle point
-  m_progress = (m_progress + 1) % MIDDLE_POINT;
-  // each cycle progress to the next color
-  if (m_progress == 0) {
+  m_progress = (m_progress + 1) % RING_COUNT;
+  if (RING_COUNT - m_progress == RING_COUNT) {
     m_colorset.getNext();
   }
 }
diff --git a/VortexEngine/src/Patterns/Multi/ZigzagPattern.cpp b/VortexEngine/src/Patterns/Multi/ZigzagPattern.cpp
@@ -4,25 +4,8 @@
 #include "../../Leds/Leds.h"
 #include "../../Log/Log.h"
 
-// Mapping of LED positions to steps.
-// The lights runs across evens, then back across odds.
-// Index this array with m_step in order to get correct LedPos
-const LedPos ZigzagPattern::ledStepPositions[] = {
-  LED_1,
-  LED_3,
-  LED_5,
-  LED_7,
-  LED_9,
-
-  LED_8,
-  LED_6,
-  LED_4,
-  LED_2,
-  LED_0,
-};
-
 // There just happens to be LED_COUNT steps in the pattern
-#define NUM_ZIGZAG_STEPS (sizeof(ledStepPositions) / sizeof(ledStepPositions[0]))
+#define NUM_ZIGZAG_STEPS LED_COUNT
 #define HALF_ZIGZAG_STEPS (NUM_ZIGZAG_STEPS / 2)
 
 ZigzagPattern::ZigzagPattern(const PatternArgs &args) :
@@ -60,8 +43,8 @@ void ZigzagPattern::init()
   m_stepTimer.start();
 
   // initialize the snakes with dops timing
-  m_snake1.init(m_onDuration, m_offDuration, m_colorset, 0, 0, m_snakeSize, m_fadeAmount, 3);
-  m_snake2.init(m_onDuration, m_offDuration, m_colorset, 1, HALF_ZIGZAG_STEPS, m_snakeSize, m_fadeAmount, 8);
+  m_snake1.init(m_onDuration, m_offDuration, m_colorset, 0, 0, m_snakeSize, m_fadeAmount, 4);
+  m_snake2.init(m_onDuration, m_offDuration, m_colorset, 1, HALF_ZIGZAG_STEPS, m_snakeSize, m_fadeAmount, 7);
 }
 
 // pure virtual must override the play function
@@ -159,7 +142,7 @@ void ZigzagPattern::Snake::drawSnake()
       col.adjustBrightness(m_fadeAmount * segment);
     }
     // lookup the target in the step positions array and turn it on with given color/brightness
-    Leds::setIndex(ledStepPositions[segment_position], col);
+    Leds::setIndex((LedPos)segment_position, col);
     // if this segment is on the step where the color changes
     if (segment_position == m_changeBoundary) {
       // then decrement the color index for the rest of the snake so that the

diff --git a/VortexEngine/src/Patterns/Multi/ZigzagPattern.h b/VortexEngine/src/Patterns/Multi/ZigzagPattern.h
@@ -39,10 +39,6 @@ class ZigzagPattern : public MultiLedPattern
     uint8_t m_fadeAmount;
     uint8_t m_changeBoundary;
   };
-
-  // path for leds to take, index this with m_step up to LED_COUNT steps
-  static const LedPos ledStepPositions[];
-
   // blink on duration
   uint8_t m_onDuration;
   // blink off duration

diff --git a/VortexEngine/src/Patterns/PatternBuilder.cpp b/VortexEngine/src/Patterns/PatternBuilder.cpp
@@ -164,28 +164,28 @@ PatternArgs PatternBuilder::getDefaultArgs(PatternID id)
     // =====================
     //  Multi Led Patterns:
 #if VORTEX_SLIM == 0
-    case PATTERN_HUE_SCROLL: return PatternArgs(1, 1);
+    case PATTERN_HUE_SCROLL: return PatternArgs(1, 1, 10);
     case PATTERN_THEATER_CHASE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 28);
     case PATTERN_CHASER: return PatternArgs();
-    case PATTERN_ZIGZAG: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 55, 1, 55);
-    case PATTERN_ZIPFADE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 100, 4, 1);
-    case PATTERN_DRIP: return PatternArgs(STROBE_ON_DURATION, STROBE_OFF_DURATION, 250);
+    case PATTERN_ZIGZAG: return PatternArgs(DOPS_ON_DURATION, 3, 3, 5, 55);
+    case PATTERN_ZIPFADE: return PatternArgs(DOPS_ON_DURATION, 2, 75, 9, 230);
+    case PATTERN_DRIP: return PatternArgs(STROBE_ON_DURATION, STROBE_OFF_DURATION, 150);
     case PATTERN_DRIPMORPH: return PatternArgs(STROBE_ON_DURATION, STROBE_OFF_DURATION, 1);
-    case PATTERN_CROSSDOPS: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 100);
+    case PATTERN_CROSSDOPS: return PatternArgs(DOPS_ON_DURATION, 2, 25);
     case PATTERN_DOUBLESTROBE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 115);
-    case PATTERN_METEOR: return PatternArgs(STROBE_ON_DURATION, STROBE_OFF_DURATION, 55, 75);
-    case PATTERN_SPARKLETRACE: return PatternArgs(5, 0, 50);
-    case PATTERN_VORTEXWIPE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 130);
-    case PATTERN_WARP: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 150);
-    case PATTERN_WARPWORM: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 110);
-    case PATTERN_SNOWBALL: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 110);
-    case PATTERN_LIGHTHOUSE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 100, 25, 5);
-    case PATTERN_PULSISH: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, STROBE_ON_DURATION, STROBE_OFF_DURATION, 250);
-    case PATTERN_FILL: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 200);
-    case PATTERN_BOUNCE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 200, 10);
+    case PATTERN_METEOR: return PatternArgs(1, 1, 20, 130);
+    case PATTERN_SPARKLETRACE: return PatternArgs(1, 5, 3);
+    case PATTERN_VORTEXWIPE: return PatternArgs(DOPS_ON_DURATION, 3, 80);
+    case PATTERN_WARP: return PatternArgs(3, DOPS_OFF_DURATION, 50);
+    case PATTERN_WARPWORM: return PatternArgs(DOPS_ON_DURATION, 10, 100);
+    case PATTERN_SNOWBALL: return PatternArgs(3, 3, 33);
+    case PATTERN_LIGHTHOUSE: return PatternArgs(DOPS_ON_DURATION, 5, 22, 3, 3);
+    case PATTERN_PULSISH: return PatternArgs(DOPS_ON_DURATION, 6, 5, 1, 100);
+    case PATTERN_FILL: return PatternArgs(DOPS_ON_DURATION, 5, 50);
+    case PATTERN_BOUNCE: return PatternArgs(10, 5, 50, 10);
     case PATTERN_SPLITSTROBIE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 0, 16, 3, 10, PATTERN_DOPS, PATTERN_STROBIE);
     case PATTERN_BACKSTROBE: return PatternArgs(DOPS_ON_DURATION, DOPS_OFF_DURATION, 0, HYPERSTROBE_ON_DURATION, HYPERSTROBE_OFF_DURATION, 10, PATTERN_DOPS, PATTERN_HYPERSTROBE);
-    case PATTERN_VORTEX: return PatternArgs(STROBE_ON_DURATION, STROBE_OFF_DURATION, 130);
+    case PATTERN_VORTEX: return PatternArgs(1, 1, 130);
     case PATTERN_NONE: break;
     default: break;
 #else

diff --git a/VortexEngine/tests/tests_general/0001_Cycle_all_modes.test b/VortexEngine/tests/tests_general/0001_Cycle_all_modes.test
diff --git a/VortexEngine/tests/tests_general/0002_Enter_Menus.test b/VortexEngine/tests/tests_general/0002_Enter_Menus.test
diff --git a/VortexEngine/tests/tests_general/0003_Start_Auto-cycle.test b/VortexEngine/tests/tests_general/0003_Start_Auto-cycle.test
diff --git a/VortexEngine/tests/tests_general/0004_End_Auto-cycle.test b/VortexEngine/tests/tests_general/0004_End_Auto-cycle.test
diff --git a/VortexEngine/tests/tests_general/0014_Enter_Adv_Mode_Share.test b/VortexEngine/tests/tests_general/0014_Enter_Adv_Mode_Share.test
diff --git a/VortexEngine/tests/tests_general/0024_Randomize_Front_Bulb.test b/VortexEngine/tests/tests_general/0024_Randomize_Front_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0025_Save_Randomization_to_Front_Bulb.test b/VortexEngine/tests/tests_general/0025_Save_Randomization_to_Front_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0026_Start_Auto-randomizer_Front_Bulb.test b/VortexEngine/tests/tests_general/0026_Start_Auto-randomizer_Front_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0027_Stop_Auto-randomizer_Front_Bulb.test b/VortexEngine/tests/tests_general/0027_Stop_Auto-randomizer_Front_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0028_Randomize_Top_Bulb.test b/VortexEngine/tests/tests_general/0028_Randomize_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0029_Save_Randomization_to_Top_Bulb.test b/VortexEngine/tests/tests_general/0029_Save_Randomization_to_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0030_Start_Auto-randomizer_Top_Bulb.test b/VortexEngine/tests/tests_general/0030_Start_Auto-randomizer_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0031_Stop_Auto-randomizer_Top_Bulb.test b/VortexEngine/tests/tests_general/0031_Stop_Auto-randomizer_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0034_Randomize_Color_Only_Both_Bulbs.test b/VortexEngine/tests/tests_general/0034_Randomize_Color_Only_Both_Bulbs.test
diff --git a/VortexEngine/tests/tests_general/0035_Save_Color_Only_Randomization_to_Both_Bulbs.test b/VortexEngine/tests/tests_general/0035_Save_Color_Only_Randomization_to_Both_Bulbs.test
diff --git a/VortexEngine/tests/tests_general/0036_Start_Color_Only_Auto-randomizer_Both_Bulbs.test b/VortexEngine/tests/tests_general/0036_Start_Color_Only_Auto-randomizer_Both_Bulbs.test
diff --git a/VortexEngine/tests/tests_general/0037_Stop_Color_Only_Auto-randomizer_Both_Bulbs.test b/VortexEngine/tests/tests_general/0037_Stop_Color_Only_Auto-randomizer_Both_Bulbs.test
diff --git a/VortexEngine/tests/tests_general/0038_Randomize_Pattern_Only_Both_Bulbs.test b/VortexEngine/tests/tests_general/0038_Randomize_Pattern_Only_Both_Bulbs.test
diff --git a/VortexEngine/tests/tests_general/0039_Save_Pattern_Only_Randomization_to_Both_Bulbs.test b/VortexEngine/tests/tests_general/0039_Save_Pattern_Only_Randomization_to_Both_Bulbs.test
diff --git a/VortexEngine/tests/tests_general/0040_Start_Pattern_Only_Auto-randomizer_Both_Bulbs.test b/VortexEngine/tests/tests_general/0040_Start_Pattern_Only_Auto-randomizer_Both_Bulbs.test
diff --git a/VortexEngine/tests/tests_general/0041_Stop_Pattern_Only_Auto-randomizer_Both_Bulbs.test b/VortexEngine/tests/tests_general/0041_Stop_Pattern_Only_Auto-randomizer_Both_Bulbs.test
diff --git a/VortexEngine/tests/tests_general/0047_Randomize_Color_Only_Front_Bulb.test b/VortexEngine/tests/tests_general/0047_Randomize_Color_Only_Front_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0048_Save_Color_Only_Randomization_to_Front_Bulb.test b/VortexEngine/tests/tests_general/0048_Save_Color_Only_Randomization_to_Front_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0049_Start_Color_Only_Auto-randomizer_Front_Bulb.test b/VortexEngine/tests/tests_general/0049_Start_Color_Only_Auto-randomizer_Front_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0050_Stop_Color_Only_Auto-randomizer_Front_Bulb.test b/VortexEngine/tests/tests_general/0050_Stop_Color_Only_Auto-randomizer_Front_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0051_Randomize_Pattern_Only_Front_Bulb.test b/VortexEngine/tests/tests_general/0051_Randomize_Pattern_Only_Front_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0052_Save_Pattern_Only_Randomization_to_Front_Bulb.test b/VortexEngine/tests/tests_general/0052_Save_Pattern_Only_Randomization_to_Front_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0053_Start_Pattern_Only_Auto-randomizer_Front_Bulb.test b/VortexEngine/tests/tests_general/0053_Start_Pattern_Only_Auto-randomizer_Front_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0054_Stop_Pattern_Only_Auto-randomizer_Front_Bulb.test b/VortexEngine/tests/tests_general/0054_Stop_Pattern_Only_Auto-randomizer_Front_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0055_Randomize_Color_and_Pattern_Front_Bulb.test b/VortexEngine/tests/tests_general/0055_Randomize_Color_and_Pattern_Front_Bulb.test
diff --git a/...exEngine/tests/tests_general/0056_Save_Color_and_Pattern_Randomization_to_Front_Bulb.test b/...exEngine/tests/tests_general/0056_Save_Color_and_Pattern_Randomization_to_Front_Bulb.test
diff --git a/...exEngine/tests/tests_general/0057_Start_Color_and_Pattern_Auto-randomizer_Front_Bulb.test b/...exEngine/tests/tests_general/0057_Start_Color_and_Pattern_Auto-randomizer_Front_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0058_Stop_Color_and_Pattern_Auto-randomizer_Front_Bulb.test b/VortexEngine/tests/tests_general/0058_Stop_Color_and_Pattern_Auto-randomizer_Front_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0060_Randomize_Color_Only_Top_Bulb.test b/VortexEngine/tests/tests_general/0060_Randomize_Color_Only_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0061_Save_Color_Only_Randomization_to_Top_Bulb.test b/VortexEngine/tests/tests_general/0061_Save_Color_Only_Randomization_to_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0062_Start_Color_Only_Auto-randomizer_Top_Bulb.test b/VortexEngine/tests/tests_general/0062_Start_Color_Only_Auto-randomizer_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0063_Stop_Color_Only_Auto-randomizer_Top_Bulb.test b/VortexEngine/tests/tests_general/0063_Stop_Color_Only_Auto-randomizer_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0064_Randomize_Pattern_Only_Top_Bulb.test b/VortexEngine/tests/tests_general/0064_Randomize_Pattern_Only_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0065_Save_Pattern_Only_Randomization_to_Top_Bulb.test b/VortexEngine/tests/tests_general/0065_Save_Pattern_Only_Randomization_to_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0066_Start_Pattern_Only_Auto-randomizer_Top_Bulb.test b/VortexEngine/tests/tests_general/0066_Start_Pattern_Only_Auto-randomizer_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0067_Stop_Pattern_Only_Auto-randomizer_Top_Bulb.test b/VortexEngine/tests/tests_general/0067_Stop_Pattern_Only_Auto-randomizer_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0068_Randomize_Color_and_Pattern_Top_Bulb.test b/VortexEngine/tests/tests_general/0068_Randomize_Color_and_Pattern_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0069_Save_Color_and_Pattern_Randomization_to_Top_Bulb.test b/VortexEngine/tests/tests_general/0069_Save_Color_and_Pattern_Randomization_to_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0070_Start_Color_and_Pattern_Auto-randomizer_Top_Bulb.test b/VortexEngine/tests/tests_general/0070_Start_Color_and_Pattern_Auto-randomizer_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0071_Stop_Color_and_Pattern_Auto-randomizer_Top_Bulb.test b/VortexEngine/tests/tests_general/0071_Stop_Color_and_Pattern_Auto-randomizer_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0073_Exit_mode_sharing.test b/VortexEngine/tests/tests_general/0073_Exit_mode_sharing.test
diff --git a/VortexEngine/tests/tests_general/0074_Reveice_a_mode_in_adv_mode_sharing.test b/VortexEngine/tests/tests_general/0074_Reveice_a_mode_in_adv_mode_sharing.test
diff --git a/VortexEngine/tests/tests_general/0075_Exit_adv_mode_sharing.test b/VortexEngine/tests/tests_general/0075_Exit_adv_mode_sharing.test
diff --git a/VortexEngine/tests/tests_general/0079_Cycle_Hue_Selection_in_Color_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0079_Cycle_Hue_Selection_in_Color_Select_Both_Bulbs.test
@@ -9,7 +9,7 @@ Args=
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/VortexEngine/tests/tests_general/0080_Cycle_Sat_Selection_in_Color_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0080_Cycle_Sat_Selection_in_Color_Select_Both_Bulbs.test
@@ -9,7 +9,7 @@ Args=
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/VortexEngine/tests/tests_general/0081_Cycle_Val_Selection_in_Color_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0081_Cycle_Val_Selection_in_Color_Select_Both_Bulbs.test
@@ -9,9 +9,9 @@ Args=
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/VortexEngine/tests/tests_general/0082_Select_Color_in_Color_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0082_Select_Color_in_Color_Select_Both_Bulbs.test
diff --git a/VortexEngine/tests/tests_general/0083_Select_Blank_in_Color_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0083_Select_Blank_in_Color_Select_Both_Bulbs.test
@@ -9,9 +9,9 @@ Args=
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/...ngine/tests/tests_general/0084_Return_to_Sat_Selection_from_Val_Selection_Both_Bulbs.test b/...ngine/tests/tests_general/0084_Return_to_Sat_Selection_from_Val_Selection_Both_Bulbs.test
@@ -9,9 +9,9 @@ Args=
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/VortexEngine/tests/tests_general/0085_Select_White_in_Color_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0085_Select_White_in_Color_Select_Both_Bulbs.test
@@ -9,7 +9,7 @@ Args=
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/...ngine/tests/tests_general/0086_Return_to_Hue_Selection_from_Sat_Selection_Both_Bulbs.test b/...ngine/tests/tests_general/0086_Return_to_Hue_Selection_from_Sat_Selection_Both_Bulbs.test
@@ -9,7 +9,7 @@ Args=
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/...e/tests/tests_general/0087_Return_to_Rainbow_Selection_from_Hue_Selection_Both_Bulbs.test b/...e/tests/tests_general/0087_Return_to_Rainbow_Selection_from_Hue_Selection_Both_Bulbs.test
@@ -9,7 +9,7 @@ Args=
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/VortexEngine/tests/tests_general/0092_Delete_a_Color_in_Color_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0092_Delete_a_Color_in_Color_Select_Both_Bulbs.test
diff --git a/VortexEngine/tests/tests_general/0094_Delete_All_Colors_in_Color_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0094_Delete_All_Colors_in_Color_Select_Both_Bulbs.test
@@ -9,7 +9,7 @@ Args=
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/VortexEngine/tests/tests_general/0097_Cycle_Hue_Selection_in_Color_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0097_Cycle_Hue_Selection_in_Color_Select_Front_Bulb.test
@@ -10,7 +10,7 @@ Args=
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/VortexEngine/tests/tests_general/0098_Cycle_Sat_Selection_in_Color_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0098_Cycle_Sat_Selection_in_Color_Select_Front_Bulb.test
@@ -10,7 +10,7 @@ Args=
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/VortexEngine/tests/tests_general/0099_Cycle_Val_Selection_in_Color_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0099_Cycle_Val_Selection_in_Color_Select_Front_Bulb.test
@@ -10,9 +10,9 @@ Args=
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/VortexEngine/tests/tests_general/0100_Select_Color_in_Color_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0100_Select_Color_in_Color_Select_Front_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0101_Select_Blank_in_Color_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0101_Select_Blank_in_Color_Select_Front_Bulb.test
@@ -10,9 +10,9 @@ Args=
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/...ngine/tests/tests_general/0102_Return_to_Sat_Selection_from_Val_Selection_Front_Bulb.test b/...ngine/tests/tests_general/0102_Return_to_Sat_Selection_from_Val_Selection_Front_Bulb.test
@@ -10,9 +10,9 @@ Args=
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/VortexEngine/tests/tests_general/0103_Select_White_in_Color_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0103_Select_White_in_Color_Select_Front_Bulb.test
@@ -10,7 +10,7 @@ Args=
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/...ngine/tests/tests_general/0104_Return_to_Hue_Selection_from_Sat_Selection_Front_Bulb.test b/...ngine/tests/tests_general/0104_Return_to_Hue_Selection_from_Sat_Selection_Front_Bulb.test
@@ -10,7 +10,7 @@ Args=
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/...e/tests/tests_general/0105_Return_to_Rainbow_Selection_from_Hue_Selection_Front_Bulb.test b/...e/tests/tests_general/0105_Return_to_Rainbow_Selection_from_Hue_Selection_Front_Bulb.test
@@ -10,7 +10,7 @@ Args=
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/VortexEngine/tests/tests_general/0110_Delete_a_Color_in_Color_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0110_Delete_a_Color_in_Color_Select_Front_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0112_Delete_All_Colors_in_Color_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0112_Delete_All_Colors_in_Color_Select_Front_Bulb.test
@@ -10,7 +10,7 @@ Args=
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/VortexEngine/tests/tests_general/0115_Cycle_Hue_Selection_in_Color_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0115_Cycle_Hue_Selection_in_Color_Select_Top_Bulb.test
@@ -11,7 +11,7 @@ Args=
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/VortexEngine/tests/tests_general/0116_Cycle_Sat_Selection_in_Color_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0116_Cycle_Sat_Selection_in_Color_Select_Top_Bulb.test
@@ -11,7 +11,7 @@ Args=
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/VortexEngine/tests/tests_general/0117_Cycle_Val_Selection_in_Color_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0117_Cycle_Val_Selection_in_Color_Select_Top_Bulb.test
@@ -11,9 +11,9 @@ Args=
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/VortexEngine/tests/tests_general/0118_Select_Color_in_Color_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0118_Select_Color_in_Color_Select_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0119_Select_Blank_in_Color_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0119_Select_Blank_in_Color_Select_Top_Bulb.test
@@ -11,9 +11,9 @@ Args=
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/...xEngine/tests/tests_general/0120_Return_to_Sat_Selection_from_Val_Selection_Top_Bulb.test b/...xEngine/tests/tests_general/0120_Return_to_Sat_Selection_from_Val_Selection_Top_Bulb.test
@@ -11,9 +11,9 @@ Args=
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/VortexEngine/tests/tests_general/0121_Select_White_in_Color_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0121_Select_White_in_Color_Select_Top_Bulb.test
@@ -11,7 +11,7 @@ Args=
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/...xEngine/tests/tests_general/0122_Return_to_Hue_Selection_from_Sat_Selection_Top_Bulb.test b/...xEngine/tests/tests_general/0122_Return_to_Hue_Selection_from_Sat_Selection_Top_Bulb.test
@@ -11,7 +11,7 @@ Args=
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/...ine/tests/tests_general/0123_Return_to_Rainbow_Selection_from_Hue_Selection_Top_Bulb.test b/...ine/tests/tests_general/0123_Return_to_Rainbow_Selection_from_Hue_Selection_Top_Bulb.test
@@ -11,7 +11,7 @@ Args=
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/VortexEngine/tests/tests_general/0128_Delete_a_Color_in_Color_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0128_Delete_a_Color_in_Color_Select_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0130_Delete_All_Colors_in_Color_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0130_Delete_All_Colors_in_Color_Select_Top_Bulb.test
@@ -11,7 +11,7 @@ Args=
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF0000000000000000000000000000000000000000FF00000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

diff --git a/VortexEngine/tests/tests_general/0134_Cycle_Patterns_in_Pattern_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0134_Cycle_Patterns_in_Pattern_Select_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0135_Select_Pattern_in_Pattern_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0135_Select_Pattern_in_Pattern_Select_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0159_Increase_Param_3_in_Adv_Pattern_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0159_Increase_Param_3_in_Adv_Pattern_Select_Front_Bulb.test
diff --git a/...ests/tests_general/0160_Increase_Param_3_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test b/...ests/tests_general/0160_Increase_Param_3_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0161_Increase_Param_4_in_Adv_Pattern_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0161_Increase_Param_4_in_Adv_Pattern_Select_Front_Bulb.test
diff --git a/...ests/tests_general/0162_Increase_Param_4_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test b/...ests/tests_general/0162_Increase_Param_4_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0163_Increase_Param_5_in_Adv_Pattern_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0163_Increase_Param_5_in_Adv_Pattern_Select_Front_Bulb.test
diff --git a/...ests/tests_general/0164_Increase_Param_5_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test b/...ests/tests_general/0164_Increase_Param_5_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test
diff --git a/...Engine/tests/tests_general/0165_Save_Custom_Pattern_in_Adv_Pattern_Select_Front_Bulb.test b/...Engine/tests/tests_general/0165_Save_Custom_Pattern_in_Adv_Pattern_Select_Front_Bulb.test
diff --git a/...ts/tests_general/0166_Cycle_Through_Param_5_Options_in_Adv_Pattern_Select_Front_Bulb.test b/...ts/tests_general/0166_Cycle_Through_Param_5_Options_in_Adv_Pattern_Select_Front_Bulb.test
diff --git a/...ts/tests_general/0167_Cycle_Through_Param_4_Options_in_Adv_Pattern_Select_Front_Bulb.test b/...ts/tests_general/0167_Cycle_Through_Param_4_Options_in_Adv_Pattern_Select_Front_Bulb.test
diff --git a/...ts/tests_general/0168_Cycle_Through_Param_3_Options_in_Adv_Pattern_Select_Front_Bulb.test b/...ts/tests_general/0168_Cycle_Through_Param_3_Options_in_Adv_Pattern_Select_Front_Bulb.test
diff --git a/...ts/tests_general/0169_Cycle_Through_Param_2_Options_in_Adv_Pattern_Select_Front_Bulb.test b/...ts/tests_general/0169_Cycle_Through_Param_2_Options_in_Adv_Pattern_Select_Front_Bulb.test
diff --git a/...ts/tests_general/0170_Cycle_Through_Param_1_Options_in_Adv_Pattern_Select_Front_Bulb.test b/...ts/tests_general/0170_Cycle_Through_Param_1_Options_in_Adv_Pattern_Select_Front_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0196_Exit_Factory_Reset_Menu.test b/VortexEngine/tests/tests_general/0196_Exit_Factory_Reset_Menu.test
diff --git a/VortexEngine/tests/tests_general/0200_Exit_Adv_Factory_Reset_Menu_Both_Bulbs.test b/VortexEngine/tests/tests_general/0200_Exit_Adv_Factory_Reset_Menu_Both_Bulbs.test
diff --git a/VortexEngine/tests/tests_general/0201_Factory_Reset_Both_Bulbs.test b/VortexEngine/tests/tests_general/0201_Factory_Reset_Both_Bulbs.test
diff --git a/VortexEngine/tests/tests_general/0203_Exit_Adv_Factory_Reset_Menu_Front_Bulb.test b/VortexEngine/tests/tests_general/0203_Exit_Adv_Factory_Reset_Menu_Front_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0204_Factory_Reset_Front_Bulb.test b/VortexEngine/tests/tests_general/0204_Factory_Reset_Front_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0206_Exit_Adv_Factory_Reset_Menu_Top_Bulb.test b/VortexEngine/tests/tests_general/0206_Exit_Adv_Factory_Reset_Menu_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0207_Factory_Reset_Top_Bulb.test b/VortexEngine/tests/tests_general/0207_Factory_Reset_Top_Bulb.test
diff --git a/VortexEngine/tests/tests_general/0208_randomize_mode1_watch.test b/VortexEngine/tests/tests_general/0208_randomize_mode1_watch.test