It's ok to riff on themes. Bach did it all the time.