Upgraded based on iperdrazas/dotfiles