Textures/Resource Packs

I converted the texture set I have been using for minecraft up until the update that switched to resource packs. I converted the pack and everything works except, so far, glowstone and torches. Is there something I missed and is there a way I can combine what textures my pack doesn't include, like the horses?