diff --git a/src/hasp.cpp b/src/hasp.cpp
index 272f0d7b..72b60d73 100644
--- a/src/hasp.cpp
+++ b/src/hasp.cpp
@@ -584,14 +584,6 @@ void haspSetup(JsonObject settings)
 {
     guiSetDim(haspStartDim);
 
-    /* Create all screens */
-    for(uint8_t i = 0; i < (sizeof pages / sizeof *pages); i++) {
-        pages[i] = lv_obj_create(NULL, NULL);
-        // lv_obj_set_size(pages[0], hres, vres);
-    }
-
-    // haspSetConfig(settings);
-
     /*
     #ifdef LV_HASP_HOR_RES_MAX
         lv_coord_t hres = LV_HASP_HOR_RES_MAX;
@@ -684,6 +676,12 @@ void haspSetup(JsonObject settings)
     }
     // lv_theme_set_current(th);
 
+    /* Create all screens using the theme */
+    for(uint8_t i = 0; i < (sizeof pages / sizeof *pages); i++) {
+        pages[i] = lv_obj_create(NULL, NULL);
+        // lv_obj_set_size(pages[0], hres, vres);
+    }
+
     haspDisconnect();
     haspLoadPage(haspPagesPath);
     haspSetPage(haspStartPage);
diff --git a/src/hasp_mqtt.cpp b/src/hasp_mqtt.cpp
index c8e74950..f9530acc 100644
--- a/src/hasp_mqtt.cpp
+++ b/src/hasp_mqtt.cpp
@@ -208,7 +208,7 @@ void mqtt_send_statusupdate()
     doc[F("heapFrag")]     = halGetHeapFragmentation();
     doc[F("espCanUpdate")] = false;
     doc[F("espCore")]      = halGetCoreVersion().c_str();
-    doc[F("tftDriver")]    = tftDriverName();
+    doc[F("tftDriver")]    = tftDriverName().c_str();
 
 #if defined(ARDUINO_ARCH_ESP8266)
     doc[F("espVcc")] = (float)ESP.getVcc() / 1000;