Remove level of indirection
Fix improper COM_StripExtension usage
Fix saber hilt selection having invalid shaders. Fixes #6