diff --git a/dots/common/.config/fish/config.fish b/.config/fish/config.fish
similarity index 84%
rename from dots/common/.config/fish/config.fish
rename to .config/fish/config.fish
index 763f5348..abaa53e2 100644
--- a/dots/common/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -7,6 +7,9 @@ export VISUAL="nvim"
 export EDITOR="nvim"
 export BROWSER="firefox"
 
+export XDG_CURRENT_DESKTOP="KDE"
+export QT_FONT_DPI="192"
+
 # Use rg instead of ag / ack / grep for fzf (much faster)
 export FZF_DEFAULT_COMMAND='rg --files --no-ignore --hidden --follow --glob "!.git/*"'
 export FZF_DEFAULT_OPTS='--height 40% --reverse --border --color=16'
@@ -34,6 +37,7 @@ if not set -q set_abbr
     abbr gd     "git diff"                  # Show all file changes not staged yet
     abbr gds    "git diff --staged"         # Show changes staged but not committed
     abbr gg     "git grep"
+    abbr gi     "git init"
     abbr gl     "git log --oneline --decorate --all --graph -n 10"
     abbr gp     "git push"                  # Push your commits to a remote server
     abbr gs     "git status"
@@ -43,18 +47,25 @@ if not set -q set_abbr
     abbr grh    "git reset HEAD"
     abbr grr    "git reset --hard HEAD~"    # Remove the last commit and all changes with it
 
+    abbr t      "task"
+    abbr ta     "task add"
+    abbr te     "task edit"
+    abbr tc     "task completed"
+
     abbr dl     "youtube-dl"
-    abbr back   "feh --no-fehbg --bg-fill"  # Change the background temporarily
-    abbr vol    "amixer set 'Master' "      # Change the volume, e.g. vol 10%+, vol 10%-, vol 100%
-    abbr copy   "xclip -sel clip < "        # Easily copy the contents of any file
+    abbr back   "feh --bg-fill"             # Change the background
+    abbr vol    "amixer set 'Master'"       # Change the volume, e.g. vol 10%+, vol 10%-, vol 100%
+    abbr copy   "xclip -sel clip <"         # Easily copy the contents of any file
     abbr dog    "pygmentize -g"             # "dog" is a colorful version of cat
+    abbr cf     "tput reset"                # Clear the terminal completely
 
     abbr c      "clear"                     # Because 5 letters is too much
+    abbr e      "exit"
     abbr l      "ls -l"
-    abbr t      "tree"
     abbr f      "launch feh --auto-zoom"    # Easy image viewing with f
     abbr z      "launch zathura"            # Easy document browsing with z
     abbr m      "launch mpv"                # Easy media playing with m
+    abbr T      "tree"
 
     abbr lium   "launch chromium"           # Launch chromium separate from the terminal
     abbr lfox   "launch firefox"            # Launch firefox separate from the terminal
diff --git a/dots/common/.config/fish/functions/fish_prompt.fish b/.config/fish/functions/fish_prompt.fish
similarity index 72%
rename from dots/common/.config/fish/functions/fish_prompt.fish
rename to .config/fish/functions/fish_prompt.fish
index 0c562c6f..7e1fd448 100644
--- a/dots/common/.config/fish/functions/fish_prompt.fish
+++ b/.config/fish/functions/fish_prompt.fish
@@ -9,10 +9,10 @@ function fish_prompt
         set pwd "~"
     end
 
-    set_color yellow;   echo -n "$USER@$hostname"
-    set_color normal;   echo -n " "
-    set_color magenta;  echo -n "($pwd)"
-    #set_color magenta;  echo -n "$pwd"
+    #set_color yellow;   echo -n "$USER@$hostname"
+    #set_color normal;   echo -n " "
+    #set_color magenta;  echo -n "($pwd)"
+    set_color magenta;  echo -n "$pwd"
     set_color normal;   echo -n " "
     set_color red;      echo -n "➤"
     set_color green;    echo -n "➤"
diff --git a/dots/common/.config/fish/functions/gh.fish b/.config/fish/functions/gh.fish
similarity index 100%
rename from dots/common/.config/fish/functions/gh.fish
rename to .config/fish/functions/gh.fish
diff --git a/dots/common/.config/fish/functions/hub.fish b/.config/fish/functions/hub.fish
similarity index 100%
rename from dots/common/.config/fish/functions/hub.fish
rename to .config/fish/functions/hub.fish
diff --git a/dots/common/.config/fish/functions/lab.fish b/.config/fish/functions/lab.fish
similarity index 100%
rename from dots/common/.config/fish/functions/lab.fish
rename to .config/fish/functions/lab.fish
diff --git a/.config/fish/functions/neofetch.fish b/.config/fish/functions/neofetch.fish
new file mode 100644
index 00000000..c754e010
--- /dev/null
+++ b/.config/fish/functions/neofetch.fish
@@ -0,0 +1,22 @@
+function neofetch
+    echo -ne '\n'
+    /usr/bin/neofetch \
+        --disable cpu model gpu kernel \
+        --shell_version off \
+        --os_arch off \
+        --gtk_shorthand on \
+        --gtk2 off \
+        --gtk3 off \
+        --package_managers off \
+        --uptime_shorthand tiny \
+        --block_range 1 7 \
+        --bar_char '~' '-' \
+        --bar_border off \
+        --bar_colors 6 7 \
+        --bar_length 11 \
+        --memory_display bar \
+        --loop \
+        --size 48% \
+        --w3m \
+        $argv
+end
diff --git a/dots/bspwm/.config/fish/functions/1080p.fish b/dots/bspwm/.config/fish/functions/1080p.fish
deleted file mode 100644
index 5b55bf1d..00000000
--- a/dots/bspwm/.config/fish/functions/1080p.fish
+++ /dev/null
@@ -1,7 +0,0 @@
-# Easily change the resolution to 1080p
-# Note: Also changes DPI, but not for the programs you already have open.
-function 1080p
-    xrandr --output VGA-1 --mode "1920x1080"        # Change the resolution
-    sed -i '/Xft.dpi/c\Xft.dpi: 96' ~/.Xresources   # Change the dpi line to 96
-    xrdb ~/.Xresources                              # Reload .Xresources
-end
diff --git a/dots/bspwm/.config/fish/functions/4k.fish b/dots/bspwm/.config/fish/functions/4k.fish
deleted file mode 100644
index bfcb1800..00000000
--- a/dots/bspwm/.config/fish/functions/4k.fish
+++ /dev/null
@@ -1,24 +0,0 @@
-# Easily change the resolution to 4k
-# Note: Also changes DPI, but not for the programs you already have open.
-# TODO: Change this script to support fish
-function 4k
-    # Get the display type (VGA-1, etc.)
-    local display=$(xrandr | grep -Eo ".{0,20} connected" | awk '{print $1}')
-
-    # Get the default mode name for 4k
-    local mode=$(cvt 3840 2160 | grep "Modeline" | awk '{print $2}')
-
-    # If the 4k mode hasn't been added yet
-    if not (xrandr | grep -q 3840x2160)
-
-        # Create the new mode with cvt settings
-        xrandr --newmode $(cvt 3840 2160 | grep -o '"3840x2160.*')
-
-        # Add the new mode to the display with xrandr
-        xrandr --addmode ${display} ${mode}
-    end
-
-    xrandr --output ${display} --mode ${mode}       # Change the resolution to 4k
-    sed -i '/Xft.dpi/c\Xft.dpi: 180' ~/.Xresources  # Change the dpi line to 180
-    xrdb ~/.Xresources                              # Reload .Xresources
-end
diff --git a/dots/common/.config/fish/functions/neofetch.fish b/dots/common/.config/fish/functions/neofetch.fish
deleted file mode 100644
index 5d39f462..00000000
--- a/dots/common/.config/fish/functions/neofetch.fish
+++ /dev/null
@@ -1,13 +0,0 @@
-function neofetch
-    echo -ne '\n'
-    /usr/bin/neofetch \
-        --disable \
-            model gpu wm_theme theme icons \
-            line_break cols kernel \
-        --ascii_distro linux \
-        --package_managers off \
-        --os_arch off \
-        --speed_shorthand on \
-        --cpu_brand off \
-        --cpu_cores off
-end