Minor dispose fix.
[BUG #7273] Removed deprecated decorator key in the decoration theme
[BUG #7273] Clean up modern theme and remove old image based decorator definitions