diff --git a/radio/src/gui/colorlcd/model_setup.cpp b/radio/src/gui/colorlcd/model_setup.cpp
index 7927ba503..afef6ff7a 100644
--- a/radio/src/gui/colorlcd/model_setup.cpp
+++ b/radio/src/gui/colorlcd/model_setup.cpp
@@ -42,7 +42,6 @@ ModelSetupPage::ModelSetupPage() :
 {
 }
 
-const char MODEL_NAME_EXTRA_CHARS[] = "_-.,:;<=>";
 
 static void onModelNameChanged()
 {
@@ -58,7 +57,7 @@ static void onModelNameChanged()
 struct ModelNameEdit : public ModelTextEdit {
   ModelNameEdit(Window *parent, const rect_t &rect) :
       ModelTextEdit(parent, rect, g_model.header.name,
-                    sizeof(g_model.header.name), 0, MODEL_NAME_EXTRA_CHARS)
+                    sizeof(g_model.header.name), 0)
   {
     setChangeHandler(onModelNameChanged);
   }
diff --git a/radio/src/gui/colorlcd/textedits.h b/radio/src/gui/colorlcd/textedits.h
index c55cf78a5..16fba16f0 100644
--- a/radio/src/gui/colorlcd/textedits.h
+++ b/radio/src/gui/colorlcd/textedits.h
@@ -25,26 +25,24 @@
 #include "textedit.h"
 #include "storage/storage.h"
 
-class ModelTextEdit: public TextEdit
+class ModelTextEdit : public TextEdit
 {
-  public:
-    ModelTextEdit(Window * parent, const rect_t & rect, char * value, uint8_t length, LcdFlags windowFlags = 0, const char * extra_chars = nullptr):
-      TextEdit(parent, rect, value, length, windowFlags, extra_chars)
-    {
-      setChangeHandler([](){
-          storageDirty(EE_MODEL);
-      });
-    }
+ public:
+  ModelTextEdit(Window* parent, const rect_t& rect, char* value, uint8_t length,
+                LcdFlags windowFlags = 0) :
+      TextEdit(parent, rect, value, length, windowFlags)
+  {
+    setChangeHandler([]() { storageDirty(EE_MODEL); });
+  }
 };
 
-class RadioTextEdit: public TextEdit
+class RadioTextEdit : public TextEdit
 {
-  public:
-    RadioTextEdit(Window * parent, const rect_t & rect, char * value, uint8_t length, LcdFlags windowFlags = 0, const char * extra_chars = nullptr):
-      TextEdit(parent, rect, value, length, windowFlags, extra_chars)
-    {
-      setChangeHandler([](){
-          storageDirty(EE_GENERAL);
-      });
-    }
+ public:
+  RadioTextEdit(Window* parent, const rect_t& rect, char* value, uint8_t length,
+                LcdFlags windowFlags = 0) :
+      TextEdit(parent, rect, value, length, windowFlags)
+  {
+    setChangeHandler([]() { storageDirty(EE_GENERAL); });
+  }
 };
diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui
index 40d6ae5ee..064c81b56 160000
--- a/radio/src/thirdparty/libopenui
+++ b/radio/src/thirdparty/libopenui
@@ -1 +1 @@
-Subproject commit 40d6ae5ee81967f17df44eecddfa4e54a697a646
+Subproject commit 064c81b560c1a0279f8868460c9b405c617a8863