diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000..a2a37f79
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: [bblanchon] # Replace with up to 4 GitHub Sponsors-enabled usernames
+patreon: # Replace with a single Patreon username
+open_collective: lvgl # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: ['https://www.buymeacoffee.com/gW5rPpsKR','https://arduinojson.org/book/'] # Up to 4 links
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 834e4a9b..e25e3be3 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,8 +2,9 @@
 name: Bug report
 about: Create a bug report to help us improve
 title: ''
-labels: 'bug'
-assignees: ''
+labels: bug
+assignees: fvanroie
+
 ---
 
 <!--
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..11fc491e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/other-question.md b/.github/ISSUE_TEMPLATE/other-question.md
new file mode 100644
index 00000000..698506b6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/other-question.md
@@ -0,0 +1,16 @@
+---
+name: Other Question
+about: Please use the forum or discord for general questions
+title: ''
+labels: question
+assignees: ''
+
+---
+
+## Questions
+
+We only keep bug reports and active requests being worked on in the issues tracker.
+
+For general questions we have opened the [discussion forum](https://github.com/fvanroie/hasp-lvgl/discussions) on github and [#hasp-lvgl channel](https://discord.gg/VCWyuhF) on Discord.
+
+If you are not sure if your question is related to the code development, feel free to ask!
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fa495979..47de5a2e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -4,53 +4,52 @@ on: [push]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Cache pip
-      uses: actions/cache@v2
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-    - name: Cache PlatformIO
-      uses: actions/cache@v2
-      with:
-        path: ~/.platformio
-        key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
-    - name: Set up Python
-      uses: actions/setup-python@v2
-    - name: Install PlatformIO
-      run: |
-        python -m pip install --upgrade pip
-        pip install --upgrade platformio
-    - name: Enable ESP platforms from platformio_override-template.ini
-      run: |
-        sed 's/; user_setups\/esp/user_setups\/esp/g' platformio_override-template.ini > platformio_override.ini
-    - name: Enable Linux platform from platformio_override.ini
-      run: |
-        sed -i 's/; user_setups\/linux/user_setups\/linux/g' platformio_override.ini
-        mkdir -p .pio/libdeps/linux_sdl_64bits/paho/src
-    - name: Install SDL2 library
-      run: |
-        sudo apt-get update
-        sudo apt-get install libsdl2-dev
-    - name: List all files in current folder
-      run: |
-        ls -la
-    - name: Cat platformio_override.ini
-      run: |
-        cat platformio_override.ini
-    - name: Run PlatformIO
-      run: pio run -e d1-mini-esp32_ili9341 -e lanbon_l8 -e wt32-sc01 -e d1-mini-esp8266_ili9341 -e linux_sdl_64bits
-    - name: Upload output file
-      uses: actions/upload-artifact@v2
-      with:
-        name: hasp-lvgl firmware.zip
-        path: build_output/firmware/*.bin
+      - uses: actions/checkout@v2
+      - name: Cache pip
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+      - name: Cache PlatformIO
+        uses: actions/cache@v2
+        with:
+          path: ~/.platformio
+          key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
+      - name: Set up Python
+        uses: actions/setup-python@v2
+      - name: Install PlatformIO
+        run: |
+          python -m pip install --upgrade pip
+          pip install --upgrade platformio
+      - name: Enable ESP platforms from platformio_override-template.ini
+        run: |
+          sed 's/; user_setups\/esp/user_setups\/esp/g' platformio_override-template.ini > platformio_override.ini
+      - name: Enable Linux platform from platformio_override.ini
+        run: |
+          sed -i 's/; user_setups\/linux/user_setups\/linux/g' platformio_override.ini
+          mkdir -p .pio/libdeps/linux_sdl_64bits/paho/src
+      - name: Install SDL2 library
+        run: |
+          sudo apt-get update
+          sudo apt-get install libsdl2-dev
+      - name: List all files in current folder
+        run: |
+          ls -la
+      - name: Cat platformio_override.ini
+        run: |
+          cat platformio_override.ini
+      - name: Run PlatformIO
+        run: pio run -e d1-mini-esp32_ili9341 -e lanbon_l8 -e wt32-sc01 -e d1-mini-esp8266_ili9341 -e linux_sdl_64bits
+      - name: Upload output file
+        uses: actions/upload-artifact@v2
+        with:
+          name: hasp-lvgl firmware.zip
+          path: build_output/firmware/*.bin
     #- name: Create release and upload firmware
     #  run: |
     #    set -x
diff --git a/LICENSE b/LICENSE
index 71b929c8..dfe689c9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,8 +1,7 @@
 MIT License
 
-Copyright (c) 2020 Francis Van Roie
-
-Based upon HASwitchPlate - Copyright (c) 2019 Allen Derusha allen@derusha.org
+Copyright (c) 2019-2021 Francis Van Roie
+Copyright (c) 2018-2019 Allen Derusha allen@derusha.org
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 1b7ddf49..6b4437fd 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # HASP - Open Hardware edition
 
 [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/fvanroie/hasp-lvgl/PlatformIO%20CI?label=build%20status&logo=github&logoColor=%23dddddd)](https://github.com/fvanroie/hasp-lvgl/actions?query=workflow%3A%22PlatformIO+CI%22)
-[![GitHub release](https://img.shields.io/github/release/fvanroie/hasp-lvgl.svg)](https://github.com/fvanroie/hasp-lvgl/releases)
+[![GitHub release](https://img.shields.io/github/v/release/fvanroie/hasp-lvgl?include_prereleases)](https://github.com/fvanroie/hasp-lvgl/releases)
 [![GitHub issues](https://img.shields.io/github/issues/fvanroie/hasp-lvgl.svg)](http://github.com/fvanroie/hasp-lvgl/issues)
 [![Discord](https://img.shields.io/discord/538814618106331137?color=%237289DA&label=support&logo=discord&logoColor=white)][6]
 [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](#Contributing)
diff --git a/src/lang/hu_HU.h b/src/lang/hu_HU.h
new file mode 100644
index 00000000..5a5141f6
--- /dev/null
+++ b/src/lang/hu_HU.h
@@ -0,0 +1,131 @@
+#ifndef	HASP_LANG_HU_HU_H			
+#define	HASP_LANG_HU_HU_H			
+				
+#define	D_USERNAME "Felhasználónév:"
+#define	D_PASSWORD "Jelszó:"
+#define	D_SSID "SSID:"
+
+#define	D_ERROR_OUT_OF_MEMORY "Elfogyott a memória"
+#define	D_ERROR_UNKNOWN "Ismeretlen hiba"
+
+#define	D_CONFIG_NOT_CHANGED "A beállítások nem változtak"
+#define	D_CONFIG_CHANGED "A beállítások megváltoztak"
+#define	D_CONFIG_LOADED "Beállítások betöltve"
+
+#define	D_FILE_LOADING "%s betöltése"
+#define	D_FILE_LOADED "%s betöltve"
+#define	D_FILE_LOAD_FAILED "%s betöltése nem sikerült"
+
+#define	D_FILE_SAVING "%s mentése"
+#define	D_FILE_SAVED "%s mentve"
+#define	D_FILE_SAVE_FAILED "%s mentése meghiúsult"
+
+#define	D_SERVICE_STARTING "Indítás..."
+#define	D_SERVICE_STARTED "Elindítva"
+#define	D_SERVICE_START_FAILED "Az indítás meghiúsult"
+#define	D_SERVICE_STOPPED "Megállva"
+#define	D_SERVICE_DISABLED "Tiltva"
+#define	D_SERVICE_CONNECTED "Csatlakoztatva"
+#define	D_SERVICE_DISCONNECTED "Szétkapcsolva"
+
+#define	D_NETWORK_IP_ADDRESS_RECEIVED "Beállított IP-cím: %s"
+#define	D_NETWORK_ONLINE "online"
+#define	D_NETWORK_OFFLINE "offline"
+#define	D_NETWORK_CONNECTION_FAILED "A kapcsolódás meghiúsult"
+
+#define	D_MQTT_DEFAULT_NAME "plate_%s"
+#define	D_MQTT_CONNECTING "Csatlakozás..."
+#define	D_MQTT_CONNECTED "Csatlakozva a %s szerverhez mint %s"
+#define	D_MQTT_NOT_CONNECTED "Nincs kapcsolat ???"
+#define	D_MQTT_DISCONNECTING "Szétkapcsolás..."
+#define	D_MQTT_DISCONNECTED "Szétkapcsolva"
+#define	D_MQTT_RECONNECTING "Lekapcsolva a szerverről, újracsatlakozás..."
+#define	D_MQTT_NOT_CONFIGURED "Nincs konfigurálva MQTT szerver"
+#define	D_MQTT_STARTED "Elindítva: %d bájt"
+#define	D_MQTT_FAILED "Nem sikerült:"
+#define	D_MQTT_INVALID_TOPIC "Az üzenet érvénytelen topik-ot tartalmaz"
+#define	D_MQTT_SUBSCRIBED "Feliratkozva: %s"
+#define	D_MQTT_NOT_SUBSCRIBED "Nem sikerült feliratkozni: %s"
+#define	D_MQTT_HA_AUTO_DISCOVERY "Regisztrálás HA automatikus felfedezésre"
+
+#define	D_TELNET_CLOSING_CONNECTION "Munkamenet befejezése %s-el"
+#define	D_TELNET_CLIENT_LOGIN_FROM "Kliens bejelentkezés innen: %s"
+#define	D_TELNET_CLIENT_CONNECT_FROM "Kliens csatlakozva innen: %s"
+#define	D_TELNET_CLIENT_NOT_CONNECTED "Kliens NEM csatlakozik"
+#define	D_TELNET_AUTHENTICATION_FAILED "A hitelesítés sikertelen!"
+#define	D_TELNET_INCORRECT_LOGIN_ATTEMPT "Helytelen bejelentkezési kísérlet %s-ről"
+#define	D_TELNET_STARTED "Telnet konzol elindítva"
+#define	D_TELNET_FAILED "Telnet konzol elindítása meghiúsult"
+#define	D_TELNET_CLIENT_CONNECTED "Kliens csatlakozva"
+#define	D_TELNET_CLIENT_NOT_CONNECTED "Kliens NEM csatlakozik"
+#define	D_TELNET_CLIENT_REJECTED "Kliens elutasítva"
+
+#define	D_HASP_INVALID_PAGE "Érvénytelen oldal: %u"
+#define	D_HASP_INVALID_LAYER "Nem törölhető a rendszerréteg"
+#define	D_HASP_CHANGE_PAGE "Oldalváltás: %u"
+#define	D_HASP_CLEAR_PAGE "Oldal törlése: %u"
+
+#define	D_OBJECT_DELETED "Objektum törölve"
+#define	D_OBJECT_UNKNOWN "Ismeretlen objektum"
+#define	D_OBJECT_MISMATCH "Az objektumok NEM passzolnak!"
+#define	D_OBJECT_LOST "Elveszett objektum!"
+#define	D_OBJECT_CREATE_FAILED "%u objektum sikertelen"
+#define	D_OBJECT_PAGE_UNKNOWN "%u oldalazonosító nincs meghatározva"
+#define	D_OBJECT_EVENT_UNKNOWN "Ismeretlen esemény %d"
+
+#define	D_ATTRIBUTE_UNKNOWN "Ismeretlen tulajdonság: %s"
+#define	D_ATTRIBUTE_READ_ONLY "%s csak olvasható"
+#define	D_ATTRIBUTE_PAGE_METHOD_INVALID "Nem lehet meghívni %s-t egy oldalon"
+
+#define	D_OOBE_SSID_VALIDATED "%s SSID érvényes"
+#define	D_OOBE_AUTO_CALIBRATE "Automatikus kalibrálás engedélyezve"
+#define	D_OOBE_CALIBRATED "Korábban kalibrálva"
+
+#define	D_DISPATCH_COMMAND_NOT_FOUND "%s parancs nem található"
+#define	D_DISPATCH_INVALID_PAGE "Érvénytelen oldal: %s"
+#define	D_DISPATCH_REBOOT "Az MCU most újraindul!"
+
+#define	D_JSON_FAILED "JSON elemzése nem sikerült:"
+#define	D_JSONL_FAILED "JSONL elemzése meghiúsult a %d vonalnál"
+#define	D_JSONL_SUCCEEDED "JSONL teljes körűen elemezve"
+
+#define	D_OTA_CHECK_UPDATE "A frissítések ellenőrzése az URL-en: %s"
+#define	D_OTA_CHECK_COMPLETE "A frissítések ellenőrzése befejeződött"
+#define	D_OTA_CHECK_FAILED "A frissítések ellenőrzése meghiúsult: %s"
+#define	D_OTA_UPDATE_FIRMWARE "Firmware frissítése OTA-val"
+#define	D_OTA_UPDATE_COMPLETE "Az OTA frissítés elkészült"
+#define	D_OTA_UPDATE_APPLY "Firmware alkalmazása és újraindítás"
+#define	D_OTA_UPDATE_FAILED "Az OTA frissítés meghiúsult"
+
+#define	D_HTTP_HASP_DESIGN "Képernyő dizájn"
+#define	D_HTTP_INFORMATION "Információk"
+#define	D_HTTP_HTTP_SETTINGS "HTTP beállítások"
+#define	D_HTTP_WIFI_SETTINGS "WiFi beállítások"
+#define	D_HTTP_MQTT_SETTINGS "MQTT beállítások"
+#define	D_HTTP_GPIO_SETTINGS "GPIO beállítások"
+#define	D_HTTP_MDNS_SETTINGS "mDNS beállítások"
+#define	D_HTTP_TELNET_SETTINGS "Telnet beállítások"
+#define	D_HTTP_DEBUG_SETTINGS "Hibakeresési beállítások"
+#define	D_HTTP_GUI_SETTINGS "Képernyő beállítások"
+#define	D_HTTP_SAVE_SETTINGS "Beállítások mentése"
+#define	D_HTTP_UPLOAD_FILE "Fájl feltöltése"
+#define	D_HTTP_ERASE_DEVICE "Minden beállítás visszaállítása"
+#define	D_HTTP_ADD_GPIO "Új pin hozzáadása"
+#define	D_HTTP_BACK "Vissza"
+#define	D_HTTP_REFRESH "Frissítés"
+#define	D_HTTP_PREV_PAGE "Előző oldal"
+#define	D_HTTP_NEXT_PAGE "Következő oldal"
+#define	D_HTTP_CALIBRATE "Kalibrálás"
+#define	D_HTTP_SCREENSHOT "Képernyőkép"
+#define	D_HTTP_FILE_BROWSER "Fájl böngésző"
+#define	D_HTTP_FIRMWARE_UPGRADE "Firmware frissítés"
+#define	D_HTTP_UPDATE_FIRMWARE "Firmware frissítése"
+#define	D_HTTP_FACTORY_RESET "Gyári beállítások visszaállítása"
+#define	D_HTTP_MAIN_MENU "Főmenü"
+#define	D_HTTP_REBOOT "Újraindítás"
+#define	D_HTTP_CONFIGURATION "Beállítások"
+
+#define	D_OOBE_MSG "Koppintson a képernyőre a WiFi beállításához, vagy csatlakozzon az alábbi Access Point-hoz:"
+#define	D_OOBE_SCAN_TO_CONNECT "Szkennelje le a csatlakozáshoz:"
+				
+#endif				
diff --git a/src/lang/ro_RO.h b/src/lang/ro_RO.h
new file mode 100644
index 00000000..cf3f200b
--- /dev/null
+++ b/src/lang/ro_RO.h
@@ -0,0 +1,131 @@
+#ifndef	HASP_LANG_RO_RO_H			
+#define	HASP_LANG_RO_RO_H			
+				
+#define	D_USERNAME "Nume de utilizator:"
+#define	D_PASSWORD "Parola:"
+#define	D_SSID "SSID:"
+
+#define	D_ERROR_OUT_OF_MEMORY "Memorie epuizată"
+#define	D_ERROR_UNKNOWN "Eroare necunoscută"
+
+#define	D_CONFIG_NOT_CHANGED "Setările nu s-au schimbat"
+#define	D_CONFIG_CHANGED "Setările s-au schimbat"
+#define	D_CONFIG_LOADED "Setările s-au încărcat"
+
+#define	D_FILE_LOADING "Se încarcă %s"
+#define	D_FILE_LOADED "S-a încărcat %s"
+#define	D_FILE_LOAD_FAILED "Încărcarea %s a eșuat"
+
+#define	D_FILE_SAVING "Se salvează %s"
+#define	D_FILE_SAVED "S-a salvat %s"
+#define	D_FILE_SAVE_FAILED "Salvarea %s a eșuat"
+
+#define	D_SERVICE_STARTING "Pornire..."
+#define	D_SERVICE_STARTED "Pornit"
+#define	D_SERVICE_START_FAILED "Pornirea a eșuat"
+#define	D_SERVICE_STOPPED "S-a oprit"
+#define	D_SERVICE_DISABLED "Dezactivat"
+#define	D_SERVICE_CONNECTED "Conectat"
+#define	D_SERVICE_DISCONNECTED "Deconectat"
+
+#define	D_NETWORK_IP_ADDRESS_RECEIVED "A primit adresa IP %s"
+#define	D_NETWORK_ONLINE "online"
+#define	D_NETWORK_OFFLINE "offline"
+#define	D_NETWORK_CONNECTION_FAILED "Conexiune eșuată"
+
+#define	D_MQTT_DEFAULT_NAME "plate_%s"
+#define	D_MQTT_CONNECTING "Conectare..."
+#define	D_MQTT_CONNECTED "Conectat la serverul %s ca %s"
+#define	D_MQTT_NOT_CONNECTED "Nu e conectat ???"
+#define	D_MQTT_DISCONNECTING "Deconectare..."
+#define	D_MQTT_DISCONNECTED "Deconectat"
+#define	D_MQTT_RECONNECTING "Deconectat de la server, reconectare..."
+#define	D_MQTT_NOT_CONFIGURED "Nu este configurat serverul MQTT"
+#define	D_MQTT_STARTED "Început: %d octeți"
+#define	D_MQTT_FAILED "A eșuat:"
+#define	D_MQTT_INVALID_TOPIC "Mesajul are subiect nevalid"
+#define	D_MQTT_SUBSCRIBED "Abonat la %s"
+#define	D_MQTT_NOT_SUBSCRIBED "Abonarea la %s a eșuat"
+#define	D_MQTT_HA_AUTO_DISCOVERY "Înregistrare la auto-descoperire în HA"
+
+#define	D_TELNET_CLOSING_CONNECTION "Terminarea sesiunii de la %s"
+#define	D_TELNET_CLIENT_LOGIN_FROM "Conectare client de la %s"
+#define	D_TELNET_CLIENT_CONNECT_FROM "Client conectat de la %s"
+#define	D_TELNET_CLIENT_NOT_CONNECTED "Clientul NU este conectat"
+#define	D_TELNET_AUTHENTICATION_FAILED "Autorizatia a esuat!"
+#define	D_TELNET_INCORRECT_LOGIN_ATTEMPT "Încercare incorectă de autentificare de la %s"
+#define	D_TELNET_STARTED "Consola Telnet pornită"
+#define	D_TELNET_FAILED "Nu s-a putut porni consola Telnet"
+#define	D_TELNET_CLIENT_CONNECTED "Client conectat"
+#define	D_TELNET_CLIENT_NOT_CONNECTED "Client NU este conectat"
+#define	D_TELNET_CLIENT_REJECTED "Client respins"
+
+#define	D_HASP_INVALID_PAGE "Pagina invalidă: %u"
+#define	D_HASP_INVALID_LAYER "Nu se poate șterge stratul de sistem"
+#define	D_HASP_CHANGE_PAGE "Schimbarea paginii: %u"
+#define	D_HASP_CLEAR_PAGE "Ștergerea paginii: %u"
+
+#define	D_OBJECT_DELETED "Obiect șters"
+#define	D_OBJECT_UNKNOWN "Obiect necunoscut"
+#define	D_OBJECT_MISMATCH "Obiectele NU se potrivesc!"
+#define	D_OBJECT_LOST "Obiect pierdut!"
+#define	D_OBJECT_CREATE_FAILED "Obiectul %u a eșuat"
+#define	D_OBJECT_PAGE_UNKNOWN "ID-ul paginii %u nu este definit"
+#define	D_OBJECT_EVENT_UNKNOWN "Eveniment necunoscut: %d"
+
+#define	D_ATTRIBUTE_UNKNOWN "Proprietate necunoscută: %s"
+#define	D_ATTRIBUTE_READ_ONLY "%s este numai în citire"
+#define	D_ATTRIBUTE_PAGE_METHOD_INVALID "Nu se poate apela %s pe o pagină"
+
+#define	D_OOBE_SSID_VALIDATED "SSID %s validat"
+#define	D_OOBE_AUTO_CALIBRATE "Calibrarea automată este activă"
+#define	D_OOBE_CALIBRATED "Deja calibrat"
+
+#define	D_DISPATCH_COMMAND_NOT_FOUND "Comanda %s nu a fost găsită"
+#define	D_DISPATCH_INVALID_PAGE "Pagina invalidă %s"
+#define	D_DISPATCH_REBOOT "MCU-ul repornește acum!"
+
+#define	D_JSON_FAILED "Analiza JSON a eșuat:"
+#define	D_JSONL_FAILED "Analiza JSONL a eșuat la linia %d"
+#define	D_JSONL_SUCCEEDED "Analiza JSONL completă"
+
+#define	D_OTA_CHECK_UPDATE "Verificare la URL-ul actualizărilor: %s"
+#define	D_OTA_CHECK_COMPLETE "Verificarea actualizării a fost finalizată"
+#define	D_OTA_CHECK_FAILED "Verificarea actualizării a eșuat: %s"
+#define	D_OTA_UPDATE_FIRMWARE "Actualizare firmware prin OTA"
+#define	D_OTA_UPDATE_COMPLETE "Actualizare prin OTA finalizată"
+#define	D_OTA_UPDATE_APPLY "Aplicarea firmware-ului și repornire"
+#define	D_OTA_UPDATE_FAILED "Actualizarea prin OTA a eșuat"
+
+#define	D_HTTP_HASP_DESIGN "Desenul ecranului"
+#define	D_HTTP_INFORMATION "Informații"
+#define	D_HTTP_HTTP_SETTINGS "Setări HTTP"
+#define	D_HTTP_WIFI_SETTINGS "Setări WiFi"
+#define	D_HTTP_MQTT_SETTINGS "Setări MQTT"
+#define	D_HTTP_GPIO_SETTINGS "Setări GPIO"
+#define	D_HTTP_MDNS_SETTINGS "Setări mDNS"
+#define	D_HTTP_TELNET_SETTINGS "Setări Telnet"
+#define	D_HTTP_DEBUG_SETTINGS "Setări de depanare"
+#define	D_HTTP_GUI_SETTINGS "Setări ecran"
+#define	D_HTTP_SAVE_SETTINGS "Salvarea setărilor"
+#define	D_HTTP_UPLOAD_FILE "Încărcare fișier"
+#define	D_HTTP_ERASE_DEVICE "Resetarea tuturor setărilor"
+#define	D_HTTP_ADD_GPIO "Adăugați un pin nou"
+#define	D_HTTP_BACK "Înapoi"
+#define	D_HTTP_REFRESH "Reîmprospătare"
+#define	D_HTTP_PREV_PAGE "Pagina anterioară"
+#define	D_HTTP_NEXT_PAGE "Pagina următoare"
+#define	D_HTTP_CALIBRATE "Calibrare"
+#define	D_HTTP_SCREENSHOT "Captură de ecran"
+#define	D_HTTP_FILE_BROWSER "Browser de fișiere"
+#define	D_HTTP_FIRMWARE_UPGRADE "Actualizare firmware"
+#define	D_HTTP_UPDATE_FIRMWARE "Actualizarea firmware-ului"
+#define	D_HTTP_FACTORY_RESET "Resetare la parametri de fabrică"
+#define	D_HTTP_MAIN_MENU "Meniu principal"
+#define	D_HTTP_REBOOT "Repornire"
+#define	D_HTTP_CONFIGURATION "Setări"
+
+#define	D_OOBE_MSG "Atingeți ecranul pentru a configura WiFi sau conectați-vă la acest punct de acces:"
+#define	D_OOBE_SCAN_TO_CONNECT "Scanați pentru a vă conecta:"
+				
+#endif				
diff --git a/src/sys/net/hasp_wifi.cpp b/src/sys/net/hasp_wifi.cpp
index 6ed4a553..5746a0a2 100644
--- a/src/sys/net/hasp_wifi.cpp
+++ b/src/sys/net/hasp_wifi.cpp
@@ -44,9 +44,9 @@ char wifiSsid[32] = WIFI_SSID;
 char wifiSsid[32]     = "";
 #endif
 #ifdef WIFI_PASSW
-char wifiPassword[32] = WIFI_PASSW;
+char wifiPassword[64] = WIFI_PASSW;
 #else
-char wifiPassword[32] = "";
+char wifiPassword[64] = "";
 #endif
 uint8_t wifiReconnectCounter = 0;
 
@@ -558,4 +558,4 @@ bool wifiSetConfig(const JsonObject& settings)
 }
 #endif // HASP_USE_CONFIG
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/sys/svc/hasp_http.cpp b/src/sys/svc/hasp_http.cpp
index fff180e3..ed4a99a7 100644
--- a/src/sys/svc/hasp_http.cpp
+++ b/src/sys/svc/hasp_http.cpp
@@ -72,9 +72,9 @@ const char MAIN_MENU_BUTTON[] PROGMEM =
     "</p><p><form method='get' action='/'><button type='submit'>" D_HTTP_MAIN_MENU "</button></form>";
 const char MIT_LICENSE[] PROGMEM = "</br>MIT License</p>";
 
-const char HTTP_DOCTYPE[] PROGMEM =
-    "<!DOCTYPE html><html lang=\"en\"><head><meta name=\"viewport\" content=\"width=device-width,initial-scale=1,"
-    "user-scalable=no\"/>";
+const char HTTP_DOCTYPE[] PROGMEM = "<!DOCTYPE html><html lang=\"en\"><head><meta charset='utf-8'><meta "
+                                    "name=\"viewport\" content=\"width=device-width,initial-scale=1,"
+                                    "user-scalable=no\"/>";
 const char HTTP_META_GO_BACK[] PROGMEM = "<meta http-equiv='refresh' content='15;url=/'/>";
 const char HTTP_HEADER[] PROGMEM       = "<title>%s</title>";
 const char HTTP_STYLE[] PROGMEM =
@@ -2131,4 +2131,4 @@ size_t httpClientWrite(const uint8_t* buf, size_t size)
     return bytes_sent;
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/sys/svc/hasp_telnet.cpp b/src/sys/svc/hasp_telnet.cpp
index 52de8836..e8c823a6 100644
--- a/src/sys/svc/hasp_telnet.cpp
+++ b/src/sys/svc/hasp_telnet.cpp
@@ -84,11 +84,16 @@ void telnetAcceptClient()
     // telnetClient.print((char)0xFD);
     // telnetClient.print((char)0x1B);
 
+<<<<<<< HEAD:src/sys/svc/hasp_telnet.cpp
+#if HASP_USE_HTTP > 0 == == == =
 #if HASP_USE_HTTP > 0
-    if(strlen(http_config.user) != 0 || strlen(http_config.password) != 0) {
+>>>>>>> master:src/svc/hasp_telnet.cpp
+                                       if(strlen(http_config.user) != 0 || strlen(http_config.password) != 0)
+    {
         telnetClient.println(F("\r\n" D_USERNAME " "));
         telnetLoginState = TELNET_UNAUTHENTICATED;
-    } else
+    }
+    else
 #endif
     {
         telnetClientLogon();