Big refactor to simplify light spectrum & matching function convolutions