Fix up new theme engine