This has been suggested a few times. I feel it limits alot of what you can do when you go with themes. (Specifically hot and cold nations).

I would also ask for a reevaluation of the Dpoints for some of the generic themes or their effect.