I am currently using tap water and treat with tetra safe plus. Since the water has ph 7.5 i use Seachem discus buffer to lower the ph.
The Blackwater extra (tetra brand) is a chem that contains substances that help angelfish, discus, tetras, accommodate better the environment.