WIP: moving some stuff to Dotfiles.config, need to finish