Updated for Cinnamon 17