 int numberOfSparkles = 1;
 int increasing = true;
 
-void confetti() {
-
-  if (patternId == RAINBOW) {
-    fadeToBlackBy(leds, NUM_LEDS, 180);
-  } else {
-    fadeToBlackBy(leds, NUM_LEDS, 200);
-  }
-  
-  if (numberOfSparkles < 80 && increasing) {
-    numberOfSparkles += 1;
-  } else if (numberOfSparkles > 5) {
-    numberOfSparkles -= 1;
+int upAndDownBy(int value, int difference) {
+  if (value < 80 && increasing) {
+    value += difference;
+  } else if (value > 5) {
+    value -= difference;
     increasing = false;
   } else {
     increasing = true;
-    numberOfSparkles += 1;
+    value += difference;
   }
+  return value;
+}
 
-  int pos;
+void nightSparkles() {
+  fadeToBlackBy(leds, NUM_LEDS, 180);
+  numberOfSparkles = upAndDownBy(numberOfSparkles, 1);
+  for (int i = 0; i < 20; i++) {
+    int pos = random16(NUM_LEDS);
+    leds[pos] = CHSV(hue, 180, 255);
+  }
+  for (int i = 0; i < numberOfSparkles * 4; i++) {
+    leds[random16(NUM_LEDS)] += CHSV(hue, 200, 20);
+  }
+  hue = hue + 1;
+}
 
-  if (patternId == RAINBOW) {
-    for (int i = 0; i < 20; i++) {
-      pos = random16(NUM_LEDS);
-      leds[pos] = CHSV(hue, 180, 255);
-    }
-  }
-
+void sparkles() {
+  fadeToBlackBy(leds, NUM_LEDS, 200);
+  numberOfSparkles = upAndDownBy(numberOfSparkles, 1);
   for (int i = 0; i < numberOfSparkles * 4; i++) {
-    pos = random16(NUM_LEDS);
-    if (patternId == RAINBOW) {
-      leds[pos] += CHSV(hue, 200, 20);
-    } else if (patternId == RAINBOW_2) {
+    int pos = random16(NUM_LEDS);
+    if (patternId == BEAUTIFUL_SPARKLES) {
       leds[pos] = CHSV(hue + (pos / 10), 240, 255);
-    } else if (patternId == RAINBOW_3) {
+    } else if (patternId == SINGLE_COLOR_SPARKLES) {
       leds[pos] = CHSV(hue, 240, 255);
     }
   }
 
-  if (patternId == RAINBOW_2) {
+  if (patternId == BEAUTIFUL_SPARKLES) {
     hue += 10;
   } else {
     hue = hue + 1;

    }
  }

  if (patternId == RAINBOW || patternId == RAINBOW_2 || patternId == RAINBOW_3) {
    confetti();
  } else if (patternId == DISCO_BARBER_1 || patternId == DISCO_BARBER_2) {
    discoBarber();
  } else if (patternId == JUGGLE) {

    allfreq = 3;
    thisphase += 48;
  }

  hue = hue + 1;                                                // Hue rotation is fun for thiswave.

  for (int k = 0; k < NUM_LEDS - 1; k++) {                                    // For each of the LED's in the strand, set a brightness based on a wave as follows:
