diff --git a/fish/.config/fish/conf.d/fisher.fish b/fish/.config/fish/conf.d/fisher.fish
new file mode 100644
index 0000000..b1e84fd
--- /dev/null
+++ b/fish/.config/fish/conf.d/fisher.fish
@@ -0,0 +1 @@
+fisher copy-user-key-bindings
diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables
index 1426c3b..8d98df3 100644
--- a/fish/.config/fish/fish_variables
+++ b/fish/.config/fish/fish_variables
@@ -13,19 +13,6 @@ SETUVAR __fish_init_2_3_0:\x1d
 SETUVAR __fish_init_3_x:\x1d
 SETUVAR __tf_func:function\x20__tf_alias\x20\x2dd\x20\x22Correct\x20your\x20previous\x20console\x20command\x22\x3b\x20\x20set\x20\x2dl\x20fucked_up_command\x20\x24history\x5b1\x5d\x3b\x20\x20env\x20TF_SHELL\x3dfish\x20TF_ALIAS\x3d__tf_alias\x20PYTHONIOENCODING\x3dutf\x2d8\x20thefuck\x20\x24fucked_up_command\x20\x7c\x20read\x20\x2dl\x20unfucked_command\x3b\x20\x20if\x20\x5b\x20\x22\x24unfucked_command\x22\x20\x21\x3d\x20\x22\x22\x20\x5d\x3b\x20\x20\x20\x20eval\x20\x24unfucked_command\x3b\x20\x20\x20\x20builtin\x20history\x20delete\x20\x2d\x2dexact\x20\x2d\x2dcase\x2dsensitive\x20\x2d\x2d\x20\x24fucked_up_command\x3b\x20\x20\x20\x20builtin\x20history\x20merge\x20\x5e\x20/dev/null\x3b\x20\x20end\x3bend\x3b
 SETUVAR __tf_vers:The\x20Fuck\x203\x2e28\x20using\x20Python\x203\x2e7\x2e1\x20and\x20Fish\x20Shell\x202\x2e7\x2e1
-SETUVAR budspencer_colors:000000\x1e083743\x1e445659\x1efdf6e3\x1eb58900\x1ecb4b16\x1edc121f\x1eaf005f\x1e6c71c4\x1e268bd2\x1e2aa198\x1e859900
-SETUVAR budspencer_cursors:\x5c033\x5d12\x3b\x23268bd2\x5c007\x1e\x5c033\x5d12\x3b\x23b58900\x5c007\x1e\x5c033\x5d12\x3b\x23af005f\x5c007\x1e\x5c033\x5d12\x3b\x236c71c4\x5c007
-SETUVAR budspencer_day:000000\x1e333333\x1e666666\x1effffff\x1effff00\x1eff6600\x1eff0000\x1eff0033\x1e3300ff\x1e00aaff\x1e00ffff\x1e00ff00
-SETUVAR budspencer_night:000000\x1e083743\x1e445659\x1efdf6e3\x1eb58900\x1ecb4b16\x1edc121f\x1eaf005f\x1e6c71c4\x1e268bd2\x1e2aa198\x1e859900
-SETUVAR budspencer_nocmdhist:c\x1ed\x1ell\x1els\x1em\x1es
-SETUVAR budspencer_pwdstyle:short\x1elong\x1enone
-SETUVAR budspencer_sessions_active:\x1d
-SETUVAR budspencer_sessions_active_pid:\x1d
-SETUVAR chain_links:chain\x2elinks\x2eroot\x1echain\x2elinks\x2ejobs\x1echain\x2elinks\x2epwd\x1echain\x2elinks\x2evcs_branch\x1echain\x2elinks\x2evcs_dirty\x1echain\x2elinks\x2evcs_stashed
-SETUVAR dangerous_nocmdhist:c\x1ed\x1ell\x1els\x1em\x1es
-SETUVAR dangerous_pwdstyle:short\x1elong\x1enone
-SETUVAR dangerous_sessions_active:\x1d
-SETUVAR dangerous_sessions_active_pid:\x1d
 SETUVAR fish_color_autosuggestion:555\x1ebrblack
 SETUVAR fish_color_cancel:\x2dr
 SETUVAR fish_color_command:\x2d\x2dbold
@@ -54,4 +41,3 @@ 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:/Users/colinpowell/\x2efzf/bin
-SETUVAR yimmy_solarized:true
diff --git a/fish/.config/fish/functions/dcedj.fish b/fish/.config/fish/functions/dcedj.fish
new file mode 100644
index 0000000..2a52010
--- /dev/null
+++ b/fish/.config/fish/functions/dcedj.fish
@@ -0,0 +1,5 @@
+function dcedj
+	pushd ~/src/elation/hippo
+	docker-compose exec hippo django-admin $argv
+	popd
+end
diff --git a/fish/.config/fish/functions/dcet-dj.fish b/fish/.config/fish/functions/dcetdj.fish
similarity index 84%
rename from fish/.config/fish/functions/dcet-dj.fish
rename to fish/.config/fish/functions/dcetdj.fish
index d4b0a81..13f672b 100644
--- a/fish/.config/fish/functions/dcet-dj.fish
+++ b/fish/.config/fish/functions/dcetdj.fish
@@ -1,4 +1,4 @@
-function dcet-dj
+function dcetdj
 	pushd ~/src/elation/hippo-tethys
 	docker-compose exec hippo django-admin $argv
 	popd
diff --git a/fish/.config/fish/functions/el8log.fish b/fish/.config/fish/functions/el8log.fish
deleted file mode 100644
index 12bd3dc..0000000
--- a/fish/.config/fish/functions/el8log.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-function el8log
-	pushd ~/devel/elationemr/hippo/
-	docker-compose logs --tail=50 -f hippo
-	popd
-end
diff --git a/fish/.config/fish/functions/el8up.fish b/fish/.config/fish/functions/el8up.fish
deleted file mode 100644
index 9c0153c..0000000
--- a/fish/.config/fish/functions/el8up.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-function el8up
-	pushd ~/devel/elationemr/hippo
-	docker-compose up -d
-	popd
-end
diff --git a/fish/.config/fish/functions/fish_right_prompt.fish b/fish/.config/fish/functions/fish_right_prompt.fish
deleted file mode 100644
index 6d693dd..0000000
--- a/fish/.config/fish/functions/fish_right_prompt.fish
+++ /dev/null
@@ -1,17 +0,0 @@
-# Display the compressed current working path on the right
-# If the previous command returned any kind of error code, display that too
-
-function fish_right_prompt
-  set -l last_status $status
-  set -l cyan (set_color -o cyan)
-  set -l red (set_color -o red)
-  set -l normal (set_color normal)
-
-  echo -n -s $cyan (prompt_pwd)
-
-  if test $last_status -ne 0
-    set_color red
-    printf ' %d' $last_status
-    set_color normal
-  end
-end
diff --git a/fish/.config/fish/functions/getWanIp.fish b/fish/.config/fish/functions/getWanIp.fish
deleted file mode 100644
index b49d70a..0000000
--- a/fish/.config/fish/functions/getWanIp.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function getWanIp
-	dig +short myip.opendns.com @resolver1.opendns.com
-end