Changed colours to make @Sambuca happy, also started fixing issue #53