diff --git a/ba/ba0100.cpp b/ba/ba0100.cpp
index 22ff3fade..eed514238 100755
--- a/ba/ba0100.cpp
+++ b/ba/ba0100.cpp
@@ -462,10 +462,11 @@ void TColor_mask::load_themes()
 bool TColor_mask::find_themes_ini(TFilename& ininame) const
 {
   ininame = get_oem_info("Themes");
+  ininame.insert("setup/");
   bool ok = ininame.exist();
   if (!ok)
   {
-    ininame = "res/themes.ini";
+    ininame = "res/themes.ini"; // Compatibility mode
     ok = ininame.exist();
   }
   return ok;
@@ -495,6 +496,16 @@ bool TColor_mask::apply_theme()
     if (!colors.empty())
     {
       _color = colors;
+      FOR_EACH_MASK_FIELD((*this), i, f)
+      {
+        const TFieldref* fr = f->field();
+        if (fr != NULL)
+        {
+          const TString* val = (const TString*)_color.objptr(fr->name());
+          if (val != NULL)
+            f->set(*val);
+        }
+      }
       applied = true;
     }
   }