fixes to color parsing; adding <Color /> and <Gradient /> entities