Fix theme saftey issue
Stuff