working on theme screens