cleanup + better select opts logic + let users select gallery in generator