Refactor Favourites & Configuration

[lchristus]

We also need to make sure to unifily have the naming conventions regarding favourites / favorites.