diff --git a/.config/lf/cleaner b/.config/lf/cleaner
new file mode 100755
index 00000000..a184d84b
--- /dev/null
+++ b/.config/lf/cleaner
@@ -0,0 +1,4 @@
+#!/bin/sh
+if [ -n "$FIFO_UEBERZUG" ]; then
+	printf '{"action": "remove", "identifier": "PREVIEW"}\n' > "$FIFO_UEBERZUG"
+fi
diff --git a/.config/lf/preview b/.config/lf/preview
new file mode 100755
index 00000000..4b70b2e8
--- /dev/null
+++ b/.config/lf/preview
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+image() {
+	if [ -n "$DISPLAY" ] && [ -z "$WAYLAND_DISPLAY" ]; then
+		printf '{"action": "add", "identifier": "PREVIEW", "x": "%s", "y": "%s", "width": "%s", "height": "%s", "scaler": "contain", "path": "%s"}\n' "$4" "$5" "$(($2-1))" "$(($3-1))" "$1" > "$FIFO_UEBERZUG"
+		exit 1
+	else
+		chafa "$1" -s "$4x"
+	fi
+}
+
+batorcat() {
+	file="$1"
+	shift
+	if command -v bat > /dev/null 2>&1
+	then
+		bat --color=always --style=plain --pager=never "$file" "$@"
+	else
+		cat "$file"
+	fi
+}
+
+CACHE="$HOME/.cache/lf/thumbnail.$(stat --printf '%n\0%i\0%F\0%s\0%W\0%Y' -- "$(readlink -f "$1")" | sha256sum | awk '{print $1}'))"
+
+case "$(printf "%s\n" "$(readlink -f "$1")" | awk '{print tolower($0)}')" in
+	*.tgz|*.tar.gz) tar tzf "$1" ;;
+	*.tar.bz2|*.tbz2) tar tjf "$1" ;;
+	*.tar.txz|*.txz) xz --list "$1" ;;
+	*.tar) tar tf "$1" ;;
+	*.zip|*.jar|*.war|*.ear|*.oxt) unzip -l "$1" ;;
+	*.rar) unrar l "$1" ;;
+  *.md) glow -s dark "$1" ;;
+	*.7z) 7z l "$1" ;;
+	*.[1-8]) man "$1" | col -b ;;
+	*.o) nm "$1";;
+	*.torrent) transmission-show "$1" ;;
+	*.iso) iso-info --no-header -l "$1" ;;
+	*.odt|*.ods|*.odp|*.sxw) odt2txt "$1" ;;
+	*.doc) catdoc "$1" ;;
+	*.docx) docx2txt "$1" - ;;
+  *.xml|*.html) w3m -dump "$1";;
+	*.xls|*.xlsx)
+		ssconvert --export-type=Gnumeric_stf:stf_csv "$1" "fd://1" | batorcat --language=csv
+		;;
+	*.wav|*.mp3|*.flac|*.m4a|*.wma|*.ape|*.ac3|*.og[agx]|*.spx|*.opus|*.as[fx]|*.mka)
+		exiftool "$1"
+		;;
+	*.pdf)
+		[ ! -f "${CACHE}.jpg" ] && \
+			pdftoppm -jpeg -f 1 -singlefile "$1" "$CACHE"
+		image "${CACHE}.jpg" "$2" "$3" "$4" "$5"
+		;;
+	*.epub)
+		[ ! -f "$CACHE" ] && \
+			epub-thumbnailer "$1" "$CACHE" 1024
+		image "$CACHE" "$2" "$3" "$4" "$5"
+		;;
+	*.cbz|*.cbr|*.cbt)
+		[ ! -f "$CACHE" ] && \
+			comicthumb "$1" "$CACHE" 1024
+		image "$CACHE" "$2" "$3" "$4" "$5"
+		;;
+	*.avi|*.mp4|*.wmv|*.dat|*.3gp|*.ogv|*.mkv|*.mpg|*.mpeg|*.vob|*.fl[icv]|*.m2v|*.mov|*.webm|*.ts|*.mts|*.m4v|*.r[am]|*.qt|*.divx)
+		[ ! -f "${CACHE}.jpg" ] && \
+			ffmpegthumbnailer -i "$1" -o "${CACHE}.jpg" -s 0 -q 5
+		image "${CACHE}.jpg" "$2" "$3" "$4" "$5"
+		;;
+	*.bmp|*.jpg|*.jpeg|*.png|*.xpm|*.webp|*.gif|*.jfif)
+		image "$1" "$2" "$3" "$4" "$5"
+		;;
+  *.svg)
+    [ ! -f "${CACHE}.jpg" ] && \
+      convert "$1" "${CACHE}.jpg"
+    image "${CACHE}.jpg" "$2" "$3" "$4" "$5"
+    ;;
+	*.ino)
+		batorcat --language=cpp "$1"
+		;;
+	*)
+		batorcat "$1"
+		;;
+esac
+exit 0
diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile
index a49b4fa6..7b9b41c1 100644
--- a/.config/zsh/.zprofile
+++ b/.config/zsh/.zprofile
@@ -1,3 +1,6 @@
+#!/bin/zsh
+
 if [[ "$(tty)" = "/dev/tty1"]]; then
 	pgrep awesome || sx
 fi
+
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 2da94e72..f1968dff 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -45,7 +45,7 @@ WORDCHARS=${WORDCHARS//\/[&.;]}								# Don't consider certain part of the word
 source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh 2>/dev/null
 source /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh 2>/dev/null
 zmodload zsh/terminfo
-eval "$(lua ~/.config/zsh/z.lua --init zsh)"
+eval "$(lua ~/.config/zlua/z.lua --init zsh)"
 
 # Keybindings
 bindkey -e
diff --git a/.local/bin/lfrun b/.local/bin/lfrun
new file mode 100755
index 00000000..5bb0ba31
--- /dev/null
+++ b/.local/bin/lfrun
@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e
+
+cleanup() {
+    exec 3>&-
+	rm "$FIFO_UEBERZUG"
+}
+
+if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then
+	lf "$@"
+else
+	[ ! -d "$HOME/.cache/lf" ] && mkdir --parents "$HOME/.cache/lf"
+	export FIFO_UEBERZUG="$HOME/.cache/lf/ueberzug-$$"
+	mkfifo "$FIFO_UEBERZUG"
+	ueberzug layer -s <"$FIFO_UEBERZUG" -p json &
+	exec 3>"$FIFO_UEBERZUG"
+	trap cleanup EXIT
+	lf "$@" 3>&-
+fi
diff --git a/.zshenv b/.zshenv
index 1ef46092..117bd1af 100644
--- a/.zshenv
+++ b/.zshenv
@@ -8,10 +8,6 @@ export XDG_CONFIG_HOME=${XDG_CONFIG_HOME:="$HOME/.config"}
 # Disable files
 export LESSHISTFILE=-
 
-# Fixing paths
-export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc
-export ZDOTDIR=$HOME/.config/zsh
-export HISTFILE="$XDG_DATA_HOME"/zsh/history
 
 # Default Apps
 export EDITOR="nvim"
@@ -22,3 +18,20 @@ export BROWSER="vivaldi"
 export VIDEO="mpv"
 export IMAGE="nsxiv"
 export WM="awesome"
+
+
+# ~/ Clean-up
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XINITRC="${XDG_CONFIG_HOME:-$HOME/.config}/x11/xinitrc"
+export ZDOTDIR="${XDG_CONFIG_HOME:-$HOME/.config}/zsh"
+export HISTFILE="${XDG_CONFIG_HOME:-$HOME/.config}/zsh/history"
+export CARGO_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/cargo"
+
+# Other program settings
+export MOZ_USE_XINPUT2="1"		# Mozilla smooth scrolling/touchpads.
+
+# Adds `~/.local/bin` to $PATH
+# export PATH="$PATH:${$(find ~/.local/bin -type d -printf %p:)%%:}"
+PATH=$PATH:/home/$USER/.local/bin