diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 07a9e0c..954ae11 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -3,12 +3,6 @@
 [user]
 	name = Marcus Bengtsson
 	email = marcus.bengtsson@elysics.se
-[diff]
-	tool = bc3
-[difftool]
-  prompt = false
-[merge]
-	tool = bc3
 [init]
 
 [alias]
@@ -20,7 +14,17 @@
 	submodulesummary = true
 [push]
 	default = simple
-[difftool "bc3"]
-	trustExitCode = true
-[mergetool "bc3"]
-	trustExitCode = true
+
+[merge]
+	tool = kdiff3
+[mergetool "kdiff3"]
+	trustExitCode = false
+[mergetool]
+	prompt = false
+[diff]
+	guitool = kdiff3
+	tool = kdiff3
+[difftool "kdiff3"]
+	trustExitCode = false
+[difftool]
+	prompt = false

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 07a9e0c..954ae11 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -3,12 +3,6 @@
 [user]
 	name = Marcus Bengtsson
 	email = marcus.bengtsson@elysics.se
-[diff]
-	tool = bc3
-[difftool]
-  prompt = false
-[merge]
-	tool = bc3
 [init]
 
 [alias]
@@ -20,7 +14,17 @@
 	submodulesummary = true
 [push]
 	default = simple
-[difftool "bc3"]
-	trustExitCode = true
-[mergetool "bc3"]
-	trustExitCode = true
+
+[merge]
+	tool = kdiff3
+[mergetool "kdiff3"]
+	trustExitCode = false
+[mergetool]
+	prompt = false
+[diff]
+	guitool = kdiff3
+	tool = kdiff3
+[difftool "kdiff3"]
+	trustExitCode = false
+[difftool]
+	prompt = false
diff --git a/zsh/exports.zsh b/zsh/exports.zsh
index e983312..d40ee73 100644
--- a/zsh/exports.zsh
+++ b/zsh/exports.zsh
@@ -2,6 +2,8 @@
 # sourced by .zshrc
 
 export TERM=xterm-256color
+#export TERM=alacritty
+export COLORTERM=truecolor
 export VTE_VERSION="100"
 
 export PAGER=less
@@ -23,4 +25,4 @@
 
 export MINICOM="-c on"
 
-export GOPATH=/home/marcus/Dev/go
+export GOPATH=/home/marcus/Dev/Go

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 07a9e0c..954ae11 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -3,12 +3,6 @@
 [user]
 	name = Marcus Bengtsson
 	email = marcus.bengtsson@elysics.se
-[diff]
-	tool = bc3
-[difftool]
-  prompt = false
-[merge]
-	tool = bc3
 [init]
 
 [alias]
@@ -20,7 +14,17 @@
 	submodulesummary = true
 [push]
 	default = simple
-[difftool "bc3"]
-	trustExitCode = true
-[mergetool "bc3"]
-	trustExitCode = true
+
+[merge]
+	tool = kdiff3
+[mergetool "kdiff3"]
+	trustExitCode = false
+[mergetool]
+	prompt = false
+[diff]
+	guitool = kdiff3
+	tool = kdiff3
+[difftool "kdiff3"]
+	trustExitCode = false
+[difftool]
+	prompt = false
diff --git a/zsh/exports.zsh b/zsh/exports.zsh
index e983312..d40ee73 100644
--- a/zsh/exports.zsh
+++ b/zsh/exports.zsh
@@ -2,6 +2,8 @@
 # sourced by .zshrc
 
 export TERM=xterm-256color
+#export TERM=alacritty
+export COLORTERM=truecolor
 export VTE_VERSION="100"
 
 export PAGER=less
@@ -23,4 +25,4 @@
 
 export MINICOM="-c on"
 
-export GOPATH=/home/marcus/Dev/go
+export GOPATH=/home/marcus/Dev/Go
diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh
deleted file mode 100644
index 46f4db1..0000000
--- a/zsh/prompt.zsh
+++ /dev/null
@@ -1,34 +0,0 @@
-setopt PROMPT_SUBST
-export GIT_PS1_SHOWDIRTYSTATE=1
-export GIT_PS1_SHOWUPSTREAM="auto"
-
-function _git_info() {
-  if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
-  
-    command git diff --quiet --ignore-submodules HEAD &>/dev/null;
-    
-    if [[ $? -eq 1 ]]; then
-        local color=yellow
-    else
-        local color=green
-    fi   
-    
-    echo "%{%F{$color}%}  $(__git_ps1 "%s")"
-  else
-    echo ""
-  fi
-}
-
-function zle-line-init zle-keymap-select {
-    VIM_NORMAL="%{%F{yellow}%} [% NORMAL]% %{$reset_color%}"
-    RPROMPT="${${KEYMAP/vicmd/$VIM_NORMAL}/(main|viins)/} $EPS1"
-    zle reset-prompt
-}
-PROMPT_EC='%(?.%{%F{green}%}.%{%F{red}%})%?'
-PROMPT_USER='%{%F{magenta}%}%n'
-PROMPT_DIR='%{%F{blue}%}%~%'
-PROMPT_SU='%{%f%k%b%}%(!.%{%F{red}%}# %{%k%F{black}%})'
-
-PROMPT='%{%f%b%k%} $PROMPT_EC  $PROMPT_USER  $PROMPT_DIR  $(_git_info)
-%{%f%k%b%}▸ '
-

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 07a9e0c..954ae11 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -3,12 +3,6 @@
 [user]
 	name = Marcus Bengtsson
 	email = marcus.bengtsson@elysics.se
-[diff]
-	tool = bc3
-[difftool]
-  prompt = false
-[merge]
-	tool = bc3
 [init]
 
 [alias]
@@ -20,7 +14,17 @@
 	submodulesummary = true
 [push]
 	default = simple
-[difftool "bc3"]
-	trustExitCode = true
-[mergetool "bc3"]
-	trustExitCode = true
+
+[merge]
+	tool = kdiff3
+[mergetool "kdiff3"]
+	trustExitCode = false
+[mergetool]
+	prompt = false
+[diff]
+	guitool = kdiff3
+	tool = kdiff3
+[difftool "kdiff3"]
+	trustExitCode = false
+[difftool]
+	prompt = false
diff --git a/zsh/exports.zsh b/zsh/exports.zsh
index e983312..d40ee73 100644
--- a/zsh/exports.zsh
+++ b/zsh/exports.zsh
@@ -2,6 +2,8 @@
 # sourced by .zshrc
 
 export TERM=xterm-256color
+#export TERM=alacritty
+export COLORTERM=truecolor
 export VTE_VERSION="100"
 
 export PAGER=less
@@ -23,4 +25,4 @@
 
 export MINICOM="-c on"
 
-export GOPATH=/home/marcus/Dev/go
+export GOPATH=/home/marcus/Dev/Go
diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh
deleted file mode 100644
index 46f4db1..0000000
--- a/zsh/prompt.zsh
+++ /dev/null
@@ -1,34 +0,0 @@
-setopt PROMPT_SUBST
-export GIT_PS1_SHOWDIRTYSTATE=1
-export GIT_PS1_SHOWUPSTREAM="auto"
-
-function _git_info() {
-  if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
-  
-    command git diff --quiet --ignore-submodules HEAD &>/dev/null;
-    
-    if [[ $? -eq 1 ]]; then
-        local color=yellow
-    else
-        local color=green
-    fi   
-    
-    echo "%{%F{$color}%}  $(__git_ps1 "%s")"
-  else
-    echo ""
-  fi
-}
-
-function zle-line-init zle-keymap-select {
-    VIM_NORMAL="%{%F{yellow}%} [% NORMAL]% %{$reset_color%}"
-    RPROMPT="${${KEYMAP/vicmd/$VIM_NORMAL}/(main|viins)/} $EPS1"
-    zle reset-prompt
-}
-PROMPT_EC='%(?.%{%F{green}%}.%{%F{red}%})%?'
-PROMPT_USER='%{%F{magenta}%}%n'
-PROMPT_DIR='%{%F{blue}%}%~%'
-PROMPT_SU='%{%f%k%b%}%(!.%{%F{red}%}# %{%k%F{black}%})'
-
-PROMPT='%{%f%b%k%} $PROMPT_EC  $PROMPT_USER  $PROMPT_DIR  $(_git_info)
-%{%f%k%b%}▸ '
-
diff --git a/zsh/prompt.zsh_old b/zsh/prompt.zsh_old
new file mode 100644
index 0000000..46f4db1
--- /dev/null
+++ b/zsh/prompt.zsh_old
@@ -0,0 +1,34 @@
+setopt PROMPT_SUBST
+export GIT_PS1_SHOWDIRTYSTATE=1
+export GIT_PS1_SHOWUPSTREAM="auto"
+
+function _git_info() {
+  if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
+  
+    command git diff --quiet --ignore-submodules HEAD &>/dev/null;
+    
+    if [[ $? -eq 1 ]]; then
+        local color=yellow
+    else
+        local color=green
+    fi   
+    
+    echo "%{%F{$color}%}  $(__git_ps1 "%s")"
+  else
+    echo ""
+  fi
+}
+
+function zle-line-init zle-keymap-select {
+    VIM_NORMAL="%{%F{yellow}%} [% NORMAL]% %{$reset_color%}"
+    RPROMPT="${${KEYMAP/vicmd/$VIM_NORMAL}/(main|viins)/} $EPS1"
+    zle reset-prompt
+}
+PROMPT_EC='%(?.%{%F{green}%}.%{%F{red}%})%?'
+PROMPT_USER='%{%F{magenta}%}%n'
+PROMPT_DIR='%{%F{blue}%}%~%'
+PROMPT_SU='%{%f%k%b%}%(!.%{%F{red}%}# %{%k%F{black}%})'
+
+PROMPT='%{%f%b%k%} $PROMPT_EC  $PROMPT_USER  $PROMPT_DIR  $(_git_info)
+%{%f%k%b%}▸ '
+

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 07a9e0c..954ae11 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -3,12 +3,6 @@
 [user]
 	name = Marcus Bengtsson
 	email = marcus.bengtsson@elysics.se
-[diff]
-	tool = bc3
-[difftool]
-  prompt = false
-[merge]
-	tool = bc3
 [init]
 
 [alias]
@@ -20,7 +14,17 @@
 	submodulesummary = true
 [push]
 	default = simple
-[difftool "bc3"]
-	trustExitCode = true
-[mergetool "bc3"]
-	trustExitCode = true
+
+[merge]
+	tool = kdiff3
+[mergetool "kdiff3"]
+	trustExitCode = false
+[mergetool]
+	prompt = false
+[diff]
+	guitool = kdiff3
+	tool = kdiff3
+[difftool "kdiff3"]
+	trustExitCode = false
+[difftool]
+	prompt = false
diff --git a/zsh/exports.zsh b/zsh/exports.zsh
index e983312..d40ee73 100644
--- a/zsh/exports.zsh
+++ b/zsh/exports.zsh
@@ -2,6 +2,8 @@
 # sourced by .zshrc
 
 export TERM=xterm-256color
+#export TERM=alacritty
+export COLORTERM=truecolor
 export VTE_VERSION="100"
 
 export PAGER=less
@@ -23,4 +25,4 @@
 
 export MINICOM="-c on"
 
-export GOPATH=/home/marcus/Dev/go
+export GOPATH=/home/marcus/Dev/Go
diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh
deleted file mode 100644
index 46f4db1..0000000
--- a/zsh/prompt.zsh
+++ /dev/null
@@ -1,34 +0,0 @@
-setopt PROMPT_SUBST
-export GIT_PS1_SHOWDIRTYSTATE=1
-export GIT_PS1_SHOWUPSTREAM="auto"
-
-function _git_info() {
-  if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
-  
-    command git diff --quiet --ignore-submodules HEAD &>/dev/null;
-    
-    if [[ $? -eq 1 ]]; then
-        local color=yellow
-    else
-        local color=green
-    fi   
-    
-    echo "%{%F{$color}%}  $(__git_ps1 "%s")"
-  else
-    echo ""
-  fi
-}
-
-function zle-line-init zle-keymap-select {
-    VIM_NORMAL="%{%F{yellow}%} [% NORMAL]% %{$reset_color%}"
-    RPROMPT="${${KEYMAP/vicmd/$VIM_NORMAL}/(main|viins)/} $EPS1"
-    zle reset-prompt
-}
-PROMPT_EC='%(?.%{%F{green}%}.%{%F{red}%})%?'
-PROMPT_USER='%{%F{magenta}%}%n'
-PROMPT_DIR='%{%F{blue}%}%~%'
-PROMPT_SU='%{%f%k%b%}%(!.%{%F{red}%}# %{%k%F{black}%})'
-
-PROMPT='%{%f%b%k%} $PROMPT_EC  $PROMPT_USER  $PROMPT_DIR  $(_git_info)
-%{%f%k%b%}▸ '
-
diff --git a/zsh/prompt.zsh_old b/zsh/prompt.zsh_old
new file mode 100644
index 0000000..46f4db1
--- /dev/null
+++ b/zsh/prompt.zsh_old
@@ -0,0 +1,34 @@
+setopt PROMPT_SUBST
+export GIT_PS1_SHOWDIRTYSTATE=1
+export GIT_PS1_SHOWUPSTREAM="auto"
+
+function _git_info() {
+  if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
+  
+    command git diff --quiet --ignore-submodules HEAD &>/dev/null;
+    
+    if [[ $? -eq 1 ]]; then
+        local color=yellow
+    else
+        local color=green
+    fi   
+    
+    echo "%{%F{$color}%}  $(__git_ps1 "%s")"
+  else
+    echo ""
+  fi
+}
+
+function zle-line-init zle-keymap-select {
+    VIM_NORMAL="%{%F{yellow}%} [% NORMAL]% %{$reset_color%}"
+    RPROMPT="${${KEYMAP/vicmd/$VIM_NORMAL}/(main|viins)/} $EPS1"
+    zle reset-prompt
+}
+PROMPT_EC='%(?.%{%F{green}%}.%{%F{red}%})%?'
+PROMPT_USER='%{%F{magenta}%}%n'
+PROMPT_DIR='%{%F{blue}%}%~%'
+PROMPT_SU='%{%f%k%b%}%(!.%{%F{red}%}# %{%k%F{black}%})'
+
+PROMPT='%{%f%b%k%} $PROMPT_EC  $PROMPT_USER  $PROMPT_DIR  $(_git_info)
+%{%f%k%b%}▸ '
+
diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index 0352f3d..f9b7f5d 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -9,7 +9,7 @@
 for config ($ZSH/**/*.zsh) source $config
 
 # Source git-completion and git-prompt
-source $DOTFILES/git/git-prompt.sh
+# source $DOTFILES/git/git-prompt.sh
 source $DOTFILES/git/git-completion.zsh &>/dev/null
 
 # History
@@ -27,10 +27,12 @@
 setopt HIST_NO_STORE
 setopt HIST_VERIFY
 setopt EXTENDED_HISTORY
+setopt INTERACTIVECOMMENTS
 
 # Globbing
 setopt GLOBDOTS
 setopt EXTENDEDGLOB
+setopt NUMERICGLOBSORT
 
 # CD
 setopt AUTO_CD
@@ -51,9 +53,9 @@
 alias mmv="noglob zmv"
 
 # Vi mode
-bindkey -v
-zle -N zle-line-init
-zle -N zle-keymap-select
+#bindkey -v
+#zle -N zle-line-init
+#zle -N zle-keymap-select
 
 # Ensure that arrow keys work as they should
 bindkey '\e[A' up-line-or-history
@@ -77,6 +79,9 @@
 # Enable reverse search
 bindkey '^R' history-incremental-pattern-search-backward
 
+# History expansion on space
+bindkey ' ' magic-space
+
 # make less more friendly for non-text input files, see lesspipe(1)
 [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
 
@@ -85,6 +90,11 @@
 alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
 
 source /usr/share/zsh/plugins/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh
+source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
+ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=#999'
 
 # Disable "Software Flow Control (XON/XOFF)" so that terminal will not hang on C-s
 stty -ixon
+
+eval "$(starship init zsh)"
+neofetch --disable theme icons packages term