Or Star Wars Too : Ridiculous Boogaloo.
My first suggestions are cut the bar scene with Saturday Night Fever so it seems as if Obi-Wan and Anakin have entered a 1970's disco (remember the bird with the Princess Leia haircut?).
Also is it too much to expect a Sound Of Music reference during the picnic scene?