Feature/camera gallery refactor

Oops. Find & Replace. Ña