More terminal theme work