diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index f25fc10..d6cdfd8 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -6,7 +6,7 @@ alias lt='eza --tree --icons'
 
 alias ls='n -de'
 
-alias enchdoomdictlink='ln -s ~/.config/doom/dict/zpb-enchant-en_US.dic ~/.config/enchant/en_US.dic'
+alias enchdoomdictlink='rm ~/.config/enchant/en_US.dic && ln -s ~/.config/doom/dict/zpb-enchant-en_US.dic ~/.config/enchant/en_US.dic'
 alias enchdoomdictmerge='sort ~/.config/doom/dict/zpb-enchant-en_US.dic ~/.config/enchant/en_US.dic | uniq > ~/.config/doom/dict/zpb-enchant-en_US.dic'
 
 alias gdemacs="sudo rm -r /home/zpb/.config/emacs/eln-cache && emacs"
diff --git a/fish/.config/fish/config_BACKUP_467.fish b/fish/.config/fish/config_BACKUP_467.fish
new file mode 100644
index 0000000..207a2de
--- /dev/null
+++ b/fish/.config/fish/config_BACKUP_467.fish
@@ -0,0 +1,69 @@
+alias ls='eza --icons'
+alias l='eza -l --icons'
+alias la='eza -a --icons'
+alias lla='eza -la --icons'
+alias lt='eza --tree --icons'
+
+alias ls='n -de'
+
+alias enchdoomdictlink='ln -s ~/.config/doom/dict/zpb-enchant-en_US.dic ~/.config/enchant/en_US.dic'
+<<<<<<< HEAD
+=======
+alias enchdoomdictmerge='sort ~/.config/doom/dict/zpb-enchant-en_US.dic ~/.config/enchant/en_US.dic | uniq > ~/.config/doom/dict/zpb-enchant-en_US.dic'
+>>>>>>> 5b7a6f0fe9b932706cf489002906eb76ff4136ce
+
+alias gdemacs="sudo rm -r /home/zpb/.config/emacs/eln-cache && emacs"
+alias gdemacsclient="sudo rm -r /home/zpb/.config/emacs/eln-cache && emacsclient --alternate-editor="" --create-frame"
+alias emcli="emacsclient --alternate-editor="" --create-frame"
+alias fixemacs="sudo rm -r /home/zpb/.config/emacs/eln-cache"
+
+alias pbcopy='xclip -selection clipboard'
+alias pbpaste='xclip -selection clipboard -o'
+
+alias stspull='cp -r ~/syncthing/misc/StS-Saves/synced/{preferences,runs,saves} ~/.local/share/Steam/steamapps/common/SlayTheSpire/'
+alias stspush='cp -r ~/.local/share/Steam/steamapps/common/SlayTheSpire/{preferences,runs,saves} ~/syncthing/misc/StS-Saves/synced/'
+
+set --export NNN_FCOLORS 96d1b49600b06c00b0d3d3
+#red d3
+#orange d1
+#yellow b4
+#green 96
+#aqua 6c
+#blue 6d
+#purple b0
+
+# NNN cd on quit
+function n --wraps nnn --description 'support nnn quit and change directory'
+    # Block nesting of nnn in subshells
+    if test -n "$NNNLVL" -a "$NNNLVL" -ge 1
+        echo "nnn is already running"
+        return
+    end
+
+    # The behaviour is set to cd on quit (nnn checks if NNN_TMPFILE is set)
+    # If NNN_TMPFILE is set to a custom path, it must be exported for nnn to
+    # see. To cd on quit only on ^G, remove the "-x" from both lines below,
+    # without changing the paths.
+    if test -n "$XDG_CONFIG_HOME"
+        set -x NNN_TMPFILE "$XDG_CONFIG_HOME/nnn/.lastd"
+    else
+        set -x NNN_TMPFILE "$HOME/.config/nnn/.lastd"
+    end
+
+    # Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn
+    # stty start undef
+    # stty stop undef
+    # stty lwrap undef
+    # stty lnext undef
+
+    # The command function allows one to alias this function to `nnn` without
+    # making an infinitely recursive alias
+    command nnn $argv
+
+    if test -e $NNN_TMPFILE
+        source $NNN_TMPFILE
+        rm $NNN_TMPFILE
+    end
+end
+
+zoxide init fish | source
diff --git a/fish/.config/fish/config_BASE_467.fish b/fish/.config/fish/config_BASE_467.fish
new file mode 100644
index 0000000..35dde1a
--- /dev/null
+++ b/fish/.config/fish/config_BASE_467.fish
@@ -0,0 +1,65 @@
+alias ls='eza --icons'
+alias l='eza -l --icons'
+alias la='eza -a --icons'
+alias lla='eza -la --icons'
+alias lt='eza --tree --icons'
+
+alias ls='n -de'
+
+alias enchdoomdictlink='ln ~/.config/doom/dict/zpb-enchant-en_US.dic ~/.config/enchant/en_US.dic'
+
+alias gdemacs="sudo rm -r /home/zpb/.config/emacs/eln-cache && emacs"
+alias gdemacsclient="sudo rm -r /home/zpb/.config/emacs/eln-cache && emacsclient --alternate-editor="" --create-frame"
+alias emcli="emacsclient --alternate-editor="" --create-frame"
+alias fixemacs="sudo rm -r /home/zpb/.config/emacs/eln-cache"
+
+alias pbcopy='xclip -selection clipboard'
+alias pbpaste='xclip -selection clipboard -o'
+
+alias stspull='cp -r ~/syncthing/misc/StS-Saves/synced/{preferences,runs,saves} ~/.local/share/Steam/steamapps/common/SlayTheSpire/'
+alias stspush='cp -r ~/.local/share/Steam/steamapps/common/SlayTheSpire/{preferences,runs,saves} ~/syncthing/misc/StS-Saves/synced/'
+
+set --export NNN_FCOLORS 96d1b49600b06c00b0d3d3
+#red d3
+#orange d1
+#yellow b4
+#green 96
+#aqua 6c
+#blue 6d
+#purple b0
+
+# NNN cd on quit
+function n --wraps nnn --description 'support nnn quit and change directory'
+    # Block nesting of nnn in subshells
+    if test -n "$NNNLVL" -a "$NNNLVL" -ge 1
+        echo "nnn is already running"
+        return
+    end
+
+    # The behaviour is set to cd on quit (nnn checks if NNN_TMPFILE is set)
+    # If NNN_TMPFILE is set to a custom path, it must be exported for nnn to
+    # see. To cd on quit only on ^G, remove the "-x" from both lines below,
+    # without changing the paths.
+    if test -n "$XDG_CONFIG_HOME"
+        set -x NNN_TMPFILE "$XDG_CONFIG_HOME/nnn/.lastd"
+    else
+        set -x NNN_TMPFILE "$HOME/.config/nnn/.lastd"
+    end
+
+    # Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn
+    # stty start undef
+    # stty stop undef
+    # stty lwrap undef
+    # stty lnext undef
+
+    # The command function allows one to alias this function to `nnn` without
+    # making an infinitely recursive alias
+    command nnn $argv
+
+    if test -e $NNN_TMPFILE
+        source $NNN_TMPFILE
+        rm $NNN_TMPFILE
+    end
+end
+
+zoxide init fish | source
diff --git a/fish/.config/fish/config_LOCAL_467.fish b/fish/.config/fish/config_LOCAL_467.fish
new file mode 100644
index 0000000..06ed772
--- /dev/null
+++ b/fish/.config/fish/config_LOCAL_467.fish
@@ -0,0 +1,65 @@
+alias ls='eza --icons'
+alias l='eza -l --icons'
+alias la='eza -a --icons'
+alias lla='eza -la --icons'
+alias lt='eza --tree --icons'
+
+alias ls='n -de'
+
+alias enchdoomdictlink='ln -s ~/.config/doom/dict/zpb-enchant-en_US.dic ~/.config/enchant/en_US.dic'
+
+alias gdemacs="sudo rm -r /home/zpb/.config/emacs/eln-cache && emacs"
+alias gdemacsclient="sudo rm -r /home/zpb/.config/emacs/eln-cache && emacsclient --alternate-editor="" --create-frame"
+alias emcli="emacsclient --alternate-editor="" --create-frame"
+alias fixemacs="sudo rm -r /home/zpb/.config/emacs/eln-cache"
+
+alias pbcopy='xclip -selection clipboard'
+alias pbpaste='xclip -selection clipboard -o'
+
+alias stspull='cp -r ~/syncthing/misc/StS-Saves/synced/{preferences,runs,saves} ~/.local/share/Steam/steamapps/common/SlayTheSpire/'
+alias stspush='cp -r ~/.local/share/Steam/steamapps/common/SlayTheSpire/{preferences,runs,saves} ~/syncthing/misc/StS-Saves/synced/'
+
+set --export NNN_FCOLORS 96d1b49600b06c00b0d3d3
+#red d3
+#orange d1
+#yellow b4
+#green 96
+#aqua 6c
+#blue 6d
+#purple b0
+
+# NNN cd on quit
+function n --wraps nnn --description 'support nnn quit and change directory'
+    # Block nesting of nnn in subshells
+    if test -n "$NNNLVL" -a "$NNNLVL" -ge 1
+        echo "nnn is already running"
+        return
+    end
+
+    # The behaviour is set to cd on quit (nnn checks if NNN_TMPFILE is set)
+    # If NNN_TMPFILE is set to a custom path, it must be exported for nnn to
+    # see. To cd on quit only on ^G, remove the "-x" from both lines below,
+    # without changing the paths.
+    if test -n "$XDG_CONFIG_HOME"
+        set -x NNN_TMPFILE "$XDG_CONFIG_HOME/nnn/.lastd"
+    else
+        set -x NNN_TMPFILE "$HOME/.config/nnn/.lastd"
+    end
+
+    # Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn
+    # stty start undef
+    # stty stop undef
+    # stty lwrap undef
+    # stty lnext undef
+
+    # The command function allows one to alias this function to `nnn` without
+    # making an infinitely recursive alias
+    command nnn $argv
+
+    if test -e $NNN_TMPFILE
+        source $NNN_TMPFILE
+        rm $NNN_TMPFILE
+    end
+end
+
+zoxide init fish | source
diff --git a/fish/.config/fish/config_REMOTE_467.fish b/fish/.config/fish/config_REMOTE_467.fish
new file mode 100644
index 0000000..f25fc10
--- /dev/null
+++ b/fish/.config/fish/config_REMOTE_467.fish
@@ -0,0 +1,66 @@
+alias ls='eza --icons'
+alias l='eza -l --icons'
+alias la='eza -a --icons'
+alias lla='eza -la --icons'
+alias lt='eza --tree --icons'
+
+alias ls='n -de'
+
+alias enchdoomdictlink='ln -s ~/.config/doom/dict/zpb-enchant-en_US.dic ~/.config/enchant/en_US.dic'
+alias enchdoomdictmerge='sort ~/.config/doom/dict/zpb-enchant-en_US.dic ~/.config/enchant/en_US.dic | uniq > ~/.config/doom/dict/zpb-enchant-en_US.dic'
+
+alias gdemacs="sudo rm -r /home/zpb/.config/emacs/eln-cache && emacs"
+alias gdemacsclient="sudo rm -r /home/zpb/.config/emacs/eln-cache && emacsclient --alternate-editor="" --create-frame"
+alias emcli="emacsclient --alternate-editor="" --create-frame"
+alias fixemacs="sudo rm -r /home/zpb/.config/emacs/eln-cache"
+
+alias pbcopy='xclip -selection clipboard'
+alias pbpaste='xclip -selection clipboard -o'
+
+alias stspull='cp -r ~/syncthing/misc/StS-Saves/synced/{preferences,runs,saves} ~/.local/share/Steam/steamapps/common/SlayTheSpire/'
+alias stspush='cp -r ~/.local/share/Steam/steamapps/common/SlayTheSpire/{preferences,runs,saves} ~/syncthing/misc/StS-Saves/synced/'
+
+set --export NNN_FCOLORS 96d1b49600b06c00b0d3d3
+#red d3
+#orange d1
+#yellow b4
+#green 96
+#aqua 6c
+#blue 6d
+#purple b0
+
+# NNN cd on quit
+function n --wraps nnn --description 'support nnn quit and change directory'
+    # Block nesting of nnn in subshells
+    if test -n "$NNNLVL" -a "$NNNLVL" -ge 1
+        echo "nnn is already running"
+        return
+    end
+
+    # The behaviour is set to cd on quit (nnn checks if NNN_TMPFILE is set)
+    # If NNN_TMPFILE is set to a custom path, it must be exported for nnn to
+    # see. To cd on quit only on ^G, remove the "-x" from both lines below,
+    # without changing the paths.
+    if test -n "$XDG_CONFIG_HOME"
+        set -x NNN_TMPFILE "$XDG_CONFIG_HOME/nnn/.lastd"
+    else
+        set -x NNN_TMPFILE "$HOME/.config/nnn/.lastd"
+    end
+
+    # Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn
+    # stty start undef
+    # stty stop undef
+    # stty lwrap undef
+    # stty lnext undef
+
+    # The command function allows one to alias this function to `nnn` without
+    # making an infinitely recursive alias
+    command nnn $argv
+
+    if test -e $NNN_TMPFILE
+        source $NNN_TMPFILE
+        rm $NNN_TMPFILE
+    end
+end
+
+zoxide init fish | source