Fixed theme render bug