diff --git a/pkg/omf/functions/packages/omf.packages.list.fish b/pkg/omf/functions/packages/omf.packages.list.fish
index f32fa21..c2b3f8e 100644
--- a/pkg/omf/functions/packages/omf.packages.list.fish
+++ b/pkg/omf/functions/packages/omf.packages.list.fish
@@ -14,8 +14,8 @@ function omf.packages.list -d 'List installed packages'
     set -e show_plugins
   end
 
-  set -l plugins_paths $OMF_PATH/pkg/*
-  set -l themes_paths $OMF_PATH/themes/*
+  set -l plugins_paths {$OMF_CONFIG, $OMF_PATH}/pkg/*
+  set -l themes_paths {$OMF_CONFIG, $OMF_PATH}/themes/*
 
   if set -q show_plugins
     for path in $plugins_paths
diff --git a/pkg/omf/functions/themes/omf.theme.set.fish b/pkg/omf/functions/themes/omf.theme.set.fish
index b28619f..27b3792 100644
--- a/pkg/omf/functions/themes/omf.theme.set.fish
+++ b/pkg/omf/functions/themes/omf.theme.set.fish
@@ -1,5 +1,5 @@
 function omf.theme.set -a target_theme
-  if not test -d $OMF_PATH/themes/$target_theme
+  if not test -d $OMF_PATH/themes/$target_theme -o -d $OMF_CONFIG/themes/$target_theme
     return $OMF_INVALID_ARG
   end