diff --git a/radio/src/gui/colorlcd/curve.cpp b/radio/src/gui/colorlcd/curve.cpp
index e9cbe0c84..ee62a79d0 100644
--- a/radio/src/gui/colorlcd/curve.cpp
+++ b/radio/src/gui/colorlcd/curve.cpp
@@ -44,14 +44,14 @@ void Curve::drawBackground(BitmapBuffer * dc)
   // dc->drawSolidRect(0, 0, width(), height(), 1, DEFAULT_COLOR);
 }
 
-coord_t Curve::getPointX(int x)
+coord_t Curve::getPointX(int x) const
 {
   return limit<coord_t>(0,
                         width() / 2 + divRoundClosest(x * width() / 2, RESX),
                         width() - 1);
 }
 
-coord_t Curve::getPointY(int y)
+coord_t Curve::getPointY(int y) const
 {
   return limit<coord_t>(0,
                         height() / 2 - divRoundClosest(y * height() / 2, RESX),
diff --git a/radio/src/gui/colorlcd/curve.h b/radio/src/gui/colorlcd/curve.h
index 73397f420..7d5dee777 100644
--- a/radio/src/gui/colorlcd/curve.h
+++ b/radio/src/gui/colorlcd/curve.h
@@ -41,7 +41,7 @@ class Curve: public Window {
     }
 
 #if defined(DEBUG_WINDOWS)
-    std::string getName() override
+    std::string getName() const override
     {
       return "Curve";
     }
@@ -71,8 +71,8 @@ class Curve: public Window {
     void drawCurve(BitmapBuffer * dc);
     void drawPosition(BitmapBuffer * dc);
     void drawPoint(BitmapBuffer * dc, const CurvePoint & point);
-    coord_t getPointX(int x);
-    coord_t getPointY(int y);
+    coord_t getPointX(int x) const;
+    coord_t getPointY(int y) const;
 };
 
 #endif // _CURVE_H_
diff --git a/radio/src/gui/colorlcd/fab_button.h b/radio/src/gui/colorlcd/fab_button.h
index 5da0baa3a..bf5654289 100644
--- a/radio/src/gui/colorlcd/fab_button.h
+++ b/radio/src/gui/colorlcd/fab_button.h
@@ -27,7 +27,7 @@ class FabButton: public Button {
     FabButton(FormGroup * parent, coord_t x, coord_t y, uint8_t icon, std::function<uint8_t(void)> pressHandler, WindowFlags windowFlags = 0);
 
 #if defined(DEBUG_WINDOWS)
-    std::string getName() override
+    std::string getName() const override
     {
       return "FabButton(" + std::to_string(icon) + ")";
     }
diff --git a/radio/src/gui/colorlcd/fullscreen_dialog.h b/radio/src/gui/colorlcd/fullscreen_dialog.h
index 0890906f5..62acf5f1e 100644
--- a/radio/src/gui/colorlcd/fullscreen_dialog.h
+++ b/radio/src/gui/colorlcd/fullscreen_dialog.h
@@ -36,7 +36,7 @@ class FullScreenDialog : public FormGroup {
     FullScreenDialog(uint8_t type, std::string title, std::string message = "", std::string action = "", std::function<void(void)> confirmHandler = nullptr);
 
 #if defined(DEBUG_WINDOWS)
-    std::string getName() override
+    std::string getName() const override
     {
       return "FullScreenDialog";
     }
diff --git a/radio/src/gui/colorlcd/keyboard_curve.h b/radio/src/gui/colorlcd/keyboard_curve.h
index cfaab401e..cf0d2161b 100644
--- a/radio/src/gui/colorlcd/keyboard_curve.h
+++ b/radio/src/gui/colorlcd/keyboard_curve.h
@@ -32,7 +32,7 @@ class CurveKeyboard : public Keyboard {
     ~CurveKeyboard() override;
 
 #if defined(DEBUG_WINDOWS)
-    std::string getName() override
+    std::string getName() const override
     {
       return "CurveKeyboard";
     }
diff --git a/radio/src/gui/colorlcd/page.h b/radio/src/gui/colorlcd/page.h
index 148884e5e..d7f5588de 100644
--- a/radio/src/gui/colorlcd/page.h
+++ b/radio/src/gui/colorlcd/page.h
@@ -52,7 +52,7 @@ class Page: public Window {
     ~Page() override;
 
 #if defined(DEBUG_WINDOWS)
-    std::string getName() override
+    std::string getName() const override
     {
       return "Page";
     }
diff --git a/radio/src/gui/colorlcd/sourcechoice.h b/radio/src/gui/colorlcd/sourcechoice.h
index f8472d60f..ae9fdbe43 100644
--- a/radio/src/gui/colorlcd/sourcechoice.h
+++ b/radio/src/gui/colorlcd/sourcechoice.h
@@ -41,7 +41,7 @@ class SourceChoice : public FormField {
     }
 
 #if defined(DEBUG_WINDOWS)
-    std::string getName() override
+    std::string getName() const override
     {
       return "SourceChoice";
     }
diff --git a/radio/src/gui/colorlcd/special_functions.cpp b/radio/src/gui/colorlcd/special_functions.cpp
index cedc18c73..5c61fad2b 100644
--- a/radio/src/gui/colorlcd/special_functions.cpp
+++ b/radio/src/gui/colorlcd/special_functions.cpp
@@ -258,7 +258,7 @@ class SpecialFunctionButton : public Button {
     }
 
 #if defined(DEBUG_WINDOWS)
-    std::string getName() override
+    std::string getName() const override
     {
       return "SpecialFunctionButton";
     }
diff --git a/radio/src/gui/colorlcd/switch_warn_dialog.h b/radio/src/gui/colorlcd/switch_warn_dialog.h
index bf529a8e0..014c6a7b5 100644
--- a/radio/src/gui/colorlcd/switch_warn_dialog.h
+++ b/radio/src/gui/colorlcd/switch_warn_dialog.h
@@ -39,7 +39,7 @@ class SwitchWarnDialog: public FullScreenDialog {
     }
 
 #if defined(DEBUG_WINDOWS)
-    std::string getName() override
+    std::string getName() const override
     {
       return "SwitchWarnDialog";
     }
diff --git a/radio/src/gui/colorlcd/switchchoice.h b/radio/src/gui/colorlcd/switchchoice.h
index dc9bb00f7..7aaaa769b 100644
--- a/radio/src/gui/colorlcd/switchchoice.h
+++ b/radio/src/gui/colorlcd/switchchoice.h
@@ -40,7 +40,7 @@ class SwitchChoice : public FormField {
     }
 
 #if defined(DEBUG_WINDOWS)
-    std::string getName() override
+    std::string getName() const override
     {
       return "SwitchChoice";
     }
diff --git a/radio/src/gui/colorlcd/tabsgroup.h b/radio/src/gui/colorlcd/tabsgroup.h
index a21077cb2..4bb8aede2 100644
--- a/radio/src/gui/colorlcd/tabsgroup.h
+++ b/radio/src/gui/colorlcd/tabsgroup.h
@@ -79,7 +79,7 @@ class TabsCarousel: public Window {
     TabsCarousel(Window * parent, TabsGroup * menu);
 
 #if defined(DEBUG_WINDOWS)
-    std::string getName() override
+    std::string getName() const override
     {
       return "TabsCarousel";
     }
@@ -118,7 +118,7 @@ class TabsGroupHeader: public FormGroup {
     ~TabsGroupHeader() override;
 
 #if defined(DEBUG_WINDOWS)
-    std::string getName() override
+    std::string getName() const override
     {
       return "TabsGroupHeader";
     }
@@ -149,7 +149,7 @@ class TabsGroup: public Window {
     ~TabsGroup() override;
 
 #if defined(DEBUG_WINDOWS)
-    std::string getName() override
+    std::string getName() const override
     {
       return "TabsGroup";
     }
diff --git a/radio/src/gui/colorlcd/timeedit.h b/radio/src/gui/colorlcd/timeedit.h
index 6b7553fa8..e34d00906 100644
--- a/radio/src/gui/colorlcd/timeedit.h
+++ b/radio/src/gui/colorlcd/timeedit.h
@@ -28,7 +28,7 @@ class TimeEdit : public BaseNumberEdit {
     TimeEdit(Window * parent, const rect_t & rect, int32_t vmin, int32_t vmax, std::function<int32_t()> getValue, std::function<void(int32_t)> setValue = nullptr);
 
 #if defined(DEBUG_WINDOWS)
-    std::string getName() override
+    std::string getName() const override
     {
       return "TimeEdit";
     }
diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui
index c80b96e0b..29946a11f 160000
--- a/radio/src/thirdparty/libopenui
+++ b/radio/src/thirdparty/libopenui
@@ -1 +1 @@
-Subproject commit c80b96e0b26c69cd195e3b3fad2545d638f01fb6
+Subproject commit 29946a11f4c0fe7b698bf4013f714c38ffc70174