Loads of changes to use use-package way more