Address comments + remove 2 bad themes