diff --git a/meson.build b/meson.build
index 7224690e..7d4b5bc9 100644
--- a/meson.build
+++ b/meson.build
@@ -291,9 +291,9 @@ linux_def  += openrtx_def
 #
 linux_default_src = linux_src + ui_src_default
 linux_default_def = linux_def + {'CONFIG_SCREEN_WIDTH': '160', 'CONFIG_SCREEN_HEIGHT': '128', 'CONFIG_PIX_FMT_RGB565': '',
-                                 'GPS_PRESENT': '', 'RTC_PRESENT': ''}
+                                 'CONFIG_GPS': '', 'CONFIG_RTC': ''}
 linux_small_def   = linux_def + {'CONFIG_SCREEN_WIDTH': '128', 'CONFIG_SCREEN_HEIGHT': '64', 'CONFIG_PIX_FMT_BW': '',
-                                 'GPS_PRESENT': '', 'RTC_PRESENT': ''}
+                                 'CONFIG_GPS': '', 'CONFIG_RTC': ''}
 
 #
 # Module17 UI
diff --git a/openrtx/include/core/voicePromptUtils.h b/openrtx/include/core/voicePromptUtils.h
index 16cbf9e5..f62c2e29 100644
--- a/openrtx/include/core/voicePromptUtils.h
+++ b/openrtx/include/core/voicePromptUtils.h
@@ -156,7 +156,7 @@ void vp_announceM17Info(const channel_t* channel, bool isEditing,
 /**
  *
  */
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
 void vp_announceGPSInfo(vpGPSInfoFlags_t gpsInfoFlags);
 #endif
 
@@ -178,7 +178,7 @@ void vp_announceRestoreScreen();
 /**
  *
  */
-#ifdef RTC_PRESENT
+#ifdef CONFIG_RTC
 void vp_announceSettingsTimeDate();
 #endif
 
diff --git a/openrtx/include/interfaces/platform.h b/openrtx/include/interfaces/platform.h
index 9ef336c4..2b7cd3c7 100644
--- a/openrtx/include/interfaces/platform.h
+++ b/openrtx/include/interfaces/platform.h
@@ -144,7 +144,7 @@ void platform_beepStart(uint16_t freq);
  */
 void platform_beepStop();
 
-#ifdef RTC_PRESENT
+#ifdef CONFIG_RTC
 /**
  * Get current UTC date and time.
  * @return structure of type datetime_t with current clock and calendar values.
diff --git a/openrtx/include/ui/ui_default.h b/openrtx/include/ui/ui_default.h
index 0dc97690..c6694a18 100644
--- a/openrtx/include/ui/ui_default.h
+++ b/openrtx/include/ui/ui_default.h
@@ -80,7 +80,7 @@ enum menuItems
     M_BANK = 0,
     M_CHANNEL,
     M_CONTACTS,
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
     M_GPS,
 #endif
     M_SETTINGS,
@@ -91,10 +91,10 @@ enum menuItems
 enum settingsItems
 {
     S_DISPLAY = 0,
-#ifdef RTC_PRESENT
+#ifdef CONFIG_RTC
     S_TIMEDATE,
 #endif
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
     S_GPS,
 #endif
     S_RADIO,
@@ -120,7 +120,7 @@ enum displayItems
     D_TIMER,
 };
 
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
 enum settingsGPSItems
 {
     G_ENABLED = 0,
@@ -217,7 +217,7 @@ typedef struct ui_state_t
     freq_t new_tx_frequency;
     char new_rx_freq_buf[14];
     char new_tx_freq_buf[14];
-#ifdef RTC_PRESENT
+#ifdef CONFIG_RTC
     // Variables used for Time & Date input
     datetime_t new_timedate;
     char new_date_buf[9];
diff --git a/openrtx/include/ui/ui_mod17.h b/openrtx/include/ui/ui_mod17.h
index 9e725b54..98fb1422 100644
--- a/openrtx/include/ui/ui_mod17.h
+++ b/openrtx/include/ui/ui_mod17.h
@@ -78,7 +78,7 @@ enum SetRxTx
 enum menuItems
 {
     M_SETTINGS = 0,
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
     M_GPS,
 #endif
     M_INFO,
@@ -89,10 +89,10 @@ enum menuItems
 enum settingsItems
 {
     S_DISPLAY = 0
-#ifdef RTC_PRESENT
+#ifdef CONFIG_RTC
     ,S_TIMEDATE
 #endif
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
     ,S_GPS
 #endif
     ,S_M17
@@ -117,7 +117,7 @@ enum displayItems
 #endif
 };
 
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
 enum settingsGPSItems
 {
     G_ENABLED = 0,
@@ -209,7 +209,7 @@ typedef struct ui_state_t
     freq_t new_tx_frequency;
     char new_rx_freq_buf[14];
     char new_tx_freq_buf[14];
-#ifdef RTC_PRESENT
+#ifdef CONFIG_RTC
     // Variables used for Time & Date input
     datetime_t new_timedate;
     char new_date_buf[9];
diff --git a/openrtx/src/core/gps.c b/openrtx/src/core/gps.c
index 5bd85054..1247e6fb 100644
--- a/openrtx/src/core/gps.c
+++ b/openrtx/src/core/gps.c
@@ -31,7 +31,7 @@
 static char sentence[2*MINMEA_MAX_LENGTH];
 static bool gpsEnabled        = false;
 static bool readNewSentence   = true;
-#ifdef RTC_PRESENT
+#ifdef CONFIG_RTC
 static bool isRtcSyncronised  = false;
 #endif
 
@@ -191,7 +191,7 @@ void gps_task()
     pthread_mutex_unlock(&state_mutex);
 
     // Synchronize RTC with GPS UTC clock, only when fix is done
-    #ifdef RTC_PRESENT
+    #ifdef CONFIG_RTC
     if(state.gps_set_time)
     {
         if((sId == MINMEA_SENTENCE_RMC) &&
diff --git a/openrtx/src/core/openrtx.c b/openrtx/src/core/openrtx.c
index 9fd4b521..80c92dad 100644
--- a/openrtx/src/core/openrtx.c
+++ b/openrtx/src/core/openrtx.c
@@ -74,7 +74,7 @@ void openrtx_init()
     sleepFor(0u, 30u);
     display_setBacklightLevel(state.settings.brightness);
 
-    #if defined(GPS_PRESENT)
+    #if defined(CONFIG_GPS)
     // Detect and initialise GPS
     state.gpsDetected = gps_detect(1000);
     if(state.gpsDetected) gps_init(9600);
diff --git a/openrtx/src/core/state.c b/openrtx/src/core/state.c
index a2229a28..5fa09b27 100644
--- a/openrtx/src/core/state.c
+++ b/openrtx/src/core/state.c
@@ -64,7 +64,7 @@ void state_init()
     /*
      * Initialise remaining fields
      */
-    #ifdef RTC_PRESENT
+    #ifdef CONFIG_RTC
     state.time = platform_getCurrentTime();
     #endif
     state.v_bat  = platform_getVbat();
@@ -127,7 +127,7 @@ void state_task()
     state.charge = battery_getCharge(state.v_bat);
     state.rssi = rtx_getRssi();
 
-    #ifdef RTC_PRESENT
+    #ifdef CONFIG_RTC
     state.time = platform_getCurrentTime();
     #endif
 
diff --git a/openrtx/src/core/threads.c b/openrtx/src/core/threads.c
index 9b0bf776..986c277c 100644
--- a/openrtx/src/core/threads.c
+++ b/openrtx/src/core/threads.c
@@ -33,7 +33,7 @@
 #include <utils.h>
 #include <input.h>
 #include <backup.h>
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
 #include <peripherals/gps.h>
 #include <gps.h>
 #endif
@@ -156,7 +156,7 @@ void *main_thread(void *arg)
         pthread_mutex_unlock(&state_mutex);
 
         // Run GPS task
-        #if defined(GPS_PRESENT) && !defined(MD3x0_ENABLE_DBG)
+        #if defined(CONFIG_GPS) && !defined(MD3x0_ENABLE_DBG)
         gps_task();
         #endif
 
@@ -168,7 +168,7 @@ void *main_thread(void *arg)
         sleepUntil(time);
     }
 
-    #if defined(GPS_PRESENT)
+    #if defined(CONFIG_GPS)
     gps_terminate();
     #endif
 
diff --git a/openrtx/src/core/voicePromptUtils.c b/openrtx/src/core/voicePromptUtils.c
index 64d8d513..fd86c075 100644
--- a/openrtx/src/core/voicePromptUtils.c
+++ b/openrtx/src/core/voicePromptUtils.c
@@ -549,7 +549,7 @@ void vp_announceM17Info(const channel_t* channel, bool isEditing,
     playIfNeeded(flags);
 }
 
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
 // cardinal point plus or minus this value is still considered cardinal point.
 #define margin 3
 
@@ -725,7 +725,7 @@ void vp_announceGPSInfo(vpGPSInfoFlags_t gpsInfoFlags)
 
     vp_play();
 }
-#endif // GPS_PRESENT
+#endif // CONFIG_GPS
 
 void vp_announceAboutScreen()
 {
@@ -770,7 +770,7 @@ void vp_announceRestoreScreen()
     vp_play();
 }
 
-#ifdef RTC_PRESENT
+#ifdef CONFIG_RTC
 void vp_announceSettingsTimeDate()
 {
     vp_flush();
@@ -796,7 +796,7 @@ void vp_announceSettingsTimeDate()
 
     vp_play();
 }
-#endif // RTC_PRESENT
+#endif // CONFIG_RTC
 
 void vp_announceSettingsVoiceLevel(const vpQueueFlags_t flags)
 {
@@ -869,7 +869,7 @@ void vp_announceScreen(uint8_t ui_screen)
                                       state.bank, infoFlags);
             break;
 
-        #ifdef GPS_PRESENT
+        #ifdef CONFIG_GPS
         case MENU_GPS:
             vp_announceGPSInfo(vpGPSAll);
             break;
@@ -887,7 +887,7 @@ void vp_announceScreen(uint8_t ui_screen)
             vp_announceAboutScreen();
             break;
 
-        #ifdef RTC_PRESENT
+        #ifdef CONFIG_RTC
         case SETTINGS_TIMEDATE:
             vp_announceSettingsTimeDate();
             break;
diff --git a/openrtx/src/ui/default/ui.c b/openrtx/src/ui/default/ui.c
index 97d7c997..dddb220f 100644
--- a/openrtx/src/ui/default/ui.c
+++ b/openrtx/src/ui/default/ui.c
@@ -94,7 +94,7 @@ extern void _ui_drawMenuTop(ui_state_t* ui_state);
 extern void _ui_drawMenuBank(ui_state_t* ui_state);
 extern void _ui_drawMenuChannel(ui_state_t* ui_state);
 extern void _ui_drawMenuContacts(ui_state_t* ui_state);
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
 extern void _ui_drawMenuGPS();
 extern void _ui_drawSettingsGPS(ui_state_t* ui_state);
 #endif
@@ -105,7 +105,7 @@ extern void _ui_drawMenuBackup(ui_state_t* ui_state);
 extern void _ui_drawMenuRestore(ui_state_t* ui_state);
 extern void _ui_drawMenuInfo(ui_state_t* ui_state);
 extern void _ui_drawMenuAbout();
-#ifdef RTC_PRESENT
+#ifdef CONFIG_RTC
 extern void _ui_drawSettingsTimeDate();
 extern void _ui_drawSettingsTimeDateSet(ui_state_t* ui_state);
 #endif
@@ -122,7 +122,7 @@ const char *menu_items[] =
     "Banks",
     "Channels",
     "Contacts",
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
     "GPS",
 #endif
     "Settings",
@@ -133,10 +133,10 @@ const char *menu_items[] =
 const char *settings_items[] =
 {
     "Display",
-#ifdef RTC_PRESENT
+#ifdef CONFIG_RTC
     "Time & Date",
 #endif
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
     "GPS",
 #endif
     "Radio",
@@ -156,7 +156,7 @@ const char *display_items[] =
     "Timer"
 };
 
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
 const char *settings_gps_items[] =
 {
     "GPS Enabled",
@@ -253,7 +253,7 @@ static const char *symbols_ITU_T_E161_callsign[] =
 const uint8_t menu_num = sizeof(menu_items)/sizeof(menu_items[0]);
 const uint8_t settings_num = sizeof(settings_items)/sizeof(settings_items[0]);
 const uint8_t display_num = sizeof(display_items)/sizeof(display_items[0]);
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
 const uint8_t settings_gps_num = sizeof(settings_gps_items)/sizeof(settings_gps_items[0]);
 #endif
 const uint8_t settings_radio_num = sizeof(settings_radio_items)/sizeof(settings_radio_items[0]);
@@ -506,7 +506,7 @@ static freq_t _ui_freq_add_digit(freq_t freq, uint8_t pos, uint8_t number)
     return freq += number * coefficient;
 }
 
-#ifdef RTC_PRESENT
+#ifdef CONFIG_RTC
 static void _ui_timedate_add_digit(datetime_t *timedate, uint8_t pos,
                                    uint8_t number)
 {
@@ -1022,9 +1022,9 @@ static void _ui_fsm_menuMacro(kbd_msg_t msg, bool *sync_rtx)
     if(msg.keys & KEY_LEFT || msg.keys & KEY_DOWN || msg.keys & KNOB_LEFT)
 #endif // PLATFORM_TTWRPLUS
     {
-#ifdef HAS_ABSOLUTE_KNOB // If the radio has an absolute position knob
+#ifdef CONFIG_KNOB_ABSOLUTE // If the radio has an absolute position knob
         state.settings.sqlLevel = platform_getChSelector() - 1;
-#endif // HAS_ABSOLUTE_KNOB
+#endif // CONFIG_KNOB_ABSOLUTE
         if(state.settings.sqlLevel > 0)
         {
             state.settings.sqlLevel -= 1;
@@ -1039,7 +1039,7 @@ static void _ui_fsm_menuMacro(kbd_msg_t msg, bool *sync_rtx)
     else if(msg.keys & KEY_RIGHT || msg.keys & KEY_UP || msg.keys & KNOB_RIGHT)
 #endif // PLATFORM_TTWRPLUS
     {
-#ifdef HAS_ABSOLUTE_KNOB
+#ifdef CONFIG_KNOB_ABSOLUTE
         state.settings.sqlLevel = platform_getChSelector() - 1;
 #endif
         if(state.settings.sqlLevel < 15)
@@ -1274,7 +1274,7 @@ void ui_saveState()
     last_state = state;
 }
 
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
 static float priorGPSSpeed = 0;
 static float priorGPSAltitude = 0;
 static float  priorGPSDirection = 500; // impossible value init.
@@ -1338,7 +1338,7 @@ static vpGPSInfoFlags_t GetGPSDirectionOrSpeedChanged()
 
     return whatChanged;
 }
-#endif // GPS_PRESENT
+#endif // CONFIG_GPS
 
 void ui_updateFSM(bool *sync_rtx)
 {
@@ -1776,7 +1776,7 @@ void ui_updateFSM(bool *sync_rtx)
                         case M_CONTACTS:
                             state.ui_screen = MENU_CONTACTS;
                             break;
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
                         case M_GPS:
                             state.ui_screen = MENU_GPS;
                             break;
@@ -1869,7 +1869,7 @@ void ui_updateFSM(bool *sync_rtx)
                 else if(msg.keys & KEY_ESC)
                     _ui_menuBack(MENU_TOP);
                 break;
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
             // GPS menu screen
             case MENU_GPS:
                 if ((msg.keys & KEY_F1) && (state.settings.vpLevel > vpBeep))
@@ -1898,12 +1898,12 @@ void ui_updateFSM(bool *sync_rtx)
                         case S_DISPLAY:
                             state.ui_screen = SETTINGS_DISPLAY;
                             break;
-#ifdef RTC_PRESENT
+#ifdef CONFIG_RTC
                         case S_TIMEDATE:
                             state.ui_screen = SETTINGS_TIMEDATE;
                             break;
 #endif
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
                         case S_GPS:
                             state.ui_screen = SETTINGS_GPS;
                             break;
@@ -1974,7 +1974,7 @@ void ui_updateFSM(bool *sync_rtx)
                 if(msg.keys & KEY_ESC)
                     _ui_menuBack(MENU_TOP);
                 break;
-#ifdef RTC_PRESENT
+#ifdef CONFIG_RTC
             // Time&Date settings screen
             case SETTINGS_TIMEDATE:
                 if(msg.keys & KEY_ENTER)
@@ -2084,7 +2084,7 @@ void ui_updateFSM(bool *sync_rtx)
                 else if(msg.keys & KEY_ESC)
                     _ui_menuBack(MENU_SETTINGS);
                 break;
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
             case SETTINGS_GPS:
                 if(msg.keys & KEY_LEFT || msg.keys & KEY_RIGHT ||
                    (ui_state.edit_mode &&
@@ -2428,7 +2428,7 @@ void ui_updateFSM(bool *sync_rtx)
     }
     else if(event.type == EVENT_STATUS)
     {
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
         if ((state.ui_screen == MENU_GPS) &&
             (!vp_isPlaying()) &&
             (state.settings.vpLevel > vpLow) &&
@@ -2438,7 +2438,7 @@ void ui_updateFSM(bool *sync_rtx)
             if (whatChanged != vpGPSNone)
                 vp_announceGPSInfo(whatChanged);
         }
-#endif //            GPS_PRESENT
+#endif //            CONFIG_GPS
 
         if (txOngoing || rtx_rxSquelchOpen())
         {
@@ -2496,7 +2496,7 @@ bool ui_updateGUI()
         case MENU_CONTACTS:
             _ui_drawMenuContacts(&ui_state);
             break;
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
         // GPS menu screen
         case MENU_GPS:
             _ui_drawMenuGPS();
@@ -2526,7 +2526,7 @@ bool ui_updateGUI()
         case MENU_ABOUT:
             _ui_drawMenuAbout();
             break;
-#ifdef RTC_PRESENT
+#ifdef CONFIG_RTC
         // Time&Date settings screen
         case SETTINGS_TIMEDATE:
             _ui_drawSettingsTimeDate();
@@ -2540,7 +2540,7 @@ bool ui_updateGUI()
         case SETTINGS_DISPLAY:
             _ui_drawSettingsDisplay(&ui_state);
             break;
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
         // GPS settings screen
         case SETTINGS_GPS:
             _ui_drawSettingsGPS(&ui_state);
diff --git a/openrtx/src/ui/default/ui_main.c b/openrtx/src/ui/default/ui_main.c
index 283a3043..e1e378c2 100644
--- a/openrtx/src/ui/default/ui_main.c
+++ b/openrtx/src/ui/default/ui_main.c
@@ -36,7 +36,7 @@ void _ui_drawMainBackground()
 
 void _ui_drawMainTop(ui_state_t * ui_state)
 {
-#ifdef RTC_PRESENT
+#ifdef CONFIG_RTC
     // Print clock on top bar
     datetime_t local_time = utcToLocalTime(last_state.time,
                                            last_state.settings.utc_timezone);
diff --git a/openrtx/src/ui/default/ui_menu.c b/openrtx/src/ui/default/ui_menu.c
index af8e0b0c..f3d15268 100644
--- a/openrtx/src/ui/default/ui_menu.c
+++ b/openrtx/src/ui/default/ui_menu.c
@@ -289,7 +289,7 @@ int _ui_getDisplayValueName(char *buf, uint8_t max_len, uint8_t index)
     return 0;
 }
 
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
 int _ui_getSettingsGPSEntryName(char *buf, uint8_t max_len, uint8_t index)
 {
     if(index >= settings_gps_num) return -1;
@@ -594,7 +594,7 @@ void _ui_drawMenuContacts(ui_state_t* ui_state)
     _ui_drawMenuList(ui_state->menu_selected, _ui_getContactName);
 }
 
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
 void _ui_drawMenuGPS()
 {
     char *fix_buf, *type_buf;
@@ -808,7 +808,7 @@ void _ui_drawSettingsDisplay(ui_state_t* ui_state)
                            _ui_getDisplayValueName);
 }
 
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
 void _ui_drawSettingsGPS(ui_state_t* ui_state)
 {
     gfx_clearScreen();
@@ -822,7 +822,7 @@ void _ui_drawSettingsGPS(ui_state_t* ui_state)
 }
 #endif
 
-#ifdef RTC_PRESENT
+#ifdef CONFIG_RTC
 void _ui_drawSettingsTimeDate()
 {
     gfx_clearScreen();
diff --git a/openrtx/src/ui/module17/ui.c b/openrtx/src/ui/module17/ui.c
index fecfc4a4..aef5845b 100644
--- a/openrtx/src/ui/module17/ui.c
+++ b/openrtx/src/ui/module17/ui.c
@@ -44,14 +44,14 @@ extern void _ui_drawMainVFOInput(ui_state_t* ui_state);
 extern void _ui_drawMainMEM(ui_state_t* ui_state);
 /* UI menu functions, their implementation is in "ui_menu.c" */
 extern void _ui_drawMenuTop(ui_state_t* ui_state);
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
 extern void _ui_drawMenuGPS();
 extern void _ui_drawSettingsGPS(ui_state_t* ui_state);
 #endif
 extern void _ui_drawMenuSettings(ui_state_t* ui_state);
 extern void _ui_drawMenuInfo(ui_state_t* ui_state);
 extern void _ui_drawMenuAbout();
-#ifdef RTC_PRESENT
+#ifdef CONFIG_RTC
 extern void _ui_drawSettingsTimeDate();
 extern void _ui_drawSettingsTimeDateSet(ui_state_t* ui_state);
 #endif
@@ -64,7 +64,7 @@ extern bool _ui_drawMacroMenu(ui_state_t* ui_state);
 const char *menu_items[] =
 {
     "Settings",
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
     "GPS",
 #endif
     "Info",
@@ -75,10 +75,10 @@ const char *menu_items[] =
 const char *settings_items[] =
 {
     "Display",
-#ifdef RTC_PRESENT
+#ifdef CONFIG_RTC
     "Time & Date",
 #endif
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
     "GPS",
 #endif
     "M17",
@@ -110,7 +110,7 @@ const char *module17_items[] =
     "Mic Gain"
 };
 
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
 const char *settings_gps_items[] =
 {
     "GPS Enabled",
@@ -172,7 +172,7 @@ static const char symbols_callsign[] = "_ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890/-.
 const uint8_t menu_num = sizeof(menu_items)/sizeof(menu_items[0]);
 const uint8_t settings_num = sizeof(settings_items)/sizeof(settings_items[0]);
 const uint8_t display_num = sizeof(display_items)/sizeof(display_items[0]);
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
 const uint8_t settings_gps_num = sizeof(settings_gps_items)/sizeof(settings_gps_items[0]);
 #endif
 const uint8_t m17_num = sizeof(m17_items)/sizeof(m17_items[0]);
@@ -332,7 +332,7 @@ freq_t _ui_freq_add_digit(freq_t freq, uint8_t pos, uint8_t number)
     return freq += number * coefficient;
 }
 
-#ifdef RTC_PRESENT
+#ifdef CONFIG_RTC
 void _ui_timedate_add_digit(datetime_t *timedate, uint8_t pos, uint8_t number)
 {
     switch(pos)
diff --git a/openrtx/src/ui/module17/ui_main.c b/openrtx/src/ui/module17/ui_main.c
index b2a75d90..74cdf1ac 100644
--- a/openrtx/src/ui/module17/ui_main.c
+++ b/openrtx/src/ui/module17/ui_main.c
@@ -35,7 +35,7 @@ void _ui_drawMainBackground()
 
 void _ui_drawMainTop()
 {
-#ifdef RTC_PRESENT
+#ifdef CONFIG_RTC
     // Print clock on top bar
     datetime_t local_time = utcToLocalTime(last_state.time,
                                            last_state.settings.utc_timezone);
diff --git a/openrtx/src/ui/module17/ui_menu.c b/openrtx/src/ui/module17/ui_menu.c
index 6c552b60..36569b8c 100644
--- a/openrtx/src/ui/module17/ui_menu.c
+++ b/openrtx/src/ui/module17/ui_menu.c
@@ -251,7 +251,7 @@ int _ui_getModule17ValueName(char *buf, uint8_t max_len, uint8_t index)
     return 0;
 }
 
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
 int _ui_getSettingsGPSEntryName(char *buf, uint8_t max_len, uint8_t index)
 {
     if(index >= settings_gps_num) return -1;
@@ -318,7 +318,7 @@ void _ui_drawMenuTop(ui_state_t* ui_state)
     _ui_drawMenuList(ui_state->menu_selected, _ui_getMenuTopEntryName);
 }
 
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
 void _ui_drawMenuGPS()
 {
     char *fix_buf, *type_buf;
@@ -458,7 +458,7 @@ void _ui_drawSettingsDisplay(ui_state_t* ui_state)
                            _ui_getDisplayValueName);
 }
 
-#ifdef GPS_PRESENT
+#ifdef CONFIG_GPS
 void _ui_drawSettingsGPS(ui_state_t* ui_state)
 {
     gfx_clearScreen();
@@ -472,7 +472,7 @@ void _ui_drawSettingsGPS(ui_state_t* ui_state)
 }
 #endif
 
-#ifdef RTC_PRESENT
+#ifdef CONFIG_RTC
 void _ui_drawSettingsTimeDate()
 {
     gfx_clearScreen();
diff --git a/platform/targets/MD-3x0/hwconfig.h b/platform/targets/MD-3x0/hwconfig.h
index 3799538e..c2520062 100644
--- a/platform/targets/MD-3x0/hwconfig.h
+++ b/platform/targets/MD-3x0/hwconfig.h
@@ -28,13 +28,13 @@ extern "C" {
 #endif
 
 /* Device has a working real time clock */
-#define RTC_PRESENT
+#define CONFIG_RTC
 
 /* Device supports an optional GPS chip */
-#define GPS_PRESENT
+#define CONFIG_GPS
 
 /* Device has a channel selection knob */
-#define HAS_ABSOLUTE_KNOB
+#define CONFIG_KNOB_ABSOLUTE
 
 /* Screen dimensions */
 #define CONFIG_SCREEN_WIDTH 160
diff --git a/platform/targets/MD-9600/hwconfig.h b/platform/targets/MD-9600/hwconfig.h
index 070f8ae0..ef6a940d 100644
--- a/platform/targets/MD-9600/hwconfig.h
+++ b/platform/targets/MD-9600/hwconfig.h
@@ -29,10 +29,10 @@ extern "C" {
 #endif
 
 /* Device has a working real time clock */
-#define RTC_PRESENT
+#define CONFIG_RTC
 
 /* Device supports an optional GPS chip */
-#define GPS_PRESENT
+#define CONFIG_GPS
 
 /* Screen dimensions */
 #define CONFIG_SCREEN_WIDTH 128
diff --git a/platform/targets/MD-UV3x0/hwconfig.h b/platform/targets/MD-UV3x0/hwconfig.h
index ea6bfdec..ff29809f 100644
--- a/platform/targets/MD-UV3x0/hwconfig.h
+++ b/platform/targets/MD-UV3x0/hwconfig.h
@@ -28,10 +28,10 @@ extern "C" {
 #endif
 
 /* Device has a working real time clock */
-#define RTC_PRESENT
+#define CONFIG_RTC
 
 /* Device supports an optional GPS chip */
-#define GPS_PRESENT
+#define CONFIG_GPS
 
 /* Screen dimensions */
 #define CONFIG_SCREEN_WIDTH 160
diff --git a/platform/targets/ttwrplus/hwconfig.h b/platform/targets/ttwrplus/hwconfig.h
index 5da4c77e..5e06e4f3 100644
--- a/platform/targets/ttwrplus/hwconfig.h
+++ b/platform/targets/ttwrplus/hwconfig.h
@@ -29,7 +29,7 @@
 #define CONFIG_SCREEN_WIDTH  DT_PROP(DISPLAY, width)
 #define CONFIG_SCREEN_HEIGHT DT_PROP(DISPLAY, height)
 #define CONFIG_PIX_FMT_BW
-#define GPS_PRESENT
+#define CONFIG_GPS
 
 #define CONFIG_BAT_LIPO_1S