Fix #83 and tweak comment header colors