Bug fix: Make sure if user changes theme, it doesn't create error