Non-metal Doping for Band-Gap Engineering