Enhance preferences (wip)