Refactor the them generator

WE inlcude a custom signin form