Applying updates.

The folder structure for the themes has now changed and few other things