General cleanup on Tema Azul markup