Color tweaks. Please report issues in github