diff --git a/radio/sdcard/taranis/TEMPLATES/S6R.lua b/radio/sdcard/taranis/TEMPLATES/S6R.lua
index 504a346e4..d97322eb7 100644
--- a/radio/sdcard/taranis/TEMPLATES/S6R.lua
+++ b/radio/sdcard/taranis/TEMPLATES/S6R.lua
@@ -68,7 +68,7 @@ end
 -- Redraw the current page
 local function redrawPage()
   lcd.clear()
-  lcd.drawScreenTitle("S8R", 0, 0)
+  lcd.drawScreenTitle("S6R", 0, 0)
 
   if refreshIndex < #fields then
     drawProgressBar()
diff --git a/radio/src/gui/taranis/fonts.cpp b/radio/src/gui/taranis/fonts.cpp
index 4a6be2214..f46c820c2 100644
--- a/radio/src/gui/taranis/fonts.cpp
+++ b/radio/src/gui/taranis/fonts.cpp
@@ -1,23 +1,23 @@
-/*
- * Copyright (C) OpenTX
- *
- * Based on code named
- *   th9x - http://code.google.com/p/th9x 
- *   er9x - http://code.google.com/p/er9x
- *   gruvin9x - http://code.google.com/p/gruvin9x
- *
- * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x 
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 #include "../../opentx.h"
 
 const pm_uchar font_5x7[] PROGMEM = {
@@ -43,11 +43,9 @@ const pm_uchar font_5x7[] PROGMEM = {
 #endif
 };
 
-#if defined(BOLD_FONT)
 const pm_uchar font_5x7_B[] PROGMEM = {
 #include "font_05x07_B_compressed.lbm"
 };
-#endif
 
 #if !defined(BOOT)
 const pm_uchar font_10x14[] PROGMEM = {
diff --git a/radio/src/gui/taranis/helpers.cpp b/radio/src/gui/taranis/helpers.cpp
index 470c34c7b..f346aa56f 100644
--- a/radio/src/gui/taranis/helpers.cpp
+++ b/radio/src/gui/taranis/helpers.cpp
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#include "../../opentx.h"
+#include "opentx.h"
 
 uint8_t switchToMix(uint8_t source)
 {
diff --git a/radio/src/gui/taranis/menu_general.cpp b/radio/src/gui/taranis/menu_general.cpp
index bfc9a1e71..ff7cc8bca 100644
--- a/radio/src/gui/taranis/menu_general.cpp
+++ b/radio/src/gui/taranis/menu_general.cpp
@@ -18,10 +18,10 @@
  * GNU General Public License for more details.
  */
 
-#include "../../opentx.h"
-
-void menuGeneralCustomFunctions(uint8_t event)
-{
-  MENU(STR_MENUGLOBALFUNCS, menuTabGeneral, e_GeneralCustomFunctions, NUM_CFN, { NAVIGATION_LINE_BY_LINE|4/*repeated*/ });
-  return menuCustomFunctions(event, g_eeGeneral.customFn, &globalFunctionsContext);
-}
+#include "opentx.h"
+
+void menuGeneralCustomFunctions(uint8_t event)
+{
+  MENU(STR_MENUGLOBALFUNCS, menuTabGeneral, e_GeneralCustomFunctions, NUM_CFN, { NAVIGATION_LINE_BY_LINE|4/*repeated*/ });
+  return menuCustomFunctions(event, g_eeGeneral.customFn, &globalFunctionsContext);
+}
diff --git a/radio/src/gui/taranis/menu_general_diagkeys.cpp b/radio/src/gui/taranis/menu_general_diagkeys.cpp
index 2c79f12fc..fe310d99c 100644
--- a/radio/src/gui/taranis/menu_general_diagkeys.cpp
+++ b/radio/src/gui/taranis/menu_general_diagkeys.cpp
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#include "../../opentx.h"
+#include "opentx.h"
 
 void displayKeyState(uint8_t x, uint8_t y, EnumKeys key)
 {
diff --git a/radio/src/gui/taranis/menu_general_hardware.cpp b/radio/src/gui/taranis/menu_general_hardware.cpp
index 7a8a88fe1..ec3431073 100644
--- a/radio/src/gui/taranis/menu_general_hardware.cpp
+++ b/radio/src/gui/taranis/menu_general_hardware.cpp
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#include "../../opentx.h"
+#include "opentx.h"
 
 enum menuGeneralHwItems {
   ITEM_SETUP_HW_LABEL_STICKS,
diff --git a/radio/src/gui/taranis/menu_general_sdmanager.cpp b/radio/src/gui/taranis/menu_general_sdmanager.cpp
index ebc551804..039229b02 100644
--- a/radio/src/gui/taranis/menu_general_sdmanager.cpp
+++ b/radio/src/gui/taranis/menu_general_sdmanager.cpp
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#include "../../opentx.h"
+#include "opentx.h"
 
 #define REFRESH_FILES()        do { reusableBuffer.sdmanager.offset = 65535; menuVerticalPosition = 0; } while(0)
 #define NODE_TYPE(fname)       fname[SD_SCREEN_FILE_LENGTH+1]
diff --git a/radio/src/gui/taranis/menu_general_version.cpp b/radio/src/gui/taranis/menu_general_version.cpp
index eabf57ac5..dcb16def4 100644
--- a/radio/src/gui/taranis/menu_general_version.cpp
+++ b/radio/src/gui/taranis/menu_general_version.cpp
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#include "../../opentx.h"
+#include "opentx.h"
 
 void backupEeprom()
 {
diff --git a/radio/src/gui/taranis/menu_model.cpp b/radio/src/gui/taranis/menu_model.cpp
index 0eca0511e..813670e08 100644
--- a/radio/src/gui/taranis/menu_model.cpp
+++ b/radio/src/gui/taranis/menu_model.cpp
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#include "../../opentx.h"
+#include "opentx.h"
 
 #if MENU_COLUMNS > 1
 uint8_t editDelay(const coord_t x, const coord_t y, const uint8_t event, const uint8_t attr, const pm_char *str, uint8_t delay)
diff --git a/radio/src/gui/taranis/menu_model_curves.cpp b/radio/src/gui/taranis/menu_model_curves.cpp
index baf1d4de7..7fe47edd8 100644
--- a/radio/src/gui/taranis/menu_model_curves.cpp
+++ b/radio/src/gui/taranis/menu_model_curves.cpp
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#include "../../opentx.h"
+#include "opentx.h"
 
 uint8_t s_curveChan;
 
diff --git a/radio/src/gui/taranis/menu_model_gvars.cpp b/radio/src/gui/taranis/menu_model_gvars.cpp
index 3d11651f9..a2d0dbdbe 100644
--- a/radio/src/gui/taranis/menu_model_gvars.cpp
+++ b/radio/src/gui/taranis/menu_model_gvars.cpp
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#include "../../opentx.h"
+#include "opentx.h"
 
 void editGVarValue(coord_t x, coord_t y, uint8_t event, uint8_t gvar, uint8_t flightMode, LcdFlags flags)
 {
diff --git a/radio/src/gui/taranis/popups.cpp b/radio/src/gui/taranis/popups.cpp
index 92893aa09..6f73b01ed 100644
--- a/radio/src/gui/taranis/popups.cpp
+++ b/radio/src/gui/taranis/popups.cpp
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#include "../../opentx.h"
+#include "opentx.h"
 
 const char *warningText = NULL;
 const char *warningInfoText;
diff --git a/radio/src/gui/taranis/view_about.cpp b/radio/src/gui/taranis/view_about.cpp
index 221dbde37..e2224ff94 100644
--- a/radio/src/gui/taranis/view_about.cpp
+++ b/radio/src/gui/taranis/view_about.cpp
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#include "../../opentx.h"
+#include "opentx.h"
 
 const pm_uchar about_bmp[] PROGMEM = {
 #include "../../bitmaps/taranis/about.lbm"
diff --git a/radio/src/gui/taranis/view_text.cpp b/radio/src/gui/taranis/view_text.cpp
index e8854be85..b470412b8 100644
--- a/radio/src/gui/taranis/view_text.cpp
+++ b/radio/src/gui/taranis/view_text.cpp
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#include "../../opentx.h"
+#include "opentx.h"
 
 #define TEXT_FILE_MAXSIZE     2048