Adds pg
Fixes merge conflicts
Removes old stylesheets