diff --git a/conf.d/40_aliases_common.fish b/conf.d/40_aliases_common.fish
index 6af2370..fc630be 100644
--- a/conf.d/40_aliases_common.fish
+++ b/conf.d/40_aliases_common.fish
@@ -1,11 +1,6 @@
 # General aliases
 
 # General
-alias c="clear"
-alias h="history"
-alias j="jobs -l"
-
-alias vi="vim"
 alias vimdiff="vim -d"
 
 alias python="python3"
diff --git a/conf.d/41_aliases_filesystem.fish b/conf.d/41_aliases_filesystem.fish
index 107f399..0070c2d 100644
--- a/conf.d/41_aliases_filesystem.fish
+++ b/conf.d/41_aliases_filesystem.fish
@@ -1,14 +1,11 @@
 # Filesystem aliases
 
 # Navigation
-
 alias ..="cd .."
 alias ...="cd ../.."
 alias ....="cd ../../.."
 alias .....="cd ../../../.."
 
-alias -="cd -"
-
 # Listing
 alias ls="lsd"
 alias l="lsd -lh"
diff --git a/conf.d/50_abbr_common.fish b/conf.d/50_abbr_common.fish
new file mode 100644
index 0000000..bb03abc
--- /dev/null
+++ b/conf.d/50_abbr_common.fish
@@ -0,0 +1,11 @@
+# General abbreviations
+
+abbr c clear
+abbr cls clear
+abbr h history
+abbr j "jobs -l"
+
+abbr py python3
+abbr vi vim
+abbr svi "sudo vim"
+abbr se sudoedit
diff --git a/conf.d/51_abbr_filesystem.fish b/conf.d/51_abbr_filesystem.fish
new file mode 100644
index 0000000..996b820
--- /dev/null
+++ b/conf.d/51_abbr_filesystem.fish
@@ -0,0 +1,16 @@
+# Filesystem abbreviations
+
+abbr -- - "cd -"    # Go to previous dir
+
+abbr md "mkdir -p"
+abbr rd rmdir
+
+abbr untar "tar -xvf"
+abbr tarview "tar -tf"
+abbr targz "tar -czvf"
+abbr tarxz "tar -cJvf"
+abbr tarbz2 "tar -cjvf"
+
+abbr chmodx "chmod +x"
+
+abbr lsblkfs "lsblk -o NAME,FSTYPE,SIZE,FSUSED,FSAVAIL,MOUNTPOINTS"
\ No newline at end of file
diff --git a/conf.d/52_abbr_network.fish b/conf.d/52_abbr_network.fish
new file mode 100644
index 0000000..76d160b
--- /dev/null
+++ b/conf.d/52_abbr_network.fish
@@ -0,0 +1,23 @@
+# Networking abbreviations
+
+# iproute2
+abbr ipa "ip addr"
+abbr ipb "ip -br addr"
+abbr ipr "ip route"
+abbr ipl "ip link"
+abbr ipn "ip neigh"
+
+# bridge
+abbr br bridge
+
+# ss
+abbr lports "ss -ltn"
+abbr ssp "ss -tulpen"
+
+abbr ports "ss -tulpen"
+
+# DNS
+abbr dns "dig +short"
+
+# Network diagnostics
+abbr trct traceroute
\ No newline at end of file
diff --git a/conf.d/53_abbr_packages.fish b/conf.d/53_abbr_packages.fish
new file mode 100644
index 0000000..5a2342d
--- /dev/null
+++ b/conf.d/53_abbr_packages.fish
@@ -0,0 +1,22 @@
+# Package management
+
+# Install / remove
+abbr inst "sudo apt install -y"
+abbr apti "sudo apt install -y"
+
+abbr aptr "sudo apt remove"
+abbr aptp "sudo apt purge"
+
+# Search / information
+abbr apts "apt search"
+abbr aptsh "apt show"
+
+# Maintenance
+abbr aptu "sudo apt update"
+abbr aptug "sudo apt update && sudo apt full-upgrade"
+abbr apta "sudo apt autoremove"
+abbr aptc "sudo apt clean"
+abbr aptl "apt list --installed"
+
+# Package files
+abbr aptf apt-file
\ No newline at end of file
diff --git a/conf.d/54_abbr_services.fish b/conf.d/54_abbr_services.fish
new file mode 100644
index 0000000..5718a0e
--- /dev/null
+++ b/conf.d/54_abbr_services.fish
@@ -0,0 +1,19 @@
+# Services
+
+# systemd
+abbr sc systemctl
+abbr sst "systemctl status"
+abbr ssu "systemctl --user"
+abbr reload "sudo systemctl daemon-reload"
+abbr reexec "sudo systemctl daemon-reexec"
+
+# journalctl
+abbr jc journalctl
+abbr jcb "journalctl -b"
+abbr jcf "journalctl -f"
+abbr jce "journalctl -xe"
+abbr jcu "journalctl -u"
+
+# Power
+abbr rb "sudo reboot"
+abbr shutdown "sudo shutdown now"
\ No newline at end of file
diff --git a/conf.d/55_abbr_git.fish b/conf.d/55_abbr_git.fish
new file mode 100644
index 0000000..e6ae584
--- /dev/null
+++ b/conf.d/55_abbr_git.fish
@@ -0,0 +1,5 @@
+# Git
+
+abbr gs "git status"
+abbr gc "git commit"
+abbr gp "git push"
\ No newline at end of file
diff --git a/conf.d/56_abbr_edit.fish b/conf.d/56_abbr_edit.fish
new file mode 100644
index 0000000..9687822
--- /dev/null
+++ b/conf.d/56_abbr_edit.fish
@@ -0,0 +1,7 @@
+# Edit 
+
+abbr fstab "sudo vim /etc/fstab"
+abbr hosts "sudo vim /etc/hosts"
+abbr vimsshd "sudo vim /etc/ssh/sshd_config"
+abbr sshconfig "vim ~/.ssh/config"
+abbr sudoers "sudo visudo"