RETURN OF THE JEDI
(1983)

For Return of the Jedi, Luke needed a new lightsaber.
Although the pre-production sketch of his costume includes a Graflex looking lightsaber, it was
drawn in just for purposes of completing the outfit.

....

Here are the final versions lightsabers for 'Return of the Jedi'.
Yet again, Vader's lightsaber underwent a transformation from being a based MPP & Heiland to a Graflex.