Add support for alpha in hex strings
Fix tabs/spaces
Merge branch 'color' into combined