More terminal fixes to sw1nn theme