Rebase matrix, add config, add sweep2wake, remove touchwake