much better support for disabling decorations