Merges old dotfiles into new one
Corrects a few defines