Added scratch plugin and adjusted more leader mappings