diff --git a/common/theme.c b/common/theme.c
index a67069f..aa63c8b 100644
--- a/common/theme.c
+++ b/common/theme.c
@@ -148,13 +148,21 @@ void themeStartup(ThemePreset preset) {
                 .hbmenuLogoImage = themeDefault->hbmenuLogoImage
             };
             strncpy(themeCurrent.buttonAText, AText, sizeof(themeCurrent.buttonAText)-1);
+            themeCurrent.buttonAText[sizeof(themeCurrent.buttonAText)-1] = 0;
             strncpy(themeCurrent.buttonBText, BText, sizeof(themeCurrent.buttonBText)-1);
+            themeCurrent.buttonBText[sizeof(themeCurrent.buttonBText)-1] = 0;
             strncpy(themeCurrent.buttonXText, XText, sizeof(themeCurrent.buttonXText)-1);
+            themeCurrent.buttonXText[sizeof(themeCurrent.buttonXText)-1] = 0;
             strncpy(themeCurrent.buttonYText, YText, sizeof(themeCurrent.buttonYText)-1);
+            themeCurrent.buttonYText[sizeof(themeCurrent.buttonYText)-1] = 0;
             strncpy(themeCurrent.buttonPText, PText, sizeof(themeCurrent.buttonPText)-1);
+            themeCurrent.buttonPText[sizeof(themeCurrent.buttonPText)-1] = 0;
             strncpy(themeCurrent.buttonMText, MText, sizeof(themeCurrent.buttonMText)-1);
-            strncpy(themeCurrent.labelStarOffText, starOffText, sizeof(themeCurrent.labelStarOffText)-1);
+            themeCurrent.buttonMText[sizeof(themeCurrent.buttonMText)-1] = 0;
             strncpy(themeCurrent.labelStarOnText, starOnText, sizeof(themeCurrent.labelStarOnText)-1);
+            themeCurrent.labelStarOnText[sizeof(themeCurrent.labelStarOnText)-1] = 0;
+            strncpy(themeCurrent.labelStarOffText, starOffText, sizeof(themeCurrent.labelStarOffText)-1);
+            themeCurrent.labelStarOffText[sizeof(themeCurrent.labelStarOffText)-1] = 0;
         } else {
             themeCurrent = *themeDefault;
         }