From 1ca082b7a5c8dd142d71f1d411da37eae546328f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Costa?= <andre_miguel_costa@hotmail.com>
Date: Tue, 12 May 2026 09:31:20 +0200
Subject: [PATCH] refactor(theme): flatten theme directory structure (#10115)

---
 include/lvgl/lvgl.h                                  | 6 +++---
 include/lvgl/themes/lv_theme.h                       | 6 +++---
 include/lvgl/themes/{default => }/lv_theme_default.h | 2 +-
 include/lvgl/themes/{mono => }/lv_theme_mono.h       | 2 +-
 include/lvgl/themes/{simple => }/lv_theme_simple.h   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename include/lvgl/themes/{default => }/lv_theme_default.h (98%)
 rename include/lvgl/themes/{mono => }/lv_theme_mono.h (97%)
 rename include/lvgl/themes/{simple => }/lv_theme_simple.h (94%)

diff --git a/include/lvgl/lvgl.h b/include/lvgl/lvgl.h
index cb08117e74..2a5dcf6569 100644
--- a/include/lvgl/lvgl.h
+++ b/include/lvgl/lvgl.h
@@ -171,10 +171,10 @@
 #include "stdlib/lv_mem.h"
 #include "stdlib/lv_sprintf.h"
 #include "stdlib/lv_string.h"
-#include "themes/default/lv_theme_default.h"
 #include "themes/lv_theme.h"
-#include "themes/mono/lv_theme_mono.h"
-#include "themes/simple/lv_theme_simple.h"
+#include "themes/lv_theme_default.h"
+#include "themes/lv_theme_mono.h"
+#include "themes/lv_theme_simple.h"
 #include "tick/lv_tick.h"
 #include "widgets/lv_3dtexture.h"
 #include "widgets/lv_animimage.h"
diff --git a/include/lvgl/themes/lv_theme.h b/include/lvgl/themes/lv_theme.h
index dab88a4e4b..f624dd2b7b 100644
--- a/include/lvgl/themes/lv_theme.h
+++ b/include/lvgl/themes/lv_theme.h
@@ -133,9 +133,9 @@ void lv_theme_set_external_data(lv_theme_t * theme, void * data, void (* free_cb
  *    MACROS
  **********************/
 
-#include "default/lv_theme_default.h"
-#include "mono/lv_theme_mono.h"
-#include "simple/lv_theme_simple.h"
+#include "lv_theme_default.h"
+#include "lv_theme_mono.h"
+#include "lv_theme_simple.h"
 
 #ifdef __cplusplus
 } /*extern "C"*/
diff --git a/include/lvgl/themes/default/lv_theme_default.h b/include/lvgl/themes/lv_theme_default.h
similarity index 98%
rename from include/lvgl/themes/default/lv_theme_default.h
rename to include/lvgl/themes/lv_theme_default.h
index 26fad8de1e..26cc26036c 100644
--- a/include/lvgl/themes/default/lv_theme_default.h
+++ b/include/lvgl/themes/lv_theme_default.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_theme.h"
+#include "lv_theme.h"
 
 #if LV_USE_THEME_DEFAULT
 
diff --git a/include/lvgl/themes/mono/lv_theme_mono.h b/include/lvgl/themes/lv_theme_mono.h
similarity index 97%
rename from include/lvgl/themes/mono/lv_theme_mono.h
rename to include/lvgl/themes/lv_theme_mono.h
index 794411b499..7395d99ca7 100644
--- a/include/lvgl/themes/mono/lv_theme_mono.h
+++ b/include/lvgl/themes/lv_theme_mono.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_theme.h"
+#include "lv_theme.h"
 
 #if LV_USE_THEME_MONO
 
diff --git a/include/lvgl/themes/simple/lv_theme_simple.h b/include/lvgl/themes/lv_theme_simple.h
similarity index 94%
rename from include/lvgl/themes/simple/lv_theme_simple.h
rename to include/lvgl/themes/lv_theme_simple.h
index 4b02a0e60c..504251a913 100644
--- a/include/lvgl/themes/simple/lv_theme_simple.h
+++ b/include/lvgl/themes/lv_theme_simple.h
@@ -13,8 +13,8 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_theme.h"
-#include "../../display/lv_display.h"
+#include "lv_theme.h"
+#include "../display/lv_display.h"
 
 #if LV_USE_THEME_SIMPLE