diff --git a/X11/xinitrc b/X11/xinitrc
index a545b22..6406bc1 100644
--- a/X11/xinitrc
+++ b/X11/xinitrc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $ printf '#!/bin/sh\n\n[ -f ~/.config/X11/xinitrc ] && . ~/.config/X11/xinitrc || . /etc/X11/Xsession\n' | sudo tee /etc/X11/xinit/xinitrc
 
 userresources=$XDG_CONFIG_HOME/X11/Xresources
 ERRFILE=$XDG_CACHE_HOME/X11/xsession-errors
diff --git a/shell/bashrc b/shell/bashrc
index 85c0762..14c50cb 100644
--- a/shell/bashrc
+++ b/shell/bashrc
@@ -1,10 +1,30 @@
 #!/bin/bash
+# $ printf '[ -f ~/.config/shell/bashrc ] && . ~/.config/shell/bashrc' | sudo tee -a /etc/bash.bashrc
 
 case $- in
     *i*) ;;
       *) return;;
 esac
 
+if ! shopt -oq posix; then
+    [ -f /usr/share/bash-completion/bash_completion ] &&
+        . /usr/share/bash-completion/bash_completion
+    [ -f /etc/bash_completion ] &&
+        . /etc/bash_completion
+fi
+
+[ -f ~/.bash_aliases ] && . ~/.bash_aliases
+
+HISTCONTROL=ignoreboth
+HISTSIZE=
+HISTFILESIZE=
+bind "set completion-ignore-case on"
+shopt -s checkwinsize
+shopt -s histappend
+shopt -s cdspell
+shopt -s autocd
+set -o vi
+
 PATH="$HOME/.config/scripts/status${PATH:+:${PATH}}"
 PATH="$HOME/.config/scripts/menu${PATH:+:${PATH}}"
 PATH="$HOME/.config/scripts/menu/xclipmenu${PATH:+:${PATH}}"
@@ -15,21 +35,6 @@ PATH="$HOME/.config/scripts${PATH:+:${PATH}}"
 PATH="$HOME/.local/bin${PATH:+:${PATH}}"
 #PATH="/usr/local/plan9/bin${PATH:+:${PATH}}"
 
-if ! shopt -oq posix; then
-    if [ -f /usr/share/bash-completion/bash_completion ]; then
-        . /usr/share/bash-completion/bash_completion
-    elif [ -f /etc/bash_completion ]; then
-        . /etc/bash_completion
-    fi
-fi
-
-bind "set completion-ignore-case on"
-shopt -s checkwinsize
-shopt -s histappend
-shopt -s cdspell
-shopt -s autocd
-set -o vi
-
 git_branch() {
     GIT_BRANCH="$(git branch 2>/dev/null | sed '/\*/!d;s/^\*\s*//g;s/\s*$//g')"
     [ -n "$GIT_BRANCH" ] && printf "%s " "$GIT_BRANCH"
@@ -37,6 +42,7 @@ git_branch() {
 
 [ -e "/data/data/com.termux" ]                && HOSTNAME=""
 [ "${HOSTNAME:=$(hostname -s)}" = "laptop"  ] && HOSTNAME="󰌢"
+[ "${HOSTNAME:=$(hostname -s)}" = "home" ]    && HOSTNAME="󰇅"
 [ "${HOSTNAME:=$(hostname -s)}" = "desktop" ] && HOSTNAME="󰇅"
 
 PS1='
@@ -46,17 +52,18 @@ PS1='
 \[\e[38;5;240m\] \@ \[\e[1;38;5;5m\]$(git_branch)\[\e[48;0m\]
 \[\e[38;5;240m\] ╰─\$\[\e[0m\] '
 
-alias \
-    wget="wget --hsts-file=$XDG_DATA_HOME/wget/wget-hsts"
+alias wget="wget --hsts-file=$XDG_DATA_HOME/wget/wget-hsts"
 
-! command -v sudo >/dev/null 2>&1 && alias sudo="doas"
+! command -v sudo >/dev/null 2>&1 &&
+    alias sudo="doas" &&
+    complete -cf doas
 
 alias \
     src="cd $HOME/.local/src/ && ls" \
     cfg="cd $HOME/.config/ && ls" \
     tmp="cd $HOME/Desktop/temp/ && ls" \
     dsk="cd $HOME/Desktop/ && ls" \
-    prj="cd $HOME/Desktop/projects/ && ls" \
+    prj="cd $HOME/Projects/ && ls" \
     doc="cd $HOME/Documents/ && ls" \
     dow="cd $HOME/Downloads/ && ls" \
     mus="cd $HOME/Music/ && ls" \
@@ -65,9 +72,15 @@ alias \
     img="cd $HOME/Pictures/ && ls" \
     vid="cd $HOME/Videos/ && ls" \
 
-command -v exa >/dev/null 2>&1 && alias ls="exa -al --icons --group-directories-first --no-permissions --no-user --time-style=iso --git" \
-command -v eza >/dev/null 2>&1 && alias ls="eza -al --icons --group-directories-first --no-permissions --no-user --time-style=iso --git" \
-command -v trash >/dev/null 2>&1 && alias rm="trash" \
+command -v exa >/dev/null 2>&1 &&
+    alias ls="exa --group-directories-first --icons -a1" &&
+    alias ll="exa --group-directories-first --icons -al --time-style=iso --git"
+
+command -v eza >/dev/null 2>&1 &&
+    alias ls="eza --group-directories-first --icons -a1" &&
+    alias ll="eza --group-directories-first --icons -al --time-style=iso --git"
+
+command -v trash >/dev/null 2>&1 && alias rm="trash"
 
 alias \
     fzf="fzf --cycle --reverse" \
@@ -77,14 +90,11 @@ alias \
     cp="cp -iv" \
     mv="mv -iv" \
     vim="nvim" \
-    mgr-all="mgr pacman_upgrade apt_upgrade flatpak_update distrobox_update pip_update configs passmgr" \
     df-short="df -h | grep -v '\s/dev.*$\|\s/run.*$\|\s/boot.*$'" \
     qr-png="qrencode -s 16 -o qr.png" \
     qr="qrencode -t ansiutf8" \
     clip="xsel -ib" \
 
-complete -cf doas
-
 [ -f ~/.config/shell/env ] && . ~/.config/shell/env
 [ -f ~/.config/shell/kit ] && . ~/.config/shell/kit
 
diff --git a/shell/env b/shell/env
index 6e90f45..abf4ee7 100644
--- a/shell/env
+++ b/shell/env
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $ printf '[ -f ~/.config/shell/env ] && . ~/.config/shell/env' | sudo tee -a /etc/profile
 
 export \
     BASH_ENV="$XDG_CONFIG_HOME/shell/bashrc" \
@@ -15,7 +16,7 @@ export \
     XSERVERRC="$XDG_CONFIG_HOME/X11/xserverrc" \
     MBSYNCRC="$XDG_CONFIG_HOME/isync/mbsyncrc" \
     XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" \
-    HISTFILE="$XDG_STATE_HOME/shell_history" \
+    HISTFILE="$XDG_STATE_HOME/bash/history" \
     XINITRC="$XDG_CONFIG_HOME/X11/xinitrc" \
     LESSHISTFILE="$XDG_DATA_HOME/lesshst" \
     ELECTRUMDIR="$XDG_DATA_HOME/electrum" \
diff --git a/shell/mkshrc b/shell/mkshrc
index 5346af3..f666f7e 100644
--- a/shell/mkshrc
+++ b/shell/mkshrc
@@ -85,7 +85,7 @@ alias \
     cfg="cd $HOME/.config/ && ls" \
     tmp="cd $HOME/Desktop/temp/ && ls" \
     dsk="cd $HOME/Desktop/ && ls" \
-    prj="cd $HOME/Desktop/projects/ && ls" \
+    prj="cd $HOME/Projects/ && ls" \
     doc="cd $HOME/Documents/ && ls" \
     dow="cd $HOME/Downloads/ && ls" \
     mus="cd $HOME/Music/ && ls" \