diff --git a/src/hasp/hasp.cpp b/src/hasp/hasp.cpp
index dbd78ec9..2882f053 100644
--- a/src/hasp/hasp.cpp
+++ b/src/hasp/hasp.cpp
@@ -619,7 +619,7 @@ void hasp_get_info(JsonDocument& doc)
     buffer += "s";
     info[F(D_INFO_UPTIME)] = buffer;
 
-    info = doc.createNestedObject(F("Device Memory"));
+    info = doc.createNestedObject(F(D_INFO_DEVICE_MEMORY));
     Parser::format_bytes(haspDevice.get_free_heap(), size_buf, sizeof(size_buf));
     info[F(D_INFO_FREE_HEAP)] = size_buf;
     Parser::format_bytes(haspDevice.get_free_max_block(), size_buf, sizeof(size_buf));
@@ -635,13 +635,13 @@ void hasp_get_info(JsonDocument& doc)
     }
 #endif
 
-    info = doc.createNestedObject(F("LVGL Memory"));
+    info = doc.createNestedObject(F(D_INFO_LVGL_MEMORY));
     lv_mem_monitor_t mem_mon;
     lv_mem_monitor(&mem_mon);
     Parser::format_bytes(mem_mon.total_size, size_buf, sizeof(size_buf));
-    info[F("Total")] = size_buf;
+    info[F(D_INFO_TOTAL_MEMORY)] = size_buf;
     Parser::format_bytes(mem_mon.free_size, size_buf, sizeof(size_buf));
-    info[F("Free")]               = size_buf;
+    info[F(D_INFO_FREE_MEMORY)]   = size_buf;
     info[F(D_INFO_FRAGMENTATION)] = mem_mon.frag_pct;
 
     info = doc.createNestedObject(F("HASP State"));
diff --git a/src/lang/en_US.h b/src/lang/en_US.h
index 56770bb9..2c184585 100644
--- a/src/lang/en_US.h
+++ b/src/lang/en_US.h
@@ -118,13 +118,54 @@
 #define D_HTTP_NEXT_PAGE "Next Page"
 #define D_HTTP_CALIBRATE "Calibrate"
 #define D_HTTP_SCREENSHOT "Screenshot"
-#define D_HTTP_FILE_BROWSER "File Editor"
+#define D_HTTP_FILE_BROWSER "File Editor" // Updated
 #define D_HTTP_FIRMWARE_UPGRADE "Firmware Upgrade"
 #define D_HTTP_UPDATE_FIRMWARE "Update Firmware"
 #define D_HTTP_FACTORY_RESET "Factory Reset"
 #define D_HTTP_MAIN_MENU "Main Menu"
 #define D_HTTP_REBOOT "Restart"
 #define D_HTTP_CONFIGURATION "Configuration"
+#define D_HTTP_FOOTER "by Francis Van Roie" // New
+
+// New
+#define D_INFO_VERSION "Version"
+#define D_INFO_BUILD_DATETIME "Build DateTime"
+#define D_INFO_UPTIME "Uptime"
+#define D_INFO_FREE_HEAP "Free Heap"
+#define D_INFO_FREE_BLOCK "Free Block"
+#define D_INFO_DEVICE_MEMORY "Device Memory"
+#define D_INFO_LVGL_MEMORY "LVGL Memory"
+#define D_INFO_TOTAL_MEMORY "Total"
+#define D_INFO_FREE_MEMORY "Free"
+#define D_INFO_FRAGMENTATION "Fragmentation"
+#define D_INFO_PSRAM_FREE "PSRam Free"
+#define D_INFO_PSRAM_SIZE "PSRam Size"
+#define D_INFO_FLASH_SIZE "Flash Size"
+#define D_INFO_SKETCH_USED "Program Size Used"
+#define D_INFO_SKETCH_FREE "Program Size Free"
+#define D_INFO_MODULE "Module"
+#define D_INFO_MODEL "Model"
+#define D_INFO_FREQUENCY "Frequency"
+#define D_INFO_CORE_VERSION "Core Version"
+#define D_INFO_RESET_REASON "Reset Reason"
+#define D_INFO_STATUS "Status"
+#define D_INFO_SERVER "Server"
+#define D_INFO_USERNAME "Username"
+#define D_INFO_CLIENTID "Client ID"
+#define D_INFO_CONNECTED "Connected"
+#define D_INFO_DISCONNECTED "Disconnected"
+#define D_INFO_RECEIVED "Received"
+#define D_INFO_PUBLISHED "Published"
+#define D_INFO_FAILED "Failed"
+#define D_INFO_ETHERNET "Ethernet"
+#define D_INFO_WIFI "Wifi"
+#define D_INFO_LINK_SPEED "Link Speed"
+#define D_INFO_SSID "SSID"
+#define D_INFO_RSSI "Signal Strength"
+#define D_INFO_IP_ADDRESS "IP Address"
+#define D_INFO_MAC_ADDRESS "MAC Address"
+#define D_INFO_GATEWAY "Gateway"
+#define D_INFO_DNS_SERVER "DNS Server"
 
 #define D_OOBE_MSG "Tap the screen to setup WiFi or connect to this Access Point:"
 #define D_OOBE_SCAN_TO_CONNECT "Scan to connect"
diff --git a/src/lang/nl_NL.h b/src/lang/nl_NL.h
index 1ba87519..c52db44e 100644
--- a/src/lang/nl_NL.h
+++ b/src/lang/nl_NL.h
@@ -124,6 +124,46 @@
 #define D_HTTP_MAIN_MENU "Hoofdmenu"
 #define D_HTTP_REBOOT "Herstarten"
 #define D_HTTP_CONFIGURATION "Configuratie"
+#define D_HTTP_FOOTER "door Francis Van Roie"
+
+#define D_INFO_VERSION "Versie"
+#define D_INFO_BUILD_DATETIME "Gecompileerd"
+#define D_INFO_UPTIME "Opgestart"
+#define D_INFO_FREE_HEAP "Vrije Heap"
+#define D_INFO_FREE_BLOCK "Vrije blok"
+#define D_INFO_DEVICE_MEMORY "Algemeen Geheugen"
+#define D_INFO_LVGL_MEMORY "LVGL Geheugen"
+#define D_INFO_TOTAL_MEMORY "Totaal"
+#define D_INFO_FREE_MEMORY "Vrij"
+#define D_INFO_FRAGMENTATION "Fragmentatie"
+#define D_INFO_PSRAM_FREE "PSRam Vrij"
+#define D_INFO_PSRAM_SIZE "PSRam Grootte"
+#define D_INFO_FLASH_SIZE "Flash Grootte"
+#define D_INFO_SKETCH_USED "Programma Grootte"
+#define D_INFO_SKETCH_FREE "Programma Vrij"
+#define D_INFO_MODULE "Module"
+#define D_INFO_MODEL "Model"
+#define D_INFO_FREQUENCY "Frequentie"
+#define D_INFO_CORE_VERSION "ESP-IDF Versie"
+#define D_INFO_RESET_REASON "Reden Herstart"
+#define D_INFO_STATUS "Status"
+#define D_INFO_SERVER "Server"
+#define D_INFO_USERNAME "Gerbuiker"
+#define D_INFO_CLIENTID "Client ID"
+#define D_INFO_CONNECTED "Verbonden"
+#define D_INFO_DISCONNECTED "Verbroken"
+#define D_INFO_RECEIVED "Ontvangen"
+#define D_INFO_PUBLISHED "Gepubliceerd"
+#define D_INFO_FAILED "Mislukt"
+#define D_INFO_ETHERNET "Ethernet"
+#define D_INFO_WIFI "Wifi"
+#define D_INFO_LINK_SPEED "Snelheid"
+#define D_INFO_SSID "SSID"
+#define D_INFO_RSSI "Signaalsterkte"
+#define D_INFO_IP_ADDRESS "IP Adres"
+#define D_INFO_MAC_ADDRESS "Fysiek adres (MAC)"
+#define D_INFO_GATEWAY "Gateway"
+#define D_INFO_DNS_SERVER "DNS Server"
 
 #define D_OOBE_MSG "Raak het scherm aan om WiFi in te stellen of meld je aan op AP:"
 #define D_OOBE_SCAN_TO_CONNECT "Scan code"