iid generator and theme updates