diff --git a/source/ubl-settings-keyboard.h b/source/ubl-settings-keyboard.h
index 17eab8b..7abf6a6 100644
--- a/source/ubl-settings-keyboard.h
+++ b/source/ubl-settings-keyboard.h
@@ -35,11 +35,11 @@
 #define options_parameter "XKBOPTIONS"
 #define options_parameter_command "ubconfig --source global get keyboard XKBOPTIONS"
 #define num_lock_boot_parameter "NUMLOCK"
-#define num_lock_boot_parameter_command "ubconfig --source global get config NUMLOCK"
+#define num_lock_boot_parameter_command "ubconfig --source global get keyboard NUMLOCK"
 
-#define yon_config_get_custom_command(target) yon_char_unite("ubconfig --source ",target," get config NUMLOCK; ubconfig --source ",target," get keyboard XKBMODEL XKBLAYOUT XKBOPTIONS",NULL)
-#define config_get_local_command "ubconfig --source system get config NUMLOCK; ubconfig --source global get keyboard XKBMODEL XKBLAYOUT XKBOPTIONS"
-#define config_get_global_command "ubconfig --source global get config NUMLOCK; ubconfig --source global get keyboard XKBMODEL XKBLAYOUT XKBOPTIONS"
+#define yon_config_get_custom_command(target) yon_char_unite("ubconfig --source ",target," get keyboard XKBMODEL XKBLAYOUT XKBOPTIONS NUMLOCK",NULL)
+#define config_get_local_command "ubconfig --source global get keyboard XKBMODEL XKBLAYOUT XKBOPTIONS NUMLOCK"
+#define config_get_global_command "ubconfig --source global get keyboard XKBMODEL XKBLAYOUT XKBOPTIONS NUMLOCK"
 #define config_get_default_command ""
 
 #define config_get_global_only_parameters ""