diff --git a/es-core/src/components/DateTimeComponent.cpp b/es-core/src/components/DateTimeComponent.cpp
index 485e895b6..8cc17de92 100644
--- a/es-core/src/components/DateTimeComponent.cpp
+++ b/es-core/src/components/DateTimeComponent.cpp
@@ -179,9 +179,9 @@ void DateTimeComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
             mThemeMetadata = metadata;
         }
         else {
-            LOG(LogWarning) << "DateTimeComponent: Invalid theme configuration, property "
-                               "<metadata> defined as \""
-                            << metadata << "\"";
+            LOG(LogError) << "DateTimeComponent: Invalid theme configuration, property "
+                             "<metadata> defined as \""
+                          << metadata << "\"";
         }
     }
 
diff --git a/es-core/src/components/TextComponent.cpp b/es-core/src/components/TextComponent.cpp
index fed620366..cd8c094bb 100644
--- a/es-core/src/components/TextComponent.cpp
+++ b/es-core/src/components/TextComponent.cpp
@@ -453,14 +453,14 @@ void TextComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
     if (properties & METADATA && elem->has("systemdata")) {
         mThemeSystemdata = "";
         const std::string systemdata {elem->get<std::string>("systemdata")};
-        for (auto& type : systemdataTypes) {
+        for (auto& type : supportedSystemdataTypes) {
             if (type == systemdata) {
                 mThemeSystemdata = type;
                 break;
             }
         }
         if (mThemeSystemdata == "") {
-            LOG(LogWarning)
+            LOG(LogError)
                 << "TextComponent: Invalid theme configuration, property <systemdata> defined as \""
                 << systemdata << "\"";
         }
@@ -469,14 +469,15 @@ void TextComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
     if (properties & METADATA && elem->has("metadata")) {
         mThemeMetadata = "";
         const std::string metadata {elem->get<std::string>("metadata")};
-        for (auto& type : metadataTypes) {
+
+        for (auto& type : supportedMetadataTypes) {
             if (type == metadata) {
                 mThemeMetadata = type;
                 break;
             }
         }
         if (mThemeMetadata == "") {
-            LOG(LogWarning)
+            LOG(LogError)
                 << "TextComponent: Invalid theme configuration, property <metadata> defined as \""
                 << metadata << "\"";
         }
diff --git a/es-core/src/components/TextComponent.h b/es-core/src/components/TextComponent.h
index ffba57d96..889413ae0 100644
--- a/es-core/src/components/TextComponent.h
+++ b/es-core/src/components/TextComponent.h
@@ -91,10 +91,10 @@ private:
     void calculateExtent();
     void onColorChanged();
 
-    static inline std::vector<std::string> systemdataTypes {
+    static inline std::vector<std::string> supportedSystemdataTypes {
         "name", "fullname", "gamecount", "gamecount_games", "gamecount_favorites"};
 
-    static inline std::vector<std::string> metadataTypes {
+    static inline std::vector<std::string> supportedMetadataTypes {
         "name",   "description", "rating",     "developer",  "publisher",
         "genre",  "players",     "favorite",   "completed",  "kidgame",
         "broken", "playcount",   "controller", "altemulator"};