added Paraíso themes
merge conflicts
fix merge