Add autopairs, remove highlight-cl, swap hook lambda for fn