Move to just using melpa for all packages