Bug fix with theme