Reorganize vars, mostly add colors
Add ornament support

This may be a bad idea.