diff --git a/gitconfig b/gitconfig
index 2b788d0..12727f0 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,6 +1,6 @@
 [user]
 	name = Faerbit
-	email = faerbit@gmail.com
+	email = faerbit@posteo.net
 [credential]
 	helper = cache
 [core]
@@ -13,3 +13,7 @@
 
 [alias]
 	lod = log --all --decorate --oneline --graph
+[color]
+	ui = auto
+[init]
+	defaultBranch = main
diff --git a/vimrc b/vimrc
index 271b9d9..50e0440 100644
--- a/vimrc
+++ b/vimrc
@@ -1,9 +1,3 @@
-call plug#begin('~/.vim/plugged')
-
-Plug('tpope/vim-commentary')
-
-call plug#end()
-
 "Split view if multiple files are opened
 if argc() == 2
     silent vertical all
diff --git a/vimrc.basic b/vimrc.basic
deleted file mode 100644
index 50e0440..0000000
--- a/vimrc.basic
+++ /dev/null
@@ -1,28 +0,0 @@
-"Split view if multiple files are opened
-if argc() == 2
-    silent vertical all
-endif
-
-set background=dark
-set autoindent
-set number
-set tabstop=4
-set softtabstop=4
-set shiftwidth=4
-set incsearch
-set hlsearch
-set expandtab
-set autowrite
-set cmdheight=2
-set scrolloff=7
-set wildmode=longest,list,full
-set wildmenu
-set wildignorecase
-set ignorecase
-set smartcase
-set ruler
-syntax on
-filetype plugin indent on
-imap jk <Esc>
-map <F2> :set nonumber!<CR>
-set pastetoggle=<F3>
diff --git a/zshrc b/zshrc
index 8f69c14..59a7d97 100644
--- a/zshrc
+++ b/zshrc
@@ -49,11 +49,11 @@ alias battery='upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep "ti
 alias poweroff='sudo poweroff'
 alias reboot='sudo reboot'
 alias n='ninja'
-alias m='make'
+alias m='make -j$(nproc)'
 alias cmake='cmake -G Ninja'
 alias wlan='sudo netctl-auto list'
 alias adb-connect='adb connect 192.168.1.138:5555'
-alias sysupgrade='sudo pacmatic -Syu; auracle sync'
+alias sysupgrade='sudo pacman -Syu; auracle sync'
 alias delete-old-archives='sudo zsh -ci _delete-old-archives'
 alias clean-paccache='sudo -s -- paccache -r; paccache -ruk0'
 alias krypto="ssh -t azure screen -r"