The way that lightsabers were held and used in the movies thus far, I've always figured they (basically) already were lighkatanas. They're certainly not sabers.

Or lightbaseballbats, maybe...

That guys helmet, the lightsaber, and the Falcon's dish are all driving me nuts! The X-wings are pretty sweet though

Meh.. At least there probably won't be any Y wings in it (ducks).

Meh.. At least there probably won't be any Y wings in it (ducks).

There will be. Leaked top-downs of a rebel hangar showed a blueprint of a Y-wing.