some work on themes