Add missing formatters and theme includes.