diff --git a/.gitmodules b/.gitmodules
index 85a0369..f81a3b7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
-[submodule "config/nvim"]
-	path = config/AstroNvim
+[submodule "config/AstroNvim"]
+	path = config/Distro-AstroNvim
 	url = https://github.com/AstroNvim/AstroNvim
 [submodule "config/alacritty/themes/catppuccin"]
 	path = config/alacritty/themes/catppuccin
diff --git a/config/AstroNvim b/config/AstroNvim
deleted file mode 160000
index 5bc711b..0000000
--- a/config/AstroNvim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5bc711b772303fe17a69dce79c4e674a686869f0
diff --git a/config/Distro-AstroNvim b/config/Distro-AstroNvim
new file mode 160000
index 0000000..f10b473
--- /dev/null
+++ b/config/Distro-AstroNvim
@@ -0,0 +1 @@
+Subproject commit f10b4730176b567e15911b3c1a7c5a31c82c8b8e
diff --git a/config/alacritty/alacritty.yml b/config/alacritty/alacritty.yml
index 1c67d33..2ae5c19 100644
--- a/config/alacritty/alacritty.yml
+++ b/config/alacritty/alacritty.yml
@@ -10,7 +10,7 @@
 # to the user's home directory starting with `~/`.
 import:
   #  - /path/to/alacritty.yml
-  - ~/.config/alacritty/themes/rose-pine/dist/rose-pine-moon.yml
+  - ~/.config/alacritty/themes/catppuccin/catppuccin-macchiato.yml
 # Any items in the `env` entry below will be added as
 # environment variables. Some entries may override variables
 # set by alacritty itself.
diff --git a/config/spicetify/Backup/login.spa b/config/spicetify/Backup/login.spa
index 66843e2..3ba1b56 100755
Binary files a/config/spicetify/Backup/login.spa and b/config/spicetify/Backup/login.spa differ
diff --git a/config/spicetify/Backup/xpui.spa b/config/spicetify/Backup/xpui.spa
index f664168..cd182d8 100755
Binary files a/config/spicetify/Backup/xpui.spa and b/config/spicetify/Backup/xpui.spa differ
diff --git a/config/spicetify/config-xpui.ini b/config/spicetify/config-xpui.ini
index b50fd25..820ff92 100644
--- a/config/spicetify/config-xpui.ini
+++ b/config/spicetify/config-xpui.ini
@@ -27,5 +27,5 @@ sidebar_config        = 1
 
 ; DO NOT CHANGE!
 [Backup]
-version = 1.2.8.923.g4f94bf0d
+version = 1.2.9.743.g85d9593d
 with    = 2.16.0
diff --git a/config/starship.toml b/config/starship.toml
new file mode 100644
index 0000000..8b3da4d
--- /dev/null
+++ b/config/starship.toml
@@ -0,0 +1,149 @@
+# Get editor completions based on the config schema
+"$schema" = 'https://starship.rs/config-schema.json'
+
+# Inserts a blank line between shell prompts
+add_newline = true
+
+# Replace the '❯' symbol in the prompt with '➜'
+[character] # The name of the module we are configuring is 'character'
+success_symbol = '[➜](bold green)' # The 'success_symbol' segment is being set to '➜' with the color 'bold green'
+
+[aws]
+symbol = "  "
+
+[buf]
+symbol = " "
+
+[c]
+symbol = " "
+
+[conda]
+symbol = " "
+
+[dart]
+symbol = " "
+
+[directory]
+read_only = " "
+
+[docker_context]
+symbol = " "
+
+[elixir]
+symbol = " "
+
+[elm]
+symbol = " "
+
+[fossil_branch]
+symbol = " "
+
+[git_branch]
+symbol = " "
+
+[golang]
+symbol = " "
+
+[guix_shell]
+symbol = " "
+
+[haskell]
+symbol = " "
+
+[haxe]
+symbol = "⌘ "
+
+[hg_branch]
+symbol = " "
+
+[hostname]
+ssh_symbol = " "
+
+[java]
+symbol = " "
+
+[julia]
+symbol = " "
+
+[lua]
+symbol = " "
+
+[memory_usage]
+symbol = " "
+
+[meson]
+symbol = "喝 "
+
+[nim]
+symbol = " "
+
+[nix_shell]
+symbol = " "
+
+[nodejs]
+symbol = " "
+
+[os.symbols]
+Alpaquita = " "
+Alpine = " "
+Amazon = " "
+Android = " "
+Arch = " "
+Artix = " "
+CentOS = " "
+Debian = " "
+DragonFly = " "
+Emscripten = " "
+EndeavourOS = " "
+Fedora = " "
+FreeBSD = " "
+Garuda = "﯑ "
+Gentoo = " "
+HardenedBSD = "ﲊ "
+Illumos = " "
+Linux = " "
+Mabox = " "
+Macos = " "
+Manjaro = " "
+Mariner = " "
+MidnightBSD = " "
+Mint = " "
+NetBSD = " "
+NixOS = " "
+OpenBSD = " "
+openSUSE = " "
+OracleLinux = " "
+Pop = " "
+Raspbian = " "
+Redhat = " "
+RedHatEnterprise = " "
+Redox = " "
+Solus = "ﴱ "
+SUSE = " "
+Ubuntu = " "
+Unknown = " "
+Windows = " "
+
+[package]
+symbol = " "
+
+[pijul_channel]
+symbol = "🪺 "
+
+[python]
+symbol = " "
+
+[rlang]
+symbol = "ﳒ "
+
+[ruby]
+symbol = " "
+
+[rust]
+symbol = " "
+
+[scala]
+symbol = " "
+
+[spack]
+symbol = "🅢 "
diff --git a/config/zsh/aliases/aliases.zsh b/config/zsh/aliases/aliases.zsh
index 1b2decf..57371cb 100644
--- a/config/zsh/aliases/aliases.zsh
+++ b/config/zsh/aliases/aliases.zsh
@@ -5,25 +5,23 @@
 #fix obvious typo's
 alias pdw="pwd"
 
-#search content with ripgrep
-alias rg="rg --sort path"
-
-# prompt and do verbose
+# File Managment
 alias \
     cp='cp -iv' \
     mv='mv -iv' \
-    rm='rm -iv' \
-    md='mkdir -pv';
-
-# short long and common commands
-alias \
-    mkexec='chmod +x';
-
-# Exa for listing
-alias \
+    cpr='rsync  -za --partial -hh --info=progress2' \
+    mvr='rsync  -za --remove-source-files --partial -hh --info=progress2' \
+    sync='rsync -zau --delete --partial -hh --info=progress2' \
+    rm='trash -i' \
+    rmf='rm -rfI' \
+    md='mkdir -pv' \
     ls='exa -lh --color=always --icons --git ' \
     la='exa -alh --color=always --icons --git ' \
-    ld='exa -la --no-permissions --no-filesize --no-time --no-time --no-user'
+    ld='exa -la --no-permissions --no-filesize --no-time --no-time --no-user' \
+    mkexec='chmod +x';
+
+# Search and Query Files
+alias grep="rg --sort path --context 3";
 
 # Pacman
 alias \
@@ -34,13 +32,15 @@ alias \
     pkglast="expac --timefmt='%Y-%m-%d %T' '%l\t%n %v' | sort | tail -25 | nl"
 
 
-alias \
-    reload='exec $SHELL -l' \
-
-    # Query Stuff
+# Query Stuff
 alias \
     ip='ip -human -color -brief addr' \
-    df='df -h'
+    df="duf --hide special --hide-mp '/boot,/boot/*'" \
+    du='dust --reverse' \
+    du1='dust --reverse --min-size 1M --depth 1' \
+    du2='dust --reverse --min-size 1M --depth 2' \
+    du3='dust --reverse --min-size 1M --depth 3' \
+    cat='bat';
 
 ## Music Streams
 lofi_url="https://youtu.be/jfKfPfyJRdk"
@@ -51,6 +51,10 @@ alias \
     music-ninten='mpv "$nintendo_url" &>/dev/null &!' \
     music-ninten-bg='ts lofi -d "mpv --no-video $nintendo_url"'
 
+# Misc
+alias \
+    reload='exec $SHELL -l' \
+
 #--------------------------------------------------------------------#
 #                               Global                               #
 #--------------------------------------------------------------------#
diff --git a/config/zsh/aliases/nvim.zsh b/config/zsh/aliases/nvim.zsh
index b2ff3c2..6ef0800 100644
--- a/config/zsh/aliases/nvim.zsh
+++ b/config/zsh/aliases/nvim.zsh
@@ -1,6 +1,6 @@
 alias \
-    vi='nvim' \
-    vi-astro='NVIM_APPNAME=AstroNvim nvim' \
+    vi='NVIM_APPNAME=Distro-AstroNvim nvim' \
+    vi-def='NVIM_APPNAME=AstroNvim nvim' \
     vi-lazy='NVIM_APPNAME=LazyVim nvim'
 
 vis() {
diff --git a/config/zsh/functions/functions.zsh b/config/zsh/functions/functions.zsh
index 4ed8e46..901861c 100644
--- a/config/zsh/functions/functions.zsh
+++ b/config/zsh/functions/functions.zsh
@@ -41,3 +41,10 @@ profzsh() {
     shell=${1-$SHELL}
     ZPROF=true $shell -i -c exit
 }
+
+# Pretty Help
+alias bathelp='bat --plain --language=help'
+help() {
+    "$@" --help 2>&1 | bathelp
+}
+
diff --git a/config/zsh/zshrc b/config/zsh/zshrc
index 26de82e..88f42ac 100755
--- a/config/zsh/zshrc
+++ b/config/zsh/zshrc
@@ -58,20 +58,13 @@ plugins=(
     # archlinux
     bgnotify
     colored-man-pages
-    cp # alias to use rsync to copy files
     docker
     docker-compose
     fd
     fzf
     git
-    git-prompt
-    ripgrep
-    rsync
     safe-paste # don't run code when pasting
     systemd
-    # tmux
-    # vi-mode
-    yarn
     z
     zsh-autocomplete
     zsh-autopair
@@ -121,3 +114,5 @@ fi
 
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+
+eval "$(starship init zsh)"
diff --git a/exports/copr.txt b/exports/copr.txt
index bcb2188..649b0f8 100644
--- a/exports/copr.txt
+++ b/exports/copr.txt
@@ -1 +1,2 @@
 atim/lazygit
+atim/starship
diff --git a/exports/dnf.txt b/exports/dnf.txt
index 03ba237..99b9174 100644
--- a/exports/dnf.txt
+++ b/exports/dnf.txt
@@ -1,4 +1,5 @@
 dnf-plugin-system-upgrade
+duf
 exa
 fd-find
 flatpak
@@ -11,6 +12,8 @@ neovim
 nodejs
 remove-retired-packages
 ripgrep
+sd
+starship
 tealdeer
 tmux
 tree-sitter-cli
diff --git a/scripts/backup b/scripts/backup
index 8490d1c..24290d7 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -144,6 +144,7 @@ for path in "${SOURCES[@]}"; do
 	delete_old "$path"
 done
 
-sync
+# Sync to MEGA
+# sync
 
 echo -e "${GRN}Backups done!${RST}"
diff --git a/scripts/sort-wallpapers b/scripts/sort-wallpapers
index ada6ea2..62d5763 100755
--- a/scripts/sort-wallpapers
+++ b/scripts/sort-wallpapers
@@ -1,28 +1,62 @@
 #!/usr/bin/env bash
 
-path="$1"
-imgs=($PWD/$path/*)
+set -euo pipefail
 
-imv "${imgs[@]}" &
-imv_pid=$!
+SCAN_DIR=${HOME}/Drives/Stuff/Pictures/Waifus
+OUPUT_DIR=${HOME}/Drives/Stuff/Pictures/Wallpapers
+# SCAN_DIR=${HOME}/Pictures/Screenshots
 
-echo $imv_pid
-imv-msg $imv_pid close all
+franchises=(
+    Mario
+    Zelda
+    Persona
+)
 
-for file in "${imgs[@]}"; do
-    echo $file
-    imv-msg $imv_pid open "$file"
-    read "test"
+orientations=(
+    Portrait
+    Landscape
+)
+
+# TODO: give option to exit script while inside fzf
+get_fzf() {
+    # run inside subshell because fzf exit with 1 when no mach has been selected
+    output="$(
+        printf "%s\n" "$@" | fzf \
+            --reverse \
+            --height '10' \
+            --print-query \
+            --cycle \
+            --bind \
+            "alt-1:pos(1)+accept,alt-2:pos(2)+accept,alt-3:pos(3)+accept,alt-4:pos(4)+accept,alt-5:pos(5)+accept,alt-6:pos(6)+accept,alt-7:pos(7)+accept,alt-8:pos(8)+accept,alt-9:pos(9)+accept,alt-0:pos(10)+accept"
+    )"
+    echo "$output"
+}
+
+readarray -td '' wallpapers < <(
+    fd -ap -e jpg -e jpeg -e png -e webp \
+        --max-depth 2 \
+        --print0 \
+        --base-directory "$SCAN_DIR"
+)
+
+# open all images in imv
+imv "${wallpapers[@]}" &
+pid=$!
+
+sleep 1
+
+for dir in "${orientations[@]}"; do
+    mkdir -p "$OUPUT_DIR/$dir"
 done
 
-imv-msg $imv_pid close all
+for img in "${wallpapers[@]}"; do
+    orientation=$(get_fzf "${orientations[@]}")
+    franchise=$(get_fzf "${franchises[@]}")
 
-# while true; do
-# 	# Some custom logic
-# 	# ...
-#
-# 	# Close all open files
-# 	imv-msg $imv_pid close all
-# 	# Open some new files
-# 	imv-msg $imv_pid open ~/new_path
-# done
+    cp "$img" "$OUPUT_DIR/$orientation"
+
+    echo "$img $orientation $franchise"
+    imv-msg "$pid" next
+done
+
+imv-msg "$pid" close all
diff --git a/setup.sh b/setup.sh
index c2e5fe7..5dc3a0d 100755
--- a/setup.sh
+++ b/setup.sh
@@ -5,7 +5,7 @@
 
 set -e
 
-REPO="https://git.panconpalta.win/aleidk/dots"
+REPO="git@codeberg.org:aleidk/dots.git"
 DOTS="$HOME/Repos/Private/dots"
 CONFIG="$HOME/.config"
 BINS="$HOME/.local/bin"