I think its how you define "makes up" that effects this. If you're just talking about matter, then dark matter would be the lion's share of what's in the universe. Though, its not really 'the world around us', as the world around as, as we perceive it, is entirely material that wouldn't really be considered dark matter. The dark energy number is, i believe, when you look at energy in the universe plus rest energies of matter. But I'd need to double check that.