Update themes including core
Update core and modules
Clean up
More cleanup