Added color selector

With bugs