diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c
index be77a12..ca41b3c 100644
--- a/source/ubl-settings-system.c
+++ b/source/ubl-settings-system.c
@@ -103,7 +103,7 @@ void on_about(){
 //functions
 
 void yon_load_proceed(YON_CONFIG_TYPE type){
-    if (yon_config_load_register(type,"config",hostname_parameter,"config",id_parameter,"locale",console_font_parameter,"locale",locale_parameter,"locale",language_parameter,NULL)){}
+    if (yon_config_load_register(type,hostname_section,hostname_parameter,id_section,id_parameter,console_font_section,console_font_parameter,locale_section,locale_parameter,language_section,language_parameter,NULL)){}
     else
         yon_ubl_status_box_render(LOAD_FAILED_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
     
@@ -279,7 +279,7 @@ void on_locale_accept(GtkWidget *self, dictionary *dict){
     }
     gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),final_string);
     if (yon_config_get_by_key("LOCALE")) yon_config_set("LOCALE",final_ids);
-    else yon_config_register("LOCALE","locale",final_ids);
+    else yon_config_register("LOCALE",locale_section,final_ids);
     on_close_subwindow(self);
 }
 
@@ -309,7 +309,7 @@ void on_hostname_changed(GtkEntry *self, main_window *widgets){
     if (yon_config_get_by_key(hostname_parameter)){
         yon_config_set(hostname_parameter,text);
     } else {
-        yon_config_register(hostname_parameter,"config",text);
+        yon_config_register(hostname_parameter,hostname_section,text);
     }
 }
 
@@ -319,7 +319,7 @@ void on_id_combo_toggled(GtkComboBox *self, main_window *widgets){
         if (yon_config_get_by_key(id_parameter)){
             yon_config_set(id_parameter, id == 1 ? "random" : "hardware");
         } else {
-            yon_config_register(id_parameter,"config", id == 1 ? "random":"hardware");
+            yon_config_register(id_parameter,id_section, id == 1 ? "random":"hardware");
         }
     }
     if (id<3){
@@ -336,7 +336,7 @@ void on_id_changed(GtkEntry *self, main_window *widgets){
         if (yon_config_get_by_key(id_parameter)){
             yon_config_set(id_parameter,text);
         } else {
-            yon_config_register(id_parameter,"config",text);
+            yon_config_register(id_parameter,id_section,text);
         }
         if (!main_config.lock_save_global)
             gtk_widget_set_sensitive(widgets->SaveGlobalMenuItem,1);
@@ -375,7 +375,7 @@ void on_console_font_changed(GtkComboBox *self, main_window *widgets){
         if (yon_config_get_by_key(console_font_parameter)){
             yon_config_set(console_font_parameter,code);
         } else {
-            yon_config_register(console_font_parameter,"locale",code);
+            yon_config_register(console_font_parameter,console_font_section,code);
         }
     }
 }
@@ -389,7 +389,7 @@ void on_language_changed(GtkComboBox *self, main_window *widgets){
     if (yon_config_get_by_key(language_parameter)){
         yon_config_set(language_parameter,code);
     } else {
-        yon_config_register(language_parameter,"locale",code);
+        yon_config_register(language_parameter,language_section,code);
     }
 }
 
diff --git a/source/ubl-settings-system.h b/source/ubl-settings-system.h
index 61ba0af..7ba558f 100644
--- a/source/ubl-settings-system.h
+++ b/source/ubl-settings-system.h
@@ -37,12 +37,19 @@
 // #define get_fonts_command "ls /usr/share/kbd/consolefonts/ |grep -v \"README\"|grep -oE \"^[-a-zA-Z0-9_]{3,}.psf\"|sed -e 's/\\.psf//g'"
 
 #define hostname_parameter "HOSTNAME"
+#define hostname_section "config"
 #define id_parameter "MACHINEID"
+#define id_section "config"
 #define keyboard_layout_parameter "XKBLAYOUT"
+#define keyboard_section "keyboard"
 #define console_font_parameter "CONSOLE_FONT"
+#define console_font_section "locale"
 #define num_lock_boot_parameter "NUMLOCK"
+#define num_lock_boot_section "config"
 #define language_parameter "LANG"
+#define language_section "locale"
 #define locale_parameter "LOCALE"
+#define locale_section "locale"
 
 typedef char* string;
 string version_application;