Added unlocked icon, cleaned up color vars
Added commit to macros, changed its icon