diff --git a/csrc/mui_u8g2.c b/csrc/mui_u8g2.c
index 924bb58e7..55440d007 100644
--- a/csrc/mui_u8g2.c
+++ b/csrc/mui_u8g2.c
@@ -1033,35 +1033,6 @@ uint8_t mui_u8g2_u8_radio_wm_pi(mui_t *ui, uint8_t msg)
   return 0;  
 }
 
-#ifdef OBSOLETE
-uint8_t mui_assign_arg_invers_select_u8g2(mui_t *ui, uint8_t msg)
-{
-  uint8_t *value = (uint8_t *)muif_get_data(ui->uif);
-  //if ( value == NULL )
-  //  value = &(ui->selected_value);
-  switch(msg)
-  {
-    case MUIF_MSG_DRAW:
-      return mui_radio_mark_invers_select_u8g2(ui, msg);
-    case MUIF_MSG_FORM_START:
-      break;
-    case MUIF_MSG_FORM_END:
-      break;
-    case MUIF_MSG_CURSOR_ENTER:
-      break;
-    case MUIF_MSG_CURSOR_SELECT:
-      *value = ui->arg;
-      break;
-    case MUIF_MSG_CURSOR_LEAVE:
-      break;
-    case MUIF_MSG_TOUCH_DOWN:
-      break;
-    case MUIF_MSG_TOUCH_UP:
-      break;
-  }
-  return 0;
-}
-#endif
 
 
 uint8_t mui_u8g2_u8_opt_child_mse_common(mui_t *ui, uint8_t msg)
@@ -1220,10 +1191,3 @@ uint8_t mui_u8g2_u8_opt_child_w1_mse_pi(mui_t *ui, uint8_t msg)
   return 0;
 }
 
-/*
-      if ( mui_IsCursorFocus(ui) )
-      {
-        flags |= U8G2_BTN_INV;
-      }
-      u8g2_DrawButtonUTF8(u8g2, mui_get_x(ui), mui_get_y(ui), flags, u8g2_GetDisplayWidth(u8g2)-mui_get_x(ui)*2, mui_get_x(ui) , 0, ui->text);
-*/
\ No newline at end of file
diff --git a/sys/arduino/u8g2_page_buffer/MUIDemo/MUIDemo.ino b/sys/arduino/u8g2_page_buffer/MUIDemo/MUIDemo.ino
index e79b7a9ca..0ad6e3f68 100644
--- a/sys/arduino/u8g2_page_buffer/MUIDemo/MUIDemo.ino
+++ b/sys/arduino/u8g2_page_buffer/MUIDemo/MUIDemo.ino
@@ -387,7 +387,6 @@ uint8_t mui_hrule(mui_t *ui, uint8_t msg)
 //#define COMMA ,
 
 muif_t muif_list[] = {
-
   /* normal text style */
   MUIF_STYLE(0, mui_style_helv_r_08),
   
@@ -396,44 +395,59 @@ muif_t muif_list[] = {
 
   /* monospaced font */
   MUIF_STYLE(2, mui_style_monospaced),
-
+  
   /* horizontal line (hrule) */
-  MUIF("HR",0,0,mui_hrule),
+  MUIF_RO("HR", 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_u8g2_btn_jmp_wm_fi),
+  //MUIF("G1",MUIF_CFLAG_IS_CURSOR_SELECTABLE,0,mui_u8g2_btn_jmp_wm_fi),
+  MUIF_BUTTON("G1", mui_u8g2_btn_jmp_wm_fi),
   
   /* input for a number between 0 to 9 */
-  MUIF_U8G2_U8_MIN_MAX_WM_MSE_PI("IN", &number_input, 0, 9),
+  //MUIF("IN",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&number_input,mui_u8g2_u8_value_0_9_wm_mse_pi),
+  //MUIF("IN",MUIF_CFLAG_IS_CURSOR_SELECTABLE, (void *)((mui_u8g2_u8_min_max_t   []  ) {{ &number_input COMMA 1 COMMA 8 }  }  ) , mui_u8g2_u8_min_max_wm_mse_pi),
+  MUIF_U8G2_U8_MIN_MAX_WM_MSE_PI("IN", &number_input, 2, 7),
 
   /* input for a number between 0 to 100 */
-  MUIF_U8G2_U8_MIN_MAX_WM_MUD_PI("IH", &number_input2, 0, 100),
+  //MUIF("IH",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&number_input2,mui_u8g2_u8_value_0_100_wm_mud_pi),
+  MUIF_U8G2_U8_MIN_MAX_WM_MUD_PI("IH", &number_input2, 1, 101),
   
   /* input for text with four chars  */
+  /*
   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),
+  */
+  MUIF_VARIABLE("T0", text_input+0, mui_u8g2_u8_char_wm_mud_pi),
+  MUIF_VARIABLE("T1", text_input+1, mui_u8g2_u8_char_wm_mud_pi),
+  MUIF_VARIABLE("T2", text_input+2, mui_u8g2_u8_char_wm_mud_pi),
+  MUIF_VARIABLE("T3", 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_u8g2_u8_opt_line_wa_mse_pi),
-  MUIF("IG",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&fruit_input2,mui_u8g2_u8_opt_line_wa_mud_pi),
+  MUIF_VARIABLE("IF",&fruit_input,mui_u8g2_u8_opt_line_wa_mse_pi),
+  MUIF_VARIABLE("IG",&fruit_input2,mui_u8g2_u8_opt_line_wa_mud_pi),
   
-  /* radio style selection */
-  MUIF("CB",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&checkbox_input,mui_u8g2_u8_chkbox_wm_pi),
+  /* checkbox */
+  //MUIF("CB",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&checkbox_input,mui_u8g2_u8_chkbox_wm_pi),
+  MUIF_VARIABLE("CB",&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_u8g2_u8_opt_parent_wa_mse_pi),
-  MUIF("OC",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&color_input,mui_u8g2_u8_opt_child_w1_mse_pi),
+  //MUIF("IC",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&color_input,mui_u8g2_u8_opt_parent_wa_mse_pi),
+  MUIF_VARIABLE("IC",&color_input,mui_u8g2_u8_opt_parent_wa_mse_pi),
+  //MUIF("OC",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&color_input,mui_u8g2_u8_opt_child_w1_mse_pi),
+  MUIF_VARIABLE("OC",&color_input,mui_u8g2_u8_opt_child_w1_mse_pi),
     
   /* radio button style */
-  MUIF("RS",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&direction_input,mui_u8g2_u8_radio_wm_pi),
+  //MUIF("RS",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&direction_input,mui_u8g2_u8_radio_wm_pi),
+  MUIF_VARIABLE("RS",&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_u8g2_btn_jmp_w1_pi),
+  /* MUI_GOTO uses the fixed ".G" id and is intended for goto buttons. This is a full display width style button */  
+  MUIF_GOTO(mui_u8g2_btn_jmp_w1_pi),
   
   /* MUI_LABEL uses the fixed ".L" id and is used to place read only text on a form */
-  MUIF(".L",0,0,mui_u8g2_draw_text),
+  //MUIF(".L",0,0,mui_u8g2_draw_text),
+  MUIF_LABEL(mui_u8g2_draw_text),
 
 
 };