The ESRF Upgrade includes construction of long beamlines to use routinely nano-beams. This requires a very high demagnification of the ESRF source, which makes beamline optics design a fundamental concept for the future availability of bright and small stable beam. A summary of recent simulations for Upgrade beamlines is presented, including transfocators, bent crystals and graded multilayers. Some examples of particular calculations are described. In parallel to the Upgrade Programme, an ambitious project for the upgrade and integration of existing software and development of new toolbox is been carried out, with particular interest in beam polarization and partial coherence.