Remove non-color stuff, add common aliases