Added modded marginov color picker

Change-Id: Ic721fdc7f63607d972d203e1a13097e8870bce2f