Some fixes + color customization :D