Feture/fix preferences

Separate as you wanted. I hope a revert commit do not bother you.