add macbook keyboard fixes
use default vim theme
update npm swap script