Refactor to start on Firefox addon and add a few more sites