Ornament changes.

+ Hopefully the last of this.