Removed undefined themes. Fixed another conflict.