Renamed some macros for consistency
Added more objective macros
Added Aryon's character macro
E1S1: some progress