Added more c++ file extensions.
Simplified mappings and added some plugins.