Revert "Fix formatting; Change color picker"

This reverts commit 7b5a94fa82d24b707d0f97b44a8eea7447f6f55c.
Back to old color picker