Fix theme settings and reorganize emac themes