Updated for Cinnamon 2.0