Colours!
Merge branch 'master' into florian
Added a modal sheet for adding text and nice buttons for deleting :)