Add some def.* keywords and respective declarations
Add remaining defs with declarations and highlight
Fix macro declaration and set it to be highlighted as Macro