Move assets to media

Deals with moving files across on update as well
Fixes for new colour form fields