theme adjustments ticket #1407