Replaced olf APT functions, added some Vim commands