Theme support fix (yeah, another one...)