Updated form rendering to use margins from theme generator