refactored as themefile for new Terminal