clean up rewrites, update styles