Solve issue with theme