Script tidy up, add support for cinnamon.