Aguila theme - small fixes