Removing the flicker, updating theme again