Start to add better setup for cinnamon builder
WIP commit