diff --git a/config.fish b/config.fish
index dde9708..ad03d08 100644
--- a/config.fish
+++ b/config.fish
@@ -8,14 +8,7 @@ end
 # │ If you have any questions, check the git page at: │
 # │ https://git.k4li.de/pika/fish.git                 │
 # ╰───────────────────────────────────────────────────╯
-
 # ─────────────────────────────────< Environment-Variables >───────────────────────────────
-set fish_greeting
-set toolbox "The following tools are active:
-"
-set warnings "The following packages are NOT active:
-
-"
 
 set -p EDITOR (which nvim)
 
@@ -118,7 +111,7 @@ end
 end
 
 # ─< colored everything >───────────────────────────────────────────────────────────────────
-alias ip="ip -c"
+alias ip="ip --color=always"
 alias grep="grep --color=always"
 
 # ─< weather >──────────────────────────────────────────────────────────────────────────────
@@ -127,6 +120,7 @@ alias www='curl wttr.in/Ulm'
 # ─< rsync >────────────────────────────────────────────────────────────────────────────────
 if command -v rsync >/dev/null 2>&1
     alias cp='rsync -avP'
+    alias scp='rsync -avP'
 end
 
 # ─< bat alias >────────────────────────────────────────────────────────────────────────────
@@ -158,18 +152,17 @@ if command -v docker >/dev/null 2>&1
     alias appudpate='docker pull && docker compose up -d --force-recreate'
 end
 
-
-
 # ─< g stands for git >─────────────────────────────────────────────────────────────────────
 if command -v git >/dev/null 2>&1
     alias g='git'
     alias gs='git status'
-    alias gf='git fetch && git merge origin/main'
+    alias gf='git fetch'
+    alias gf='git fetch && git merge'
     alias gc='git clone --recurse-submodule'
     alias ga='git add'
     alias gp='git pull --recurse-submodule'
-    alias gsu='git submodule foreach git pull'
-    alias gsa='git submodule add -b'
+    alias gsu='git submodule foreach git pull && git add .'
+#    alias gsa='git submodule add -b'
     alias gcm='git commit -m'
     alias gpu='git push --recurse-submodule=on-demand'
 end