Resolved theme BUG #2