Added color picker etc.