Fix multiples code errors on theme calling