Resolved theme BUG

Resolved theme BUG