diff --git a/fish/fish/conf.d/omf.fish b/fish/conf.d/omf.fish
similarity index 100%
rename from fish/fish/conf.d/omf.fish
rename to fish/conf.d/omf.fish
diff --git a/fish/config.fish b/fish/config.fish
index 58262a7..55961ff 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -1,7 +1,7 @@
 # set powerline prompt goodness
 set fish_function_path $fish_function_path "/usr/share/powerline/bindings/fish"
-source /usr/share/powerline/bindings/fish/powerline-setup.fish
-powerline-setup
+#source /usr/share/powerline/bindings/fish/powerline-setup.fish
+#powerline-setup
 
 # set mcfly to alias reverse searches
-mcfly init fish | source
+#mcfly init fish | source
diff --git a/fish/fish/config.fish b/fish/fish/config.fish
deleted file mode 100644
index 55961ff..0000000
--- a/fish/fish/config.fish
+++ /dev/null
@@ -1,7 +0,0 @@
-# set powerline prompt goodness
-set fish_function_path $fish_function_path "/usr/share/powerline/bindings/fish"
-#source /usr/share/powerline/bindings/fish/powerline-setup.fish
-#powerline-setup
-
-# set mcfly to alias reverse searches
-#mcfly init fish | source
diff --git a/fish/fish/fish_variables b/fish/fish/fish_variables
deleted file mode 100644
index 9381296..0000000
--- a/fish/fish/fish_variables
+++ /dev/null
@@ -1,33 +0,0 @@
-# This file contains fish universal variable definitions.
-# VERSION: 3.0
-SETUVAR __fish_initialized:3400
-SETUVAR fish_color_autosuggestion:555\x1ebrblack
-SETUVAR fish_color_cancel:\x2dr
-SETUVAR fish_color_command:005fd7
-SETUVAR fish_color_comment:990000
-SETUVAR fish_color_cwd:green
-SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:009900
-SETUVAR fish_color_error:ff0000
-SETUVAR fish_color_escape:00a6b2
-SETUVAR fish_color_history_current:\x2d\x2dbold
-SETUVAR fish_color_host:normal
-SETUVAR fish_color_host_remote:yellow
-SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
-SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:00a6b2
-SETUVAR fish_color_param:00afff
-SETUVAR fish_color_quote:999900
-SETUVAR fish_color_redirection:00afff
-SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
-SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
-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_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_pager_color_selected_background:\x2dr
diff --git a/fish/fish/functions/ll.fish b/fish/fish/functions/ll.fish
deleted file mode 100644
index 0cea872..0000000
--- a/fish/fish/functions/ll.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in - @ line 1
-function ll --wraps='ls -lah' --description 'alias ll=ls -lah'
-  ls -lah $argv;
-end
diff --git a/fish/fish_variables b/fish/fish_variables
index 8fec0ec..9381296 100644
--- a/fish/fish_variables
+++ b/fish/fish_variables
@@ -1,6 +1,6 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
-SETUVAR __fish_initialized:3100
+SETUVAR __fish_initialized:3400
 SETUVAR fish_color_autosuggestion:555\x1ebrblack
 SETUVAR fish_color_cancel:\x2dr
 SETUVAR fish_color_command:005fd7
@@ -30,3 +30,4 @@ 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_pager_color_selected_background:\x2dr