Mostly pulling stefanw changes to froide-theme