Fixed theme initialised too late issue