Settings: port colorpicker

Fix tabs and whitespace

I think I got it all this time

Patchset 2-6
-rebased

Change-Id: I81359099ece1a8fc395754a942d11b8114b4eec7