Further work on desklets

Don't merge yet. More coming.