diff --git a/radio/src/gui/colorlcd/themes/frsky.cpp b/radio/src/gui/colorlcd/themes/frsky.cpp
index e6eccce29..e7dca64fe 100644
--- a/radio/src/gui/colorlcd/themes/frsky.cpp
+++ b/radio/src/gui/colorlcd/themes/frsky.cpp
@@ -68,8 +68,10 @@ class FrskyTheme: public ThemeBase
       lcdColorTable[OVERLAY_COLOR_INDEX] = BLACK;
       lcdColorTable[BARGRAPH1_COLOR_INDEX] = RED;
       lcdColorTable[BARGRAPH2_COLOR_INDEX] = RGB(167, 167, 167);
-      lcdColorTable[BARGRAPH_BGCOLOR_INDEX] = RGB(222, 222, 222);;
+      lcdColorTable[BARGRAPH_BGCOLOR_INDEX] = RGB(222, 222, 222);
+#if defined(BATTERY_CHARGE)
       lcdColorTable[BATTERY_CHARGE_COLOR_INDEX] = GREEN;
+#endif
     }
 
     void loadMenuIcon(uint8_t index, const char * filename, uint32_t color=MENU_COLOR) const
diff --git a/radio/src/targets/nv14/CMakeLists.txt b/radio/src/targets/nv14/CMakeLists.txt
index 909a195da..f51862eda 100644
--- a/radio/src/targets/nv14/CMakeLists.txt
+++ b/radio/src/targets/nv14/CMakeLists.txt
@@ -34,7 +34,8 @@ set_property(CACHE PCB_RF_BAUD PROPERTY STRINGS ${RF_BAUD_RATE})
 
 set(FLAVOUR nv14)
 add_definitions(-DPCBNV14 -DPCBFLYSKY -DINTERNAL_MODULE_BAUDRATE=${PCB_RF_BAUD})
-#add_definitions(-DSOFTWARE_VOLUME)
+add_definitions(-DBATTERY_CHARGE)  # -DSOFTWARE_VOLUME
+
 set(TARGET_SRC
   ${TARGET_SRC}
   audio_spi_driver.cpp
diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui
index 69d2cb08c..770adcfd1 160000
--- a/radio/src/thirdparty/libopenui
+++ b/radio/src/thirdparty/libopenui
@@ -1 +1 @@
-Subproject commit 69d2cb08c6fdf866c6f96dacad65ce423fc6a778
+Subproject commit 770adcfd1daeba340a7f2aea4954be6526157b88