diff --git a/dev/ui/fonts/2248-International-charset.txt b/dev/ui/fonts/2248-International-charset.txt
new file mode 100644
index 0000000..4d652be
--- /dev/null
+++ b/dev/ui/fonts/2248-International-charset.txt
@@ -0,0 +1 @@
+!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀāĂ㥹ĆćĈĉĊċČčĎďĐđĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĦħĨĩĪīĬĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀŁłŃńŅņŇňʼnŊŋŌōŎŏŐőŒœŔŕŖŗŘřŚśŜŝŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀƁƂƃƄƅƆƇƈƉƊƋƌƍƎƏƐƑƒƓƔƕƖƗƘƙƚƛƜƝƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀǁǂǃDŽDždžLJLjljNJNjnjǍǎǏǐǑǒǓǔǕǖǗǘǙǚǛǜǝǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴǵǶǷǸǹǺǻǼǽǾǿȀȁȂȃȄȅȆȇȈȉȊȋȌȍȎȏȐȑȒȓȔȕȖȗȘșȚțȜȝȞȟȠȡȢȣȤȥȦȧȨȩȪȫȬȭȮȯȰȱȲȳȴȵȶȷȸȹȺȻȼȽȾȿɀɁɂɃɄɅɆɇɈɉɊɋɌɍɎɏ̴̵̶̷̸̡̢̧̨̛̖̗̘̙̜̝̞̟̠̣̤̥̦̩̪̫̬̭̮̯̰̱̲̳̹̺̻̼͇͈͉͍͎̀́̂̃̄̅̆̇̈̉̊̋̌̍̎̏̐̑̒̓̔̽̾̿̀́͂̓̈́͆͊͋͌̕̚ͅ͏͓͔͕͖͙͚͐͑͒͗͛ͣͤͥͦͧͨͩͪͫͬͭͮͯ͘͜͟͢͝͞͠͡ͰͱͲͳʹ͵Ͷͷ͸͹ͺͻͼͽ;Ϳ΀΁΂΃΄΅Ά·ΈΉΊ΋Ό΍ΎΏΐΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡ΢ΣΤΥΦΧΨΩΪΫάέήίΰαβγδεζηθικλμνξοπρςστυφχψωϊϋόύώϏϐϑϒϓϔϕϖϗϘϙϚϛϜϝϞϟϠϡϢϣϤϥϦϧϨϩϪϫϬϭϮϯϰϱϲϳϴϵ϶ϷϸϹϺϻϼϽϾϿЀЁЂЃЄЅІЇЈЉЊЋЌЍЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяѐёђѓєѕіїјљњћќѝўџѠѡѢѣѤѥѦѧѨѩѪѫѬѭѮѯѰѱѲѳѴѵѶѷѸѹѺѻѼѽѾѿҀҁ҂҃҄҅҆҇҈҉ҊҋҌҍҎҏҐґҒғҔҕҖҗҘҙҚқҜҝҞҟҠҡҢңҤҥҦҧҨҩҪҫҬҭҮүҰұҲҳҴҵҶҷҸҹҺһҼҽҾҿӀӁӂӃӄӅӆӇӈӉӊӋӌӍӎӏӐӑӒӓӔӕӖӗӘәӚӛӜӝӞӟӠӡӢӣӤӥӦӧӨөӪӫӬӭӮӯӰӱӲӳӴӵӶӷӸӹӺӻӼӽӾӿ԰ԱԲԳԴԵԶԷԸԹԺԻԼԽԾԿՀՁՂՃՄՅՆՇՈՉՊՋՌՍՎՏՐՑՒՓՔՕՖ՗՘ՙ՚՛՜՝՞՟ՠաբգդեզէըթժիլխծկհձղճմյնշոչպջռսվտրցւփքօֆևֈ։֊֋֌֍֎֏֐ְֱֲֳִֵֶַָֹֺֻּֽ֑֖֛֢֣֤֥֦֧֪֚֭֮֒֓֔֕֗֘֙֜֝֞֟֠֡֨֩֫֬֯־ֿ׀ׁׂ׃ׅׄ׆ׇ׈׉׊׋׌׍׎׏אבגדהוזחטיךכלםמןנסעףפץצקרשת׫׬׭׮ׯװױײ׳״׵׶׷׸׹׺׻׼׽׾׿؀؁؂؃؄؅؆؇؈؉؊؋،؍؎؏ؘؙؚؐؑؒؓؔؕؖؗ؛؜؝؞؟ؠءآأؤإئابةتثجحخدذرزسشصضطظعغػؼؽؾؿـفقكلمنهوىيًٌٍَُِّْٕٖٜٟٓٔٗ٘ٙٚٛٝٞ٠١٢٣٤٥٦٧٨٩٪٫٬٭ٮٯٰٱٲٳٴٵٶٷٸٹٺٻټٽپٿڀځڂڃڄڅچڇڈډڊڋڌڍڎڏڐڑڒړڔڕږڗژڙښڛڜڝڞڟڠڡڢڣڤڥڦڧڨکڪګڬڭڮگڰڱڲڳڴڵڶڷڸڹںڻڼڽھڿۀہۂۃۄۅۆۇۈۉۊۋیۍێۏېۑےۓ۔ەۖۗۘۙۚۛۜ۝۞ۣ۟۠ۡۢۤۥۦۧۨ۩۪ۭ۫۬ۮۯ۰۱۲۳۴۵۶۷۸۹ۺۻۼ۽۾ۿ฀กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู฻฼฽฾฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛๜๝๞๟๠๡๢๣๤๥๦๧๨๩๪๫๬๭๮๯๰๱๲๳๴๵๶๷๸๹๺๻๼๽๾๿ႠႡႢႣႤႥႦႧႨႩႪႫႬႭႮႯႰႱႲႳႴႵႶႷႸႹႺႻႼႽႾႿჀჁჂჃჄჅ჆Ⴧ჈჉჊჋჌Ⴭ჎჏აბგდევზთიკლმნოპჟრსტუფქღყშჩცძწჭხჯჰჱჲჳჴჵჶჷჸჹჺ჻ჼჽჾჿḀḁḂḃḄḅḆḇḈḉḊḋḌḍḎḏḐḑḒḓḔḕḖḗḘḙḚḛḜḝḞḟḠḡḢḣḤḥḦḧḨḩḪḫḬḭḮḯḰḱḲḳḴḵḶḷḸḹḺḻḼḽḾḿṀṁṂṃṄṅṆṇṈṉṊṋṌṍṎṏṐṑṒṓṔṕṖṗṘṙṚṛṜṝṞṟṠṡṢṣṤṥṦṧṨṩṪṫṬṭṮṯṰṱṲṳṴṵṶṷṸṹṺṻṼṽṾṿẀẁẂẃẄẅẆẇẈẉẊẋẌẍẎẏẐẑẒẓẔẕẖẗẘẙẚẛẜẝẞẟẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặẸẹẺẻẼẽẾếỀềỂểỄễỆệỈỉỊịỌọỎỏỐốỒồỔổỖỗỘộỚớỜờỞởỠỡỢợỤụỦủỨứỪừỬửỮữỰựỲỳỴỵỶỷỸỹỺỻỼỽỾỿ₠₡₢₣₤₥₦₧₨₩₪₫€₭₮₯₰₱₲₳₴₵₶₷₸₹₺₻₼₽₾₿⃀⃁⃂⃃⃄⃅⃆⃇⃈⃉⃊⃋⃌⃍⃎⃏一七三上下东中串主义九书乾二五亮人件位低假偵像全八六关冷出分判制前助北十南卧危厅厨发台右后启周啟器四在地執壁外多夜大头安定客室家密小少层層左已帘常干年度廚廳开异式当後态態戒房扇手扫按掃接控摄播攝放断斷日时星時暖書月有期未机条東柜模機橱櫃櫥正气氣水泵洗活浴润清温測湿溫潤激濕灯热無熱燈燥状狀用电略異發百目码確碼离秒空窗簾組網線组网置群臥自色落行西解触觸調警讀读调輔轉辅过运连送速連運量鎖鏡锁镜門閉開閒間閱關门闭闲间阅阳除陽險離電頭風风高
\ No newline at end of file
diff --git a/dev/ui/fonts/CJK/MDITest.zi b/dev/ui/fonts/CJK/MDITest.zi
new file mode 100644
index 0000000..915b218
Binary files /dev/null and b/dev/ui/fonts/CJK/MDITest.zi differ
diff --git a/dev/ui/fonts/CJK/UbuntuAllLang.zi b/dev/ui/fonts/CJK/UbuntuAllLang.zi
new file mode 100644
index 0000000..f25abb0
Binary files /dev/null and b/dev/ui/fonts/CJK/UbuntuAllLang.zi differ
diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index ceba515..65f9092 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -36,7 +36,7 @@ blueprint:
     🎉 Roadmap can be found here: [Roadmap](https://github.com/Blackymas/NSPanel_HA_Blueprint/labels/roadmap)
 
 
-    ℹ️ Version: v4.2.5
+    ℹ️ Version: v4.2.6dev
 
   source_url: https://github.com/Blackymas/NSPanel_HA_Blueprint/blob/main/nspanel_blueprint.yaml
   domain: automation
@@ -3370,7 +3370,7 @@ trigger_variables:
 
 variables:
   ##### GENERAL #####
-  blueprint_version: '4.2.5'
+  blueprint_version: '4.2.6dev'
   date_format_temp: !input 'date_format'
   # Avoid breaking change for existing users with legacy type format
   date_format: '{{ date_format_temp if date_format_temp not in ["%d.%m", "%d/%m", "%-d/%-m", "%-m/%-d"] else "%A, " ~ date_format_temp }}'
@@ -7389,7 +7389,15 @@ action:
                                     state: '{{ states(temperature_sensor, rounded=true) | default("unavailable") }}'
                                     sensor_uom: '{{ state_attr(temperature_sensor, "unit_of_measurement") }}'
                                     nspaneltemp_uom: '{{ state_attr(nspaneltemp, "unit_of_measurement") }}'
-                                    units: '{{ sensor_uom if sensor_uom is string and sensor_uom | length > 0 else temperature_units }}'
+                                    units: >
+                                      {{
+                                        sensor_uom if sensor_uom is string and sensor_uom | length > 0
+                                        else
+                                          (
+                                            nspaneltemp_uom if nspaneltemp_uom is string and nspaneltemp_uom | length > 0
+                                            else temperature_units
+                                          )
+                                      }}
                                     icon:
                                       icon: !input 'home_indoor_temp_icon'
                                       color_rgb: !input 'home_indoor_temp_icon_color'
@@ -7749,13 +7757,15 @@ action:
                                             foreground: '{{ repeat.item.label_color_rgb }}'
                                           continue_on_error: true
                                         ### LABEL Font ###
+                                        - variables:
+                                            unit_of_measurement: '{{ state_attr(entity_id, "unit_of_measurement") | default("") }}'
                                         - *delay-default
                                         - service: '{{ nextion.command.text_printf }}'
                                           data:
                                             component: '{{ repeat.item.page }}.{{ repeat.item.component }}{{ "_state" if repeat.item.page == page.home }}'
                                             message: >
                                               {{
-                                                (states(entity_id, rounded=true) ~ (state_attr(entity_id, "unit_of_measurement") | default("")))
+                                                (states(entity_id, rounded=true) ~ (unit_of_measurement if unit_of_measurement and unit_of_measurement is string and unit_of_measurement | length > 0 else ""))
                                                 if entity_has_value
                                                 else mui[language].unavailable
                                               }}
@@ -8960,6 +8970,7 @@ action:
                                     overlap:
                                       icon: '{{ repeat.item.icon if repeat.item.icon is defined else None }}'
                                       name: '{{ repeat.item.name if repeat.item.name is defined else None }}'
+                                    unit_of_measurement: '{{ state_attr(entity_id, "unit_of_measurement") | default("") }}'
                                 - *variable_entity
                                 - service: '{{ nextion.command.set_entity }}'
                                   data:
@@ -8968,7 +8979,7 @@ action:
                                     ent_label: '{{ entity.name }}'
                                     ent_value: >
                                       {{
-                                        (states(entity_id, rounded=true) ~ (state_attr(entity_id, "unit_of_measurement") | default("")))
+                                        (states(entity_id, rounded=true) ~ (unit_of_measurement if unit_of_measurement and unit_of_measurement is string and unit_of_measurement | length > 0 else ""))
                                         if has_value(entity_id)
                                         else mui[language].unavailable
                                       }}