flying ships are now custom colored as well
fixed merge conflicts