diff --git a/source/ubl-settings-keyboard.c b/source/ubl-settings-keyboard.c
index f3a8614..ea4a3b8 100644
--- a/source/ubl-settings-keyboard.c
+++ b/source/ubl-settings-keyboard.c
@@ -82,6 +82,17 @@ gboolean yon_interface_update(main_window *widgets){
                 gtk_list_store_set(widgets->OptionsList,&iter,0,option_parsed[0],1,_(option_parsed[1]),-1);
                 yon_char_parsed_free(option_parsed,option_parsed_size);
             }
+            if (yon_char_parsed_check_exist(parsed,size,"compose:rwin")>-1){
+                gtk_switch_set_active(GTK_SWITCH(widgets->ComposeSwitch),1);
+            } else {
+                gtk_switch_set_active(GTK_SWITCH(widgets->ComposeSwitch),0);
+            }
+            if (yon_char_parsed_check_exist(parsed,size,"grp_led:scroll")>-1){
+                gtk_switch_set_active(GTK_SWITCH(widgets->ScrollLockSwitch),1);
+            } else {
+                gtk_switch_set_active(GTK_SWITCH(widgets->ScrollLockSwitch),0);
+            }
+
             yon_char_parsed_free(parsed,size);
         }
     }