Update macros
Update keys
Improve make scripts
Update properties
Improve make scripts
Add customizations
Update properties