Assing current theme earlier to invalidate the old saved state