Pe work

Oops - my last attempt merged from master to pe-work. Trying again to merge in the /styles folder.