diff --git a/tasks/general/acct_mgmt/users.yml b/tasks/general/acct_mgmt/users.yml
index c9d8dee..4741f9f 100644
--- a/tasks/general/acct_mgmt/users.yml
+++ b/tasks/general/acct_mgmt/users.yml
@@ -1018,16 +1018,10 @@
       alias hugo-server-stage="hugo server --gc --noHTTPCache --disableFastRender"
       alias hugo-server-prod="hugo server --gc --minify"
       alias hugo-server="hugo-server-dev"
-    dwm_functions: |
-      if [[ -f "{{ global_bin }}/volume.function" ]]; then
-        source "{{ global_bin }}/volume.function"
-      fi
-      if [[ -f "{{ global_bin }}/battery.function" ]]; then
-        source "{{ global_bin }}/battery.function"
-      fi
-      if [[ -f "{{ global_bin }}/storage.function" ]]; then
-        source "{{ global_bin }}/storage.function"
-      fi
+    global_functions: |
+      ls "{{ global_bin }}/"*".function" | while read global_function; do
+        source "$global_function"
+      done
 
 - name: General | Account Management | Users | Files | Common Variable
   set_fact:
@@ -1107,7 +1101,7 @@
       {{ function_load_branch }}
       {{ alias_reload_bash }}
       {{ alias_hugo_server }}
-      {{ dwm_functions }}
+      {{ global_functions }}
 
 - name: General | Account Management | Users | Files | .bashrc
   blockinfile: