Improve comments and be explicity about when to fire Theme Setup function