V2 plus plus

Made popcorn click to select on desktop.

Just a little cleanup and removing deprecated usage.