merge img and vid into media and update themes