Grady/reorder

Good call.  The Blues I couldn't find in our static variables file, but the Greys I replaced with light-3