Refactoring with new Kivy version