Added Macro file and combined plugins with major modes