I visited this WHS in August 2014 on my way back to Spain by car. Most of the nearby villages or towns are heavily fortified being close to the border with Spain. In my opinion it's worth visiting Estremoz too if you have time. Let's focus on Elvas now. Elvas is really a hidden gem and indeed one of the best WHS Portugal has to offer. Having been inscribed quite recently it is in tip-top condition and still not many tourists visit. The main highlights are the Forts of Graca and Santa Luzia but the historic centre, the aqueduct and the other fortifications make a pleasant stroll. I'd love to visit again should I ever buy a camera drone to be able to see Elvas from above! By the way, if you want to try yet another bacalhau dish, go for the bacalhau dorado! You won't be disappointed.