Improve to include theoretical shells in the current format

(still in construction)