Update macros
Update keys
Improve make scripts
Update properties