Of the EMs that performed poorly in the rigid-molecule force field CSP, results for NTO are improved significantly, ranking the α and β polymorphs as 3rd and 2nd lowest energy structures, ranking of the FOX-7 polymorphs is improved such that the known polymorphs are 2nd, 3rd and 32nd lowest energy structures, and HMX predictions now place the four known polymorphs as 1st, 2nd, 3rd and 9th ranked in energy. The HMX results demonstrate that the high molecular energy of the chair-chair conformation can be compensated by improved interactions in the solid state. The energy range of all of the polymorphic EMs falls well within the range normally seen for organic molecular polymorphs. Only three out of the 16 experimentally observed crystal structures being ranked outside the three lowest energy predictions with γ-FOX-7 and ATZ being worst ranked, as 32nd and 113th ranked structures by energy after DFT re-optimization.