diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh
index 70cffd9..9808c51 100644
--- a/menus_functions_ub1804.sh
+++ b/menus_functions_ub1804.sh
@@ -57,7 +57,6 @@ function showConfigMenu () {
     --menu "System Config" \
     25 80 16 \
     "Ufw" "Enable Firewall (ufw)" \
-    "NumLockX" "NumLock Enabled at boot time" \
     "TmpRAM" "/tmp stored in RAM" \
     "screenfetch" "screenfetch added to .bashrc" \
     "historyTS" "TimeStamp enabled in Shell History" \
@@ -71,11 +70,6 @@ function showConfigMenu () {
         enableUFW
         pressKey
         ;;
-      "NumLockX")
-        clear
-        enableNumLockX
-        pressKey
-        ;;
       "TmpRAM")
         clear
         enableTmpRAM
diff --git a/menus_functions_ub2004.sh b/menus_functions_ub2004.sh
index 4b096bb..e05893b 100644
--- a/menus_functions_ub2004.sh
+++ b/menus_functions_ub2004.sh
@@ -71,11 +71,6 @@ function showConfigMenu () {
         enableUFW
         pressKey
         ;;
-      "NumLockX")
-        clear
-        enableNumLockX
-        pressKey
-        ;;
       "TmpRAM")
         clear
         enableTmpRAM
diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh
index 7e18c00..4e5c8fa 100644
--- a/repo_functions_ub1804.sh
+++ b/repo_functions_ub1804.sh
@@ -1142,7 +1142,21 @@ megasync;megasync_PostTrtFct
 flatpak;flatpak_PostTrtFct
 gcc8;gcc8_PostTrtFct
 ruby-dev;ruby-dev_PostTrtFct
-virtualbox-6.1;virtualbox-6.1_PostTrtFct"
+virtualbox-6.1;virtualbox-6.1_PostTrtFct
+numlockx;numlockx_PostTrtFct"
+
+#
+# numlockx
+#
+function numlockx_PostTrtFct () {
+  runCmd "sudo ufw enable"\
+         "enabling UFW at boot"
+
+  if which syncthing >/dev/null; then
+    runCmd "sudo ufw allow syncthing" \
+           "adding UFW rules for Syncthing"
+  fi
+}
 
 #
 # virtualbox-6.1
diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh
index 76b9146..0209bf2 100644
--- a/repo_functions_ub2004.sh
+++ b/repo_functions_ub2004.sh
@@ -1022,7 +1022,21 @@ dockerio;dockerio_PostTrtFct
 megasync;megasync_PostTrtFct
 flatpak;flatpak_PostTrtFct
 ruby-dev;ruby-dev_PostTrtFct
-virtualbox;virtualbox_PostTrtFct"
+virtualbox;virtualbox_PostTrtFct
+numlockx;numlockx_PostTrtFct"
+
+#
+# numlockx
+#
+function numlockx_PostTrtFct () {
+  runCmd "sudo ufw enable"\
+         "enabling UFW at boot"
+
+  if which syncthing >/dev/null; then
+    runCmd "sudo ufw allow syncthing" \
+           "adding UFW rules for Syncthing"
+  fi
+}
 
 #
 # virtualbox
diff --git a/tools_functions.sh b/tools_functions.sh
index bce53e7..6d0aa22 100644
--- a/tools_functions.sh
+++ b/tools_functions.sh
@@ -10,19 +10,6 @@
 # tools and config functions                                                  #
 #-----------------------------------------------------------------------------#
 
-#
-# enable ufw at boot time and add rules for installed apps
-#
-function enableUFW () {
-  runCmd "sudo ufw enable"\
-         "enabling UFW at boot"
-
-  if which syncthing >/dev/null; then
-    runCmd "sudo ufw allow syncthing" \
-           "adding UFW rules for Syncthing"
-  fi
-}
-
 #
 # enable numlock by default on LightDM
 #