move stuff around, improved terminal theme