Merge pull request #135 from it-workshop/wp/CAROLINE-49/2

CAROLINE-49: Refactor to new preferences.
(cherry picked from commit 9a8ebc5af010e8b1969a40ccf6d5b25eedb182e7)