Clean up how symbol is added to themes component shape.  Ready for release.