Major Refactoring
Merge branch 'master' of https://github.com/Forsch/Screens24