color pickers:  small cleanup, little nitpick things :)
Signed-off-by: Paul Beeler <sparksco@gmail.com>

underp the color pickers:

Move both the battery bar and halo color pickers into saber settings.
Signed-off-by: Paul Beeler <sparksco@gmail.com>