Some minor preferences code refactor (matched with mikoto 2.6.1-1), added a dpkg check and conflicted against a ton of mirrored versions of PO2 >_>