Move a lot of the more chrome-y stuff into the add-on.