Just some work in theme.py