Fix failure to apply new attributes while theme switching.

Thanks to: Alex Merenstein

git-svn-id: svn://daper.net/moc/trunk@2642 910807d9-36e0-0310-a014-e9ea483e2ba4
Post-contribution code polishing for theme switching attributes.

Amends: r2642

git-svn-id: svn://daper.net/moc/trunk@2643 910807d9-36e0-0310-a014-e9ea483e2ba4