Overall: Replace some yellow styles with brown. Fixes #184