Syncing with internal code base. Edits include support for color edit…

[pxmkuruc]

…ing and various bug fixes and code cleanup.

[chadrik]

Thanks for the updates!