diff --git a/csrc/mui_u8g2.c b/csrc/mui_u8g2.c
index 7faa337a..5d4495e5 100644
--- a/csrc/mui_u8g2.c
+++ b/csrc/mui_u8g2.c
@@ -86,7 +86,7 @@
   mui _checkbox_invers_select_u8g2 --> mui_u8g2_u8_chkbox_wm_pi
   mui _radio_invers_select_u8g2 --> mui_u8g2_u8_radio_wm_pi
 
-  mui _input_char_invers_select_u8g2 --> mui_u8g2_u8_char_wm_mse_pi
+  mui _input_char_invers_select_u8g2 --> mui_u8g2_u8_char_wm_mud_pi
 
 */
 
@@ -626,7 +626,7 @@ uint8_t mui_checkbox_mark_invers_select_u8g2(mui_t *ui, uint8_t msg)
   xy: yes, arg: no, text: yes
 */
 
-uint8_t mui_label_u8g2(mui_t *ui, uint8_t msg)
+uint8_t mui_u8g2_draw_text(mui_t *ui, uint8_t msg)
 {
   switch(msg)
   {
@@ -654,7 +654,7 @@ uint8_t mui_label_u8g2(mui_t *ui, uint8_t msg)
 
 /*
 
-  uint8_t mui_goto_frame_button_invers_select_u8g2(mui_t *ui, uint8_t msg)
+  uint8_t mui_u8g2_btn_jmp_wm_fi(mui_t *ui, uint8_t msg)
 
   Description:
     A button with size equal to button text plus one pixel padding
@@ -677,7 +677,7 @@ uint8_t mui_label_u8g2(mui_t *ui, uint8_t msg)
     text: Button label
     
 */
-uint8_t mui_goto_frame_button_invers_select_u8g2(mui_t *ui, uint8_t msg)
+uint8_t mui_u8g2_btn_jmp_wm_fi(mui_t *ui, uint8_t msg)
 {
   switch(msg)
   {
@@ -689,7 +689,7 @@ uint8_t mui_goto_frame_button_invers_select_u8g2(mui_t *ui, uint8_t msg)
 
 /*
 
-  uint8_t mui_goto_half_width_frame_button_invers_select_u8g2(mui_t *ui, uint8_t msg)
+  uint8_t mui_u8g2_btn_jmp_w2_fi(mui_t *ui, uint8_t msg)
 
   Description:
     A button with size equal to display width / 2 - 10 pixel
@@ -712,7 +712,7 @@ uint8_t mui_goto_frame_button_invers_select_u8g2(mui_t *ui, uint8_t msg)
     text: Button label
     
 */
-uint8_t mui_goto_half_width_frame_button_invers_select_u8g2(mui_t *ui, uint8_t msg)
+uint8_t mui_u8g2_btn_jmp_w2_fi(mui_t *ui, uint8_t msg)
 {
   switch(msg)
   {
@@ -724,7 +724,7 @@ uint8_t mui_goto_half_width_frame_button_invers_select_u8g2(mui_t *ui, uint8_t m
 
 /*
 
-  uint8_t mui_leave_menu_frame_button_invers_select_u8g2(mui_t *ui, uint8_t msg)
+  uint8_t mui_u8g2_btn_exit_wm_fi(mui_t *ui, uint8_t msg)
 
   Description:
     A button with size equal to button text plus one pixel padding
@@ -749,7 +749,7 @@ uint8_t mui_goto_half_width_frame_button_invers_select_u8g2(mui_t *ui, uint8_t m
     text: Button label
     
 */
-uint8_t mui_leave_menu_frame_button_invers_select_u8g2(mui_t *ui, uint8_t msg)
+uint8_t mui_u8g2_btn_exit_wm_fi(mui_t *ui, uint8_t msg)
 {
   switch(msg)
   {
@@ -768,7 +768,7 @@ uint8_t mui_leave_menu_frame_button_invers_select_u8g2(mui_t *ui, uint8_t msg)
 
 /*
 
-  uint8_t mui_goto_line_button_invers_select_u8g2(mui_t *ui, uint8_t msg)
+  uint8_t mui_u8g2_btn_jmp_w1_fi(mui_t *ui, uint8_t msg)
 
   Description:
     A full line button (covers complete width of the display).
@@ -791,7 +791,7 @@ uint8_t mui_leave_menu_frame_button_invers_select_u8g2(mui_t *ui, uint8_t msg)
     
 */
 
-uint8_t mui_goto_line_button_invers_select_u8g2(mui_t *ui, uint8_t msg)
+uint8_t mui_u8g2_btn_jmp_w1_fi(mui_t *ui, uint8_t msg)
 {
   switch(msg)
   {
@@ -804,7 +804,7 @@ uint8_t mui_goto_line_button_invers_select_u8g2(mui_t *ui, uint8_t msg)
 
 /*
 
-  uint8_t mui_input_uint8_invers_select_u8g2(mui_t *ui, uint8_t msg)
+  uint8_t mui_u8g2_u8_value_0_9_wm_mse_pi(mui_t *ui, uint8_t msg)
 
   Description:
     Select a number between 0 and 9.
@@ -828,7 +828,7 @@ uint8_t mui_goto_line_button_invers_select_u8g2(mui_t *ui, uint8_t msg)
     text: not used
     
 */
-uint8_t mui_input_uint8_invers_select_u8g2(mui_t *ui, uint8_t msg)
+uint8_t mui_u8g2_u8_value_0_9_wm_mse_pi(mui_t *ui, uint8_t msg)
 {
   //ui->dflags                          MUIF_DFLAG_IS_CURSOR_FOCUS       MUIF_DFLAG_IS_TOUCH_FOCUS
   //mui_get_cflags(ui->uif)       MUIF_CFLAG_IS_CURSOR_SELECTABLE
@@ -883,7 +883,7 @@ uint8_t mui_is_valid_char(uint8_t c)
 
 
 
-uint8_t mui_input_char_invers_select_u8g2(mui_t *ui, uint8_t msg)
+uint8_t mui_u8g2_u8_char_wm_mud_pi(mui_t *ui, uint8_t msg)
 {
   //ui->dflags                          MUIF_DFLAG_IS_CURSOR_FOCUS       MUIF_DFLAG_IS_TOUCH_FOCUS
   //mui_get_cflags(ui->uif)       MUIF_CFLAG_IS_CURSOR_SELECTABLE
@@ -958,7 +958,7 @@ uint8_t mui_input_char_invers_select_u8g2(mui_t *ui, uint8_t msg)
 
 /*
 
-  uint8_t mui_single_line_option_invers_select_u8g2(mui_t *ui, uint8_t msg)
+  uint8_t mui_u8g2_u8_opt_line_wa_mse_pi(mui_t *ui, uint8_t msg)
 
   Description:
     Select one of several options. First option has value 0.
@@ -981,7 +981,7 @@ uint8_t mui_input_char_invers_select_u8g2(mui_t *ui, uint8_t msg)
     text: '|' separated list of options
     
 */
-uint8_t mui_single_line_option_invers_select_u8g2(mui_t *ui, uint8_t msg)
+uint8_t mui_u8g2_u8_opt_line_wa_mse_pi(mui_t *ui, uint8_t msg)
 {
   //ui->dflags                          MUIF_DFLAG_IS_CURSOR_FOCUS       MUIF_DFLAG_IS_TOUCH_FOCUS
   //mui_get_cflags(ui->uif)       MUIF_CFLAG_IS_CURSOR_SELECTABLE
@@ -1027,7 +1027,7 @@ uint8_t mui_single_line_option_invers_select_u8g2(mui_t *ui, uint8_t msg)
    
 
 
-uint8_t mui_select_options_parent_invers_select_u8g2(mui_t *ui, uint8_t msg)
+uint8_t mui_u8g2_u8_opt_parent_wa_mse_pi(mui_t *ui, uint8_t msg)
 {
   //ui->dflags                          MUIF_DFLAG_IS_CURSOR_FOCUS       MUIF_DFLAG_IS_TOUCH_FOCUS
   //mui_get_cflags(ui->uif)       MUIF_CFLAG_IS_CURSOR_SELECTABLE
@@ -1073,7 +1073,7 @@ uint8_t mui_select_options_parent_invers_select_u8g2(mui_t *ui, uint8_t msg)
 
 /*
 
-  uint8_t mui_checkbox_invers_select_u8g2(mui_t *ui, uint8_t msg)
+  uint8_t mui_u8g2_u8_chkbox_wm_pi(mui_t *ui, uint8_t msg)
   
   Description:
     Checkbox with the values 0 (not selected) and 1 (selected). 
@@ -1095,7 +1095,7 @@ uint8_t mui_select_options_parent_invers_select_u8g2(mui_t *ui, uint8_t msg)
     
 */
 
-uint8_t mui_checkbox_invers_select_u8g2(mui_t *ui, uint8_t msg)
+uint8_t mui_u8g2_u8_chkbox_wm_pi(mui_t *ui, uint8_t msg)
 {
   //u8g2_t *u8g2 = mui_get_U8g2(ui);
   //u8g2_uint_t flags = 0;
@@ -1126,7 +1126,7 @@ uint8_t mui_checkbox_invers_select_u8g2(mui_t *ui, uint8_t msg)
 /*
   radio button style, arg is assigned as value
 */
-uint8_t mui_radio_invers_select_u8g2(mui_t *ui, uint8_t msg)
+uint8_t mui_u8g2_u8_radio_wm_pi(mui_t *ui, uint8_t msg)
 {
   uint8_t *value = (uint8_t *)muif_get_data(ui->uif);
   switch(msg)
@@ -1182,7 +1182,7 @@ uint8_t mui_assign_arg_invers_select_u8g2(mui_t *ui, uint8_t msg)
 }
 #endif
 
-uint8_t mui_select_options_child_invers_select_u8g2(mui_t *ui, uint8_t msg)
+uint8_t mui_u8g2_u8_opt_child_wm_mse_pi(mui_t *ui, uint8_t msg)
 {
   uint8_t *value = (uint8_t *)muif_get_data(ui->uif);
   //if ( value == NULL )
diff --git a/csrc/mui_u8g2.h b/csrc/mui_u8g2.h
index 79f1c67c..505a61c8 100644
--- a/csrc/mui_u8g2.h
+++ b/csrc/mui_u8g2.h
@@ -62,24 +62,24 @@ uint8_t mui_line_button_invers_select_u8g2(mui_t *ui, uint8_t msg);
 
 /* ready to use field functions */
 
-uint8_t mui_label_u8g2(mui_t *ui, uint8_t msg);
-uint8_t mui_goto_frame_button_invers_select_u8g2(mui_t *ui, uint8_t msg);
-uint8_t mui_goto_half_width_frame_button_invers_select_u8g2(mui_t *ui, uint8_t msg);
-uint8_t mui_goto_line_button_invers_select_u8g2(mui_t *ui, uint8_t msg);
+uint8_t mui_u8g2_draw_text(mui_t *ui, uint8_t msg);
+uint8_t mui_u8g2_btn_jmp_wm_fi(mui_t *ui, uint8_t msg);
+uint8_t mui_u8g2_btn_jmp_w2_fi(mui_t *ui, uint8_t msg);
+uint8_t mui_u8g2_btn_jmp_w1_fi(mui_t *ui, uint8_t msg);
 
-uint8_t mui_leave_menu_frame_button_invers_select_u8g2(mui_t *ui, uint8_t msg);
+uint8_t mui_u8g2_btn_exit_wm_fi(mui_t *ui, uint8_t msg);
 
-uint8_t mui_input_uint8_invers_select_u8g2(mui_t *ui, uint8_t msg);
-uint8_t mui_single_line_option_invers_select_u8g2(mui_t *ui, uint8_t msg);
+uint8_t mui_u8g2_u8_value_0_9_wm_mse_pi(mui_t *ui, uint8_t msg);
+uint8_t mui_u8g2_u8_opt_line_wa_mse_pi(mui_t *ui, uint8_t msg);
 
-uint8_t mui_select_options_parent_invers_select_u8g2(mui_t *ui, uint8_t msg);
-uint8_t mui_select_options_child_invers_select_u8g2(mui_t *ui, uint8_t msg);
+uint8_t mui_u8g2_u8_opt_parent_wa_mse_pi(mui_t *ui, uint8_t msg);
+uint8_t mui_u8g2_u8_opt_child_wm_mse_pi(mui_t *ui, uint8_t msg);
 
-uint8_t mui_checkbox_invers_select_u8g2(mui_t *ui, uint8_t msg);
-uint8_t mui_radio_invers_select_u8g2(mui_t *ui, uint8_t msg);
+uint8_t mui_u8g2_u8_chkbox_wm_pi(mui_t *ui, uint8_t msg);
+uint8_t mui_u8g2_u8_radio_wm_pi(mui_t *ui, uint8_t msg);
 
 
-uint8_t mui_input_char_invers_select_u8g2(mui_t *ui, uint8_t msg);
+uint8_t mui_u8g2_u8_char_wm_mud_pi(mui_t *ui, uint8_t msg);
 
 #ifdef __cplusplus
 }
diff --git a/sys/arduino/u8g2_page_buffer/MUICountDown/MUICountDown.ino b/sys/arduino/u8g2_page_buffer/MUICountDown/MUICountDown.ino
index a0e0b5bf..fb9c9c5f 100644
--- a/sys/arduino/u8g2_page_buffer/MUICountDown/MUICountDown.ino
+++ b/sys/arduino/u8g2_page_buffer/MUICountDown/MUICountDown.ino
@@ -344,13 +344,13 @@ muif_t muif_list[]  MUI_PROGMEM = {
   MUIF("S0",0,0,mui_style_helv_r_08),
   
   /* Leave the menu system */
-  MUIF("LV",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&exit_code,mui_leave_menu_frame_button_invers_select_u8g2),
+  MUIF("LV",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&exit_code,mui_u8g2_btn_exit_wm_fi),
   
   /* input for a number between 0 to 9 */
-  MUIF("IN",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&number_input,mui_input_uint8_invers_select_u8g2),
+  MUIF("IN",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&number_input,mui_u8g2_u8_value_0_9_wm_mse_pi),
   
   /* MUI_LABEL uses the fixed ".L" id and is used to place read only text on a form */
-  MUIF(".L",0,0,mui_label_u8g2)
+  MUIF(".L",0,0,mui_u8g2_draw_text)
 };
 
 /*
diff --git a/sys/arduino/u8g2_page_buffer/MUIDemo/MUIDemo.ino b/sys/arduino/u8g2_page_buffer/MUIDemo/MUIDemo.ino
index 807d6048..267c0e49 100644
--- a/sys/arduino/u8g2_page_buffer/MUIDemo/MUIDemo.ino
+++ b/sys/arduino/u8g2_page_buffer/MUIDemo/MUIDemo.ino
@@ -379,29 +379,29 @@ muif_t muif_list[]  MUI_PROGMEM = {
   MUIF("HR",0,0,mui_hrule),
 
   /* Goto Form Button where the width is equal to the size of the text, spaces can be used to extend the size */
-  MUIF("G1",MUIF_CFLAG_IS_CURSOR_SELECTABLE,0,mui_goto_frame_button_invers_select_u8g2),
+  MUIF("G1",MUIF_CFLAG_IS_CURSOR_SELECTABLE,0,mui_u8g2_btn_jmp_wm_fi),
   
   /* input for a number between 0 to 9 */
-  MUIF("IN",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&number_input,mui_input_uint8_invers_select_u8g2),
+  MUIF("IN",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&number_input,mui_u8g2_u8_value_0_9_wm_mse_pi),
   
   /* input for a fruit (0..3), implements a selection, where the user can cycle through the options  */
-  MUIF("IF",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&fruit_input,mui_single_line_option_invers_select_u8g2),
+  MUIF("IF",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&fruit_input,mui_u8g2_u8_opt_line_wa_mse_pi),
   
   /* radio style selection */
-  MUIF("CB",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&checkbox_input,mui_checkbox_invers_select_u8g2),
+  MUIF("CB",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&checkbox_input,mui_u8g2_u8_chkbox_wm_pi),
   
   /* the following two fields belong together and implement a single selection combo box to select a color */
-  MUIF("IC",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&color_input,mui_select_options_parent_invers_select_u8g2),
-  MUIF("OC",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&color_input,mui_select_options_child_invers_select_u8g2),
+  MUIF("IC",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&color_input,mui_u8g2_u8_opt_parent_wa_mse_pi),
+  MUIF("OC",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&color_input,mui_u8g2_u8_opt_child_wm_mse_pi),
     
   /* radio button style */
-  MUIF("RS",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&direction_input,mui_radio_invers_select_u8g2),
+  MUIF("RS",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&direction_input,mui_u8g2_u8_radio_wm_pi),
 
   /* MUI_GOTO uses the fixed ".G" id and is intended for goto buttons. This is a full display width style button */
-  MUIF(".G",MUIF_CFLAG_IS_CURSOR_SELECTABLE,0,mui_goto_line_button_invers_select_u8g2),    
+  MUIF(".G",MUIF_CFLAG_IS_CURSOR_SELECTABLE,0,mui_u8g2_btn_jmp_w1_fi),    
   
   /* MUI_LABEL uses the fixed ".L" id and is used to place read only text on a form */
-  MUIF(".L",0,0,mui_label_u8g2)
+  MUIF(".L",0,0,mui_u8g2_draw_text)
 };
 
 /*
diff --git a/sys/arduino/u8g2_page_buffer/MUIMinimal/MUIMinimal.ino b/sys/arduino/u8g2_page_buffer/MUIMinimal/MUIMinimal.ino
index 7c6a9975..34e74e21 100644
--- a/sys/arduino/u8g2_page_buffer/MUIMinimal/MUIMinimal.ino
+++ b/sys/arduino/u8g2_page_buffer/MUIMinimal/MUIMinimal.ino
@@ -300,7 +300,7 @@
 MUIU8G2 mui;
 
 muif_t muif_list[] MUI_PROGMEM = {  
-  MUIF("BN", MUIF_CFLAG_IS_CURSOR_SELECTABLE, 0, mui_leave_menu_frame_button_invers_select_u8g2),
+  MUIF("BN", MUIF_CFLAG_IS_CURSOR_SELECTABLE, 0, mui_u8g2_btn_exit_wm_fi),
 };
 
 fds_t fds_data[] MUI_PROGMEM = 
diff --git a/sys/sdl/mui/main.c b/sys/sdl/mui/main.c
index b4734ea3..0bcf7d4d 100644
--- a/sys/sdl/mui/main.c
+++ b/sys/sdl/mui/main.c
@@ -108,41 +108,41 @@ muif_t muif_list[] = {
   MUIF("HR",0,0,mui_hrule),
 
   /* Goto Form Button where the width is equal to the size of the text, spaces can be used to extend the size */
-  MUIF("G1",MUIF_CFLAG_IS_CURSOR_SELECTABLE,0,mui_goto_frame_button_invers_select_u8g2),
+  MUIF("G1",MUIF_CFLAG_IS_CURSOR_SELECTABLE,0,mui_u8g2_btn_jmp_wm_fi),
   
   /* input for a number between 0 to 9 */
-  MUIF("IN",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&number_input,mui_input_uint8_invers_select_u8g2),
+  MUIF("IN",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&number_input,mui_u8g2_u8_value_0_9_wm_mse_pi),
 
   /* input for text with four chars  */
-  MUIF("T0",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&text_input+0,mui_input_char_invers_select_u8g2),
-  MUIF("T1",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&text_input+1,mui_input_char_invers_select_u8g2),
-  MUIF("T2",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&text_input+2,mui_input_char_invers_select_u8g2),
-  MUIF("T3",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&text_input+3,mui_input_char_invers_select_u8g2),
+  MUIF("T0",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&text_input+0,mui_u8g2_u8_char_wm_mud_pi),
+  MUIF("T1",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&text_input+1,mui_u8g2_u8_char_wm_mud_pi),
+  MUIF("T2",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&text_input+2,mui_u8g2_u8_char_wm_mud_pi),
+  MUIF("T3",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&text_input+3,mui_u8g2_u8_char_wm_mud_pi),
   
   /* input for a fruit (0..3), implements a selection, where the user can cycle through the options  */
-  MUIF("IF",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&fruit_input,mui_single_line_option_invers_select_u8g2),
+  MUIF("IF",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&fruit_input,mui_u8g2_u8_opt_line_wa_mse_pi),
   
   /* radio style selection */
-  MUIF("CB",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&checkbox_input,mui_checkbox_invers_select_u8g2),
+  MUIF("CB",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&checkbox_input,mui_u8g2_u8_chkbox_wm_pi),
   
   /* the following two fields belong together and implement a single selection combo box to select a color */
-  MUIF("IC",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&color_input,mui_select_options_parent_invers_select_u8g2),
-  MUIF("OC",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&color_input,mui_select_options_child_invers_select_u8g2),
+  MUIF("IC",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&color_input,mui_u8g2_u8_opt_parent_wa_mse_pi),
+  MUIF("OC",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&color_input,mui_u8g2_u8_opt_child_wm_mse_pi),
     
   /* radio button style */
-  MUIF("RS",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&direction_input,mui_radio_invers_select_u8g2),
+  MUIF("RS",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&direction_input,mui_u8g2_u8_radio_wm_pi),
 
   /* MUI_GOTO uses the fixed ".G" id and is intended for goto buttons. This is a full display width style button */
-  MUIF(".G",MUIF_CFLAG_IS_CURSOR_SELECTABLE,0,mui_goto_line_button_invers_select_u8g2),    
+  MUIF(".G",MUIF_CFLAG_IS_CURSOR_SELECTABLE,0,mui_u8g2_btn_jmp_w1_fi),    
   
   /* MUI_LABEL uses the fixed ".L" id and is used to place read only text on a form */
-  MUIF(".L",0,0,mui_label_u8g2),
+  MUIF(".L",0,0,mui_u8g2_draw_text),
 
   /* button for the minimal example */
-  MUIF("BN", MUIF_CFLAG_IS_CURSOR_SELECTABLE, 0, mui_leave_menu_frame_button_invers_select_u8g2),
+  MUIF("BN", MUIF_CFLAG_IS_CURSOR_SELECTABLE, 0, mui_u8g2_btn_exit_wm_fi),
 
   /* Leave the menu system */
-  MUIF("LV",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&exit_code,mui_leave_menu_frame_button_invers_select_u8g2)
+  MUIF("LV",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&exit_code,mui_u8g2_btn_exit_wm_fi)
 
 };
 
diff --git a/sys/sdl/ui/main.c b/sys/sdl/ui/main.c
index d89e30b9..45dbe491 100644
--- a/sys/sdl/ui/main.c
+++ b/sys/sdl/ui/main.c
@@ -22,17 +22,17 @@ uint8_t muif_tsingle_line_option_invers_select_u8g2(mui_t *ui, uint8_t msg);
 muif_t muif_list[] = {
 MUIF("B0",MUIF_CFLAG_IS_CURSOR_SELECTABLE,0,mui_half_width_frame_button_invers_select_u8g2),
 MUIF("B1",MUIF_CFLAG_IS_CURSOR_SELECTABLE,0,mui_half_width_frame_button_invers_select_u8g2),
-MUIF("I1",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&my_value,mui_input_uint8_invers_select_u8g2),
-MUIF("I2",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&my_value2,mui_single_line_option_invers_select_u8g2),
-MUIF("I3",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&my_value3,mui_checkbox_invers_select_u8g2),
-MUIF("I4",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&my_color,mui_select_options_parent_invers_select_u8g2),
+MUIF("I1",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&my_value,mui_u8g2_u8_value_0_9_wm_mse_pi),
+MUIF("I2",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&my_value2,mui_u8g2_u8_opt_line_wa_mse_pi),
+MUIF("I3",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&my_value3,mui_u8g2_u8_chkbox_wm_pi),
+MUIF("I4",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&my_color,mui_u8g2_u8_opt_parent_wa_mse_pi),
 
-MUIF("O4",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&my_color,mui_select_options_child_invers_select_u8g2),
+MUIF("O4",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&my_color,mui_u8g2_u8_opt_child_wm_mse_pi),
   
-MUIF("TS",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&touchscreen_selection,mui_single_line_option_invers_select_u8g2),
-MUIF(".G",MUIF_CFLAG_IS_CURSOR_SELECTABLE,0,mui_goto_half_width_frame_button_invers_select_u8g2),    /* MUI_GOTO has the id FG */
-MUIF(".g",MUIF_CFLAG_IS_CURSOR_SELECTABLE,0,mui_goto_line_button_invers_select_u8g2),    /* MUI_goto has the id Fg */
-MUIF(".L",0,0,mui_label_u8g2)
+MUIF("TS",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&touchscreen_selection,mui_u8g2_u8_opt_line_wa_mse_pi),
+MUIF(".G",MUIF_CFLAG_IS_CURSOR_SELECTABLE,0,mui_u8g2_btn_jmp_w2_fi),    /* MUI_GOTO has the id FG */
+MUIF(".g",MUIF_CFLAG_IS_CURSOR_SELECTABLE,0,mui_u8g2_btn_jmp_w1_fi),    /* MUI_goto has the id Fg */
+MUIF(".L",0,0,mui_u8g2_draw_text)
 };
 
 fds_t *fds =