diff --git a/configs/rc/inputrc b/configs/rc/inputrc
index e69de29..443dea1 100644
--- a/configs/rc/inputrc
+++ b/configs/rc/inputrc
@@ -0,0 +1 @@
+$include ~/.local/share/omakub/defaults/bash/inputrc
diff --git a/defaults/bash/shell b/defaults/bash/shell
index afe1ecf..133c8cf 100644
--- a/defaults/bash/shell
+++ b/defaults/bash/shell
@@ -4,6 +4,10 @@ HISTCONTROL=ignoreboth
 HISTSIZE=32768
 HISTFILESIZE="${HISTSIZE}"
 
+# Editor used by CLI
+export EDITOR="nvim"
+export SUDO_EDITOR="nvim"
+
 export SUNHAT_PATH="/home/$USER/.local/share/sunhat"
 export BUN_INSTALL="$HOME/.bun"
 
diff --git a/install/a-shell.sh b/install/a-shell.sh
index 2821469..dea365a 100644
--- a/install/a-shell.sh
+++ b/install/a-shell.sh
@@ -1,6 +1,10 @@
-[ -f "~/.bashrc" ] && mv ~/.bashrc ~/.bashrc.bak
-cp ~/.local/share/sunhat/configs/rc/bashrc ~/.bashrc
+mkdir ~/Documents/Configs
+
+[ -f "~/.bashrc" ] && rm ~/.bashrc
+cp ~/.local/share/sunhat/configs/rc/bashrc ~/Documents/Configs/bashrc
+ln -s ~/Documents/Configs/bashrc ~/.bashrc
 source ~/.bashrc
 
-[ -f "~/.inputrc" ] && mv ~/.inputrc ~/.inputrc.bak
-cp ~/.local/share/sunhat/configs/rc/inputrc ~/.inputrc
+[ -f "~/.inputrc" ] && rm ~/.inputrc
+cp ~/.local/share/sunhat/configs/rc/inputrc ~/Documents/Configs/inputrc
+ln -s ~/Documents/Configs/inputrc ~/.inputrc
diff --git a/install/app_adw-gtk3-dark.sh b/install/app_adw_gtk3_dark.sh
similarity index 100%
rename from install/app_adw-gtk3-dark.sh
rename to install/app_adw_gtk3_dark.sh
diff --git a/install/app_espanso.sh b/install/app_espanso.sh
index 70c3ea0..82f927d 100644
--- a/install/app_espanso.sh
+++ b/install/app_espanso.sh
@@ -1,7 +1,7 @@
 sudo dnf install -y @development-tools gcc-c++ wl-clipboard \
     libxkbcommon-devel dbus-devel wxGTK-devel.x86_64
-git clone https://github.com/federico-terzi/espanso ../packages/espanso/
-cd ../packages/espanso
+git clone https://github.com/federico-terzi/espanso ~/.local/share/sunhat/packages/espanso/
+cd ~/.local/share/sunhat/packages/espanso
 cargo install --force cargo-make --version 0.34.0
 cargo make --profile release --env NO_X11=true build-binary
 sudo mv target/release/espanso /usr/local/bin/espanso
diff --git a/install/app_grub_btrfs.sh b/install/app_grub_btrfs.sh
index f122eb3..4ed5756 100644
--- a/install/app_grub_btrfs.sh
+++ b/install/app_grub_btrfs.sh
@@ -1,6 +1,6 @@
-git clone https://github.com/Antynea/grub-btrfs ../packages/grub-btrfs/
-mv ../configs/grub-btrfs/config ./grub-btrfs/config
-cd ../packages/grub-btrfs
+git clone https://github.com/Antynea/grub-btrfs ~/.local/share/sunhat/packages/grub-btrfs/
+mv ~/.local/share/sunhat/configs/grub-btrfs/config ~/.local/share/sunhat/grub-btrfs/config
+cd ~/.local/share/sunhat/packages/grub-btrfs
 sudo make install
 sudo grub2-mkconfig -o /etc/grub2-efi.cfg
 sudo systemctl enable --now grub-btrfsd
diff --git a/install/app_sunshine.sh b/install/app_sunshine.sh
new file mode 100644
index 0000000..c8f9391
--- /dev/null
+++ b/install/app_sunshine.sh
@@ -0,0 +1,11 @@
+sudo dnf copr enable matte-schwartz/sunshine
+sudo dnf update -y --refresh
+sudo dnf install -y sunshine
+echo 'KERNEL=="uinput", SUBSYSTEM=="misc", OPTIONS+="static_node=uinput", TAG+="uaccess"' | \
+sudo tee /etc/udev/rules.d/60-sunshine.rules
+sudo udevadm control --reload-rules
+sudo udevadm trigger
+sudo modprobe uinput
+sudo setcap cap_sys_admin+p $(readlink -f $(which sunshine))
+cp ~/.local/share/sunhat/configs/sunshine/sunshine.service ~/.config/systemd/user/sunshine.service
+systemctl --user enable --now sunshine
diff --git a/install/app_turtle.sh b/install/app_turtle.sh
index 7e3f280..e7a3cef 100644
--- a/install/app_turtle.sh
+++ b/install/app_turtle.sh
@@ -1,5 +1,5 @@
-git clone https://gitlab.gnome.org/philippun1/turtle ../packages/turtle/
-cd ../packages/turtle/
+git clone https://gitlab.gnome.org/philippun1/turtle ~/.local/share/sunhat/packages/turtle/
+cd ~/.local/share/sunhat/packages/turtle/
 python install.py install --user
 pip3 install . --user
 nautilus -q nautilus --no-desktop
diff --git a/scripts/rebuild_nvidia_kmod.sh b/scripts/rebuild_nvidia_kmod.sh
index d857c5e..809911b 100644
--- a/scripts/rebuild_nvidia_kmod.sh
+++ b/scripts/rebuild_nvidia_kmod.sh
@@ -1,4 +1,3 @@
-#/bin/bash
 cp $(which akmods) /tmp/akmods
 sed -i 's/dnf -y install/dnf -y reinstall/' /tmp/akmods
 perl -i -pe 'if (/check_kmod_up2date\(\)/) { $_ .= <>; s/\{\n/{ return 1\n/ }' /tmp/akmods
diff --git a/settings/set_gnome_extensions.sh b/settings/set_gnome_extensions.sh
index 93633ac..8b0bfd1 100644
--- a/settings/set_gnome_extensions.sh
+++ b/settings/set_gnome_extensions.sh
@@ -23,8 +23,8 @@ gext install Vitals@CoreCoding.com
 gext install weatheroclock@CleoMenezesJr.github.io
 gext install wifiqrcode@glerro.pm.me
 # Install Hanabi
-git clone https://github.com/jeffshee/gnome-ext-hanabi.git ../packages/hanabi
-cd ../packages/hanabi
+git clone https://github.com/jeffshee/gnome-ext-hanabi.git ~/.local/share/sunhat/packages/hanabi
+cd ~/.local/share/sunhat/packages/hanabi
 ./run.sh install
 
 # Compile gsettings schemas in order to be able to set them
diff --git a/sources/tools.sh b/sources/tools.sh
index 3fd4f94..8000936 100644
--- a/sources/tools.sh
+++ b/sources/tools.sh
@@ -1,2 +1,2 @@
-tools=$(cat ./install/tools | tr "\n" " ")
+tools=$(cat ~/.local/share/sunhat/sources/install/tools | tr "\n" " ")
 sudo dnf install -y $tools