             int s = splitString(readString, ';', 3).toInt();
             int v = splitString(readString, ';', 4).toInt();
             change_color(led, h, s, v);
+            //If we turn off led we assume we want to stop the animation too.
+            if ( (h==0) && (s==0) && (v==0) ) {
+              change_anim(led,0,0,0);
+            }
             Serial.println(readString);
           }
-
+          
           //Change animation
           if (command == "animation") {
             int led = splitString(readString, ';', 1).toInt();

            int parameter1 = splitString(readString, ';', 3).toInt();
            int parameter2 = splitString(readString, ';', 4).toInt();
            change_anim(led, animation, parameter1, parameter2);
            Serial.println(readString);
          }


           for (int led = 0; led < NUM_LEDS; led++) {
              val[led] = 255;
           }
           Serial.println(readString);
        }

        if (readString == "/reset"){
