Moar decorations, issue #33