1 files changed, 17 insertions, 16 deletions
diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp
index ca86fbb28..8ad436a60 100644
--- a/src/gui/userpalette.cpp
+++ b/src/gui/userpalette.cpp
@@ -284,65 +284,66 @@ UserPalette::UserPalette() :
     addLabel(UserColorId::LABEL_HP,
         // TRANSLATORS: palette label
         _("Hp bars"));
-    addColor(UserColorId::PLAYER_HP,
+    addColor(UserColorId::PLAYER_HP_FG,
         0x00ff00,
         GradientType::STATIC,
         // TRANSLATORS: palette color
-        _("Player HP bar"), 50);
-    addColor(UserColorId::PLAYER_HP2,
+        _("Player HP bar"),
+        50);
+    addColor(UserColorId::PLAYER_HP_BG,
         0xff0000,
         GradientType::STATIC,
         // TRANSLATORS: palette color
-        _("Player HP bar (second color)"),
+        _("Player HP bar (background)"),
         50);
-    addColor(UserColorId::MONSTER_HP,
+    addColor(UserColorId::MONSTER_HP_FG,
         0x00ff00,
         GradientType::STATIC,
         // TRANSLATORS: palette color
         _("Monster HP bar"),
         50);
-    addColor(UserColorId::MONSTER_HP2,
+    addColor(UserColorId::MONSTER_HP_BG,
         0xff0000,
         GradientType::STATIC,
         // TRANSLATORS: palette color
-        _("Monster HP bar (second color)"),
+        _("Monster HP bar (background)"),
         50);
-    addColor(UserColorId::HOMUN_HP,
+    addColor(UserColorId::HOMUN_HP_FG,
         0x00ff00,
         GradientType::STATIC,
         // TRANSLATORS: palette color
         _("Homunculus HP bar"),
         50);
-    addColor(UserColorId::HOMUN_HP2,
+    addColor(UserColorId::HOMUN_HP_BG,
         0xff0000,
         GradientType::STATIC,
         // TRANSLATORS: palette color
-        _("Homunculus HP bar (second color)"),
+        _("Homunculus HP bar (background)"),
         50);
-    addColor(UserColorId::MERC_HP,
+    addColor(UserColorId::MERC_HP_FG,
         0x00ff00,
         GradientType::STATIC,
         // TRANSLATORS: palette color
         _("Mercenary HP bar"),
         50);
-    addColor(UserColorId::MERC_HP2,
+    addColor(UserColorId::MERC_HP_BG,
         0xff0000,
         GradientType::STATIC,
         // TRANSLATORS: palette color
-        _("Mercenary HP bar (second color)"),
+        _("Mercenary HP bar (background)"),
         50);
 
-    addColor(UserColorId::ELEMENTAL_HP,
+    addColor(UserColorId::ELEMENTAL_HP_FG,
         0x00ff00,
         GradientType::STATIC,
         // TRANSLATORS: palette color
         _("Elemental HP bar"),
         50);
-    addColor(UserColorId::ELEMENTAL_HP2,
+    addColor(UserColorId::ELEMENTAL_HP_BG,
         0xff0000,
         GradientType::STATIC,
         // TRANSLATORS: palette color
-        _("Elemental HP bar (second color)"),
+        _("Elemental HP bar (background)"),
         50);
     addLabel(UserColorId::LABEL_HITS,
         // TRANSLATORS: palette label