diff --git a/awesome/init.fnl b/awesome/init.fnl
index 4031608..75c8484 100644
--- a/awesome/init.fnl
+++ b/awesome/init.fnl
@@ -140,6 +140,9 @@
    ;; Each screen has its own tag table.
    (awful.tag [ "   " "   " "   " "   " ] s (. awful.layout.layouts 1))
 
+     ;; Make buffers on all sides so that tiled clients aren't pushed to edges
+     (set s.padding (dpi 10))
+
    ;; Create a promptbox for each screen
    (set s.mypromptbox (awful.widget.prompt))
    ;; Create an imagebox widget which will contain an icon indicating which layout we're using.
diff --git a/fish/conf.d/omf.fish b/fish/conf.d/omf.fish
deleted file mode 100644
index 2d7197e..0000000
--- a/fish/conf.d/omf.fish
+++ /dev/null
@@ -1,22 +0,0 @@
-# Path to Oh My Fish install.
-set -q XDG_DATA_HOME
-and set -gx OMF_PATH "$XDG_DATA_HOME/omf"
-or set -gx OMF_PATH "$HOME/.local/share/omf"
-
-# Load Oh My Fish configuration.
-source $OMF_PATH/init.fish
-
-# vi mode - off so that emacs can still be in control without having 2 vi modes
-# fish_vi_key_bindings
-
-# variables
-set -x PATH {/bin,/usr/bin,/home/chris/.dotfiles,/home/chris/.emacs.d/bin,/home/chris/scripts}
-set -x QT_QPA_PLATFORMTHEME "qt5ct"
-set -x QT_AUTO_SCREEN_SCALE_FACTOR 1
-set -x EDITOR "emacsclient -a emacs"
-set -x TERM alacritty
-
-# aliases
-alias ls="lsd -a"
-alias rfi="/home/chris/.dotfiles/rofi/launchers-git/launcher.sh"
-alias scl="pkexec systemctl "
diff --git a/fish/config.fish b/fish/config.fish
new file mode 100644
index 0000000..627fe79
--- /dev/null
+++ b/fish/config.fish
@@ -0,0 +1,196 @@
+#!/usr/bin/env fish
+
+set -U fish_user_paths $fish_user_paths $HOME/.local/bin $HOME/scripts
+set TERM "xterm-256color"
+set EDITOR "emacsclient -t -a"
+set VISUAL "emacsclient -c -a emacs"
+
+### PROMPT ###
+# name: scorphish
+
+# This file is part of theme-scorphish
+
+# Licensed under the MIT license:
+# https://opensource.org/licenses/MIT
+# Copyright (c) 2014, Pablo S. Blum de Aguiar <scorphus@gmail.com>
+
+
+function fish_greeting -d "what's up, fish?"
+    set_color $fish_color_autosuggestion[1]
+    uname -npsr
+    uptime
+    set_color normal
+end
+
+function fish_title
+    if [ "$theme_display_virtualenv" = 'no' -o -z "$VIRTUAL_ENV" ]
+        printf '(%s) %s' $_ (prompt_pwd)
+    else
+        printf '(%s) %s' (basename "$VIRTUAL_ENV") (prompt_pwd)
+    end
+end
+
+function _prompt_whoami -a sep_color -a color -d "Display user@host if on a SSH session"
+    if set -q SSH_TTY
+        echo -n -s $color (whoami)@(hostname) $sep_color '|'
+    end
+end
+
+function _git_branch_name
+    echo (command git symbolic-ref HEAD 2> /dev/null | sed -e 's|^refs/heads/||')
+end
+
+function _is_git_dirty
+    echo (command git status -s --ignore-submodules=dirty 2> /dev/null)
+end
+
+function _git_ahead_count -a remote -a branch_name
+    echo (command git log $remote/$branch_name..HEAD 2> /dev/null | \
+    grep '^commit' | wc -l | tr -d ' ')
+end
+
+function _git_dirty_remotes -a remote_color -a ahead_color
+    set current_branch (command git rev-parse --abbrev-ref HEAD 2> /dev/null)
+    set current_ref (command git rev-parse HEAD 2> /dev/null)
+
+    for remote in (git remote | grep 'origin\|upstream')
+
+        set -l git_ahead_count (_git_ahead_count $remote $current_branch)
+
+        set remote_branch "refs/remotes/$remote/$current_branch"
+        set remote_ref (git for-each-ref --format='%(objectname)' $remote_branch)
+        if test "$remote_ref" != ''
+            if test "$remote_ref" != $current_ref
+                if [ $git_ahead_count != 0 ]
+                    echo -n "$remote_color!"
+                    echo -n "$ahead_color+$git_ahead_count$normal"
+                end
+            end
+        end
+    end
+end
+
+function _prompt_git -a gray normal orange red yellow
+    test "$theme_display_git" = no; and return
+    set -l git_branch (_git_branch_name)
+    test -z $git_branch; and return
+    if test "$theme_display_git_dirty" = no
+        echo -n -s $gray '‹' $yellow $git_branch $gray '› '
+        return
+    end
+    set dirty_remotes (_git_dirty_remotes $red $orange)
+    if [ (_is_git_dirty) ]
+        echo -n -s $gray '‹' $yellow $git_branch $red '*' $dirty_remotes $gray '› '
+    else
+        echo -n -s $gray '‹' $yellow $git_branch $red $dirty_remotes $gray '› '
+    end
+end
+
+function _prompt_pwd
+    set_color -o cyan
+    printf '%s' (prompt_pwd)
+end
+
+function _prompt_status_arrows -a exit_code
+    if test $exit_code -ne 0
+        set arrow_colors 600 900 c00 f00
+    else
+        set arrow_colors 060 090 0c0 0f0
+    end
+
+    for arrow_color in $arrow_colors
+        set_color $arrow_color
+        printf '»'
+    end
+end
+
+function fish_prompt
+    set -l exit_code $status
+
+    set -l gray (set_color 666)
+    set -l blue (set_color blue)
+    set -l red (set_color red)
+    set -l normal (set_color normal)
+    set -l yellow (set_color yellow)
+    set -l orange (set_color ff9900)
+    set -l green (set_color green)
+
+    printf $gray'['
+
+    _prompt_whoami $gray $green
+
+    if test "$theme_display_pwd_on_second_line" != yes
+        _prompt_pwd
+        printf '%s' $gray
+    end
+
+    printf '%s] ⚡️ %0.3fs' $gray (math $CMD_DURATION / 1000)
+
+    if set -q SCORPHISH_GIT_INFO_ON_FIRST_LINE
+        set theme_display_git_on_first_line
+    end
+
+    if set -q theme_display_git_on_first_line
+        _prompt_git $gray $normal $orange $red $yellow
+    end
+
+    if test "$theme_display_pwd_on_second_line" = yes
+        printf $gray'\n‹'
+        _prompt_pwd
+        printf $gray'›'
+    end
+
+    printf '\n'
+    if not set -q theme_display_git_on_first_line
+        _prompt_git $gray $normal $orange $red $yellow
+    end
+    _prompt_status_arrows $exit_code
+    printf ' '
+
+    set_color normal
+end
+
+function fish_right_prompt
+    set -l exit_code $status
+    if test $exit_code -ne 0
+        set_color red
+    else
+        set_color green
+    end
+    printf '%d' $exit_code
+    set_color -o 666
+    echo '|'
+    set_color -o 777
+    printf '%s' (date +%H:%M:%S)
+    set_color normal
+end
+
+### BANG BANG FUNCTIONS
+function __history_previous_command
+    switch (commandline -t)
+        case "!"
+            commandline -t $history[1]
+            commandline -f repaint
+        case "*"
+            commandline -i !
+    end
+end
+
+function __history_previous_command_arguments
+    switch (commandline -t)
+        case "!"
+            commandline -t ""
+            commandline -f history-token-search-backward
+        case "*"
+            commandline -i '$'
+    end
+end
+
+### bindings
+function fish_user_key_bindings
+    fish_vi_key_bindings
+    bind -M insert ! __history_previous_command
+    bind -M insert '$' __history_previous_command_arguments
+end
+
+
diff --git a/fish/fish_variables b/fish/fish_variables
index 490cded..c01f9d6 100644
--- a/fish/fish_variables
+++ b/fish/fish_variables
@@ -1,6 +1,5 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
-SETUVAR THEME_EDEN_PROMPT_CHAR:\u00bb
 SETUVAR __fish_initialized:3100
 SETUVAR fish_color_autosuggestion:555\x1ebrblack
 SETUVAR fish_color_cancel:\x2dr
@@ -25,9 +24,10 @@ SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrbl
 SETUVAR fish_color_status:red
 SETUVAR fish_color_user:brgreen
 SETUVAR fish_color_valid_path:\x2d\x2dunderline
-SETUVAR fish_greeting:\x1d
-SETUVAR fish_key_bindings:fish_default_key_bindings
+SETUVAR fish_greeting:Welcome\x20to\x20fish\x2c\x20the\x20friendly\x20interactive\x20shell\x0aType\x20\x60help\x60\x20for\x20instructions\x20on\x20how\x20to\x20use\x20fish
+SETUVAR fish_key_bindings:fish_vi_key_bindings
 SETUVAR fish_pager_color_completion:\x1d
 SETUVAR fish_pager_color_description:B3A06D\x1eyellow
 SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
 SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
+SETUVAR fish_user_paths:/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2elocal/bin\x1e/home/chris/scripts
diff --git a/fish/functions/fish_prompt.fish b/fish/functions/fish_prompt.fish
deleted file mode 120000
index 31f92c9..0000000
--- a/fish/functions/fish_prompt.fish
+++ /dev/null
@@ -1 +0,0 @@
-/home/chris/.local/share/omf/themes/scorphish/fish_prompt.fish
\ No newline at end of file
diff --git a/picom.conf b/picom.conf
index d6eb046..8e38c35 100644
--- a/picom.conf
+++ b/picom.conf
@@ -89,7 +89,7 @@ shadow-exclude = [
   "name = 'Notification'",
   "class_g = 'Conky'",
   "class_g = 'firefox'",
-  "class_g = 'Alacritty'",
+  # "class_g = 'Alacritty'",
   "class_g ?= 'Notify-osd'",
   "class_g = 'Cairo-clock'",
   "class_g = 'slop'",
diff --git a/qutebrowser/quickmarks b/qutebrowser/quickmarks
index ee1f5f3..26bdaf7 100644
--- a/qutebrowser/quickmarks
+++ b/qutebrowser/quickmarks
@@ -3,7 +3,8 @@ sp https://tfcconnection.sharepoint.com/sites/TeensForChrist/Shared%20Documents/
 ama https://smile.amazon.com/
 azu https://portal.azure.com/#@tfcconnection.org/dashboard/private/e5f3455d-3737-47d8-852b-1847a3b4801b
 ac https://azure-costs.com/app/teams/personal/dashboards?active=e47b9bb7-1701-400e-9cbd-195c9cfda2c2&cycle=monthly
-remind https://www.remind.com/classes/4223h9/messages/stream/d7938995-96c4-495d-95f5-97cdaf48e15a
 awe https://awesomewm.org/apidoc/index.html
 y https://www.youtube.com/
 nf https://www.nerdfonts.com/cheat-sheet
+plex https://app.plex.tv/desktop#
+od https://odysee.com/$/following