[TEMP]Comment out Terminal packages &&
a few minor prop override changes