updated machado theme