Improve theme generator updates