Optimized basis sets for the collinear and non