diff --git a/README.md b/README.md
index 5601e1283..ed7bc9365 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@
 
 This repository is in charge of the CyBear Jinni App and is part of the [CyBear Jinni Smart Home](https://github.com/CyBear-Jinni/CBJ_Smart-Home.git) system.
 
-The CyBear Jinni App lets you control the [CyBear Jinni Hub](https://github.com/CyBear-Jinni/CBJ_Smart-Device) that manage the smart devices from different vendors.
+The CyBear Jinni App lets you control the [CyBear Jinni Hub](https://github.com/CyBear-Jinni/cbj_hub) that manage the smart devices from different vendors.
 
 
 It is writen with [Flutter](https://flutter.dev) and let you control the CyBear Jinni Hub directly in the local Wi-Fi and remotely through [cbj remote pipes](https://github.com/CyBear-Jinni/cbj_remote-pipes) which transfer requests to the Hub without collecting any data.
@@ -22,7 +22,7 @@ It is writen with [Flutter](https://flutter.dev) and let you control the CyBear
 
 <table align="middle">
   <tr>
-    <td> 
+    <td>
       <p>
          <a href="https://play.google.com/store/apps/details?id=com.cybear_jinni.smart_home">
          <img border="0" align="middle" alt="Android Badge" src="https://user-images.githubusercontent.com/9304740/117003444-8b58a080-aced-11eb-94bc-bfb2505f515d.png" width=200>
@@ -43,8 +43,14 @@ To learn the coding guidelines check [this Wiki](https://github.com/CyBear-Jinni
 
 # Social Media Links
 
-[<img src = "https://cdn.icon-icons.com/icons2/1099/PNG/512/1485482199-linkedin_78667.png" height = "80" >](https://www.linkedin.com/company/cybear-jinni)
+<a href="https://twitter.com/CyBearJinni">
+<img align="left" alt="Twitter" width="45px" src="https://cdn.cdnlogo.com/logos/t/96/twitter-icon.svg" /></a>
+<a href="https://www.instagram.com/cybearjinni/?igshid=rfllj6qbv6l8">
+<img align="left" alt="Instagram" width="45px" src="https://cdn.icon-icons.com/icons2/1753/PNG/512/iconfinder-social-media-applications-3instagram-4102579_113804.png" /></a>
+<a href="https://www.linkedin.com/company/cybear-jinni">
+<img align="left" alt="Linkedin" width="45px" src="https://cdn.icon-icons.com/icons2/1099/PNG/512/1485482199-linkedin_78667.png" /></a>
+<a href="https://discord.gg/mUXfwUY">
+<img align="left" alt="Discord" width="45px" src="https://cdn.icon-icons.com/icons2/2108/PNG/512/discord_icon_130958.png" /></a>
+<a href="https://github.com/CyBear-Jinni">
+<img align="left" alt="Github" width="45px" src="https://seeklogo.com/images/G/github-colored-logo-FDDF6EB1F0-seeklogo.com.png" /></a>
 
-If you have any questions feel free to ask in our Discord server
-
-[<img src="https://cdn.icon-icons.com/icons2/2108/PNG/512/discord_icon_130958.png" height="80">](https://discord.gg/mUXfwUY)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index e468a4358..d104fb92d 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -46,7 +46,7 @@ android {
     defaultConfig {
         applicationId "com.cybear_jinni.smart_home"
         minSdkVersion 19
-        targetSdkVersion 30
+        targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         multiDexEnabled true    //  Enable multidex for apps with over 64K methods
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 52655fd75..b3f7dad22 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -37,6 +37,7 @@
             android:theme="@style/LaunchTheme"
             android:showWhenLocked="true"
             android:turnScreenOn="true"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
diff --git a/assets/translations/am-ET.json b/assets/translations/am-ET.json
new file mode 100644
index 000000000..a21d42ee4
--- /dev/null
+++ b/assets/translations/am-ET.json
@@ -0,0 +1,112 @@
+{
+  "Create_new_account": "አዲስ መለያ ፍጠር",
+  "Actions_History": "የተግባር ታሪክ",
+  "Empty_history": "ባዶ ታሪክ",
+  "History_Settings_Page": "የታሪክ ቅንብሮች ገጽ",
+  "Lamps_Page": "የአምፖሎች ገጽ",
+  "Name:_": "ስም: {}",
+  "Room:_": "ክፍል: {}",
+  "Lamps_Settings_Page": "የአምፖሎች ቅንብሮች ገጽ",
+  "Welcome_to_your_Smart_Home": "እንኳን ወደ ስማርት ቤትዎ በደህና መጡ",
+  "Scene_Settings_Page": "የትዕይንት ቅንብሮች ገጽ",
+  "Move_to_blinds_full_settings_page": "ወደ መጋረጃ ሙሉ የቅንብሮች ገጽ ይሂዱ",
+  "Blinds_Page": "የመጋረጃ ገጽ",
+  "Down": "ወደ ታች",
+  "Stop": "አቁም",
+  "Up": "ወደ ላይ",
+  "Smart_Devices_Settings_Page": "የስማርት መገልገያዎች ቅንብሮች ገጽ",
+  "Air_Conditioners": "የአየር ማቀዝቀዣዎች",
+  "Blinds": "መጋረጃዎች",
+  "Medical_Device": "የህክምና መገልገያ",
+  "Medical_Devices": "የህክምና መገልገያዎች",
+  "Smart_Phone": "ስማርት ስልክ",
+  "Smart_Phones": "ስማርት ስልኮች",
+  "Smart_Speakers": "ስማርት ስፒከሮች",
+  "Smart_Devices_page": "የስማርት መገልገያዎች ገጽ",
+  "History": "ታሪክ",
+  "Scene": "ትዕይንት",
+  "Scenes": "ትዕይንቶች",
+  "Lamps": "መብራቶች",
+  "Devices": "መገልገያዎች",
+  "Email_is_required": "ኢሜል ያስፈልጋል",
+  "Email_cannot_contain_spaces": "ኢሜል ክፍተቶችን ሊይዝ አይችልም።",
+  "Email_is_invalid": "ኢሜል ልክ ያልሆነ ነው",
+  "Email": "ኢሜል",
+  "Password_is_required": "የይለፍ ቃል ያስፈልጋል",
+  "Password_cannot_contain_spaces": "የይለፍ ቃል ክፍተቶችን ሊይዝ አይችልም።",
+  "Password_must_be_bigger_than__characters": "የይለፍ ቃል ከ {} ፊደላት የበለጠ መሆን አለበት",
+  "Password": "የይለፍ ቃል",
+  "Log_In": "ግባ",
+  "Forgot_password": "የይለፍ ቃሉን ረሱ",
+  "Forgot_password?": "የይለፍ ቃል ረስተዋል?",
+  "title": "ርዕስ",
+  "number": "ቁጥር",
+  "IP_is_required": "አይፒ ያስፈልጋል",
+  "IP_syntax_is_incorrect": "የአይፒ አገባብ የተሳሳተ ነው",
+  "Add_Smart_Device": "ስማርት መገልገያን ጨምር",
+  "Cancel": "ሰርዝ",
+  "Add": "ጨምር",
+  "Light": "ብርሃን",
+  "Device_ip:_": "የመገልገያ አይፒ: {}",
+  "New_devices": "አዳዲስ መገልገያዎች",
+  "Add_devices": "መገልገያዎችን አክል",
+  "Device_type:_": "የመገልገያ ዓይነት: {}",
+  "Room_name_is_required": "የክፍሉ ስም ያስፈልጋል",
+  "Room_name:": "የክፍሉ ስም:",
+  "Device_name_is_required": "የመገልገያ ስም ያስፈልጋል",
+  "Device_name:": "የመገልገያ ስም:",
+  "Update": "አዘምን",
+  "IP": "አይፒ",
+  "This_is_firebase": "ይህ ፋየርቤዝ ነው",
+  "Device_with_ip:_": "መገልገያ ከአይ.ፒ: {}",
+  "Update_WiFi_configuration": "የዋይፋይ ውቅር ያዘምኑ",
+  "WiFi_name_is_required": "የዋይፋይ ስም ያስፈልጋል",
+  "WiFi_Name": "የዋይፋይ ስም",
+  "WiFi_password_is_required": "የዋይፋይ ይለፍ ቃል ያስፈልጋል",
+  "WiFi_Password": "የዋይፋይ ይለፍ ቃል",
+  "Insert_WiFi_Credentials": "የዋይፋይ መለያዎትን አስገባ",
+  "Conditioners": "የአየር ማቀዝቀዣዎች",
+  "Medical": "ሕክምና",
+  "Phones": "ስልኮች",
+  "Speakers": "ስፒከሮች",
+  "Send": "ላክ",
+  "All_Devices": "ሁሉም መገልገያዎች",
+  "Summary": "ማጠቃለያ",
+  "Switches": "መቀያየሪያዎች",
+  "Boilers": "ማሞቂያዎች",
+  "Lights": "መብራቶች",
+  "RGBw_Lights": "የተለያዩ መብራቶች",
+  "_Switches": "{} መቀያየሪያዎች",
+  "_SmartTvs": "{} ስማርት ቲቪዎች",
+  "_RGBW_Lights": "{} የተለያዩ መብራቶች",
+  "_Lights": "{} መብራቶች",
+  "_Boilers": "{} ማሞቂያዎች",
+  "_Blinds": "{} መጋረጃዎች",
+  "Rooms": "ክፍሎች",
+  "_device": "{} መገልገያ",
+  "_devices": "{} መገልገያዎች",
+  "_SmartPlugs": "{} ስማርት መሰኪያዎች",
+  "On": "አብራ",
+  "Off": "አጥፋ",
+  "Color": "ቀለም",
+  "White": "ነጭ",
+  "Area": "አካባቢ",
+  "Areas": "አካባቢዎች",
+  "Automations": "ራስ-ሰሮች",
+  "Scenes_In_Folder": "ትዕይንቶች በአቃፊ ውስጥ",
+  "Select": "ይምረጡ",
+  "Exist": "አለ",
+  "OK": "እሺ",
+  "Nothing": "ምንም",
+  "No_need_here": "እዚህ አያስፈልግም",
+  "Do_not_need": "አያስፈልግም",
+  "Finish": "ጨርስ",
+  "Select_Purposes_Of_The_Area": "የአከባቢውን ዓላማዎች ይምረጡ",
+  "Pulling_Up_all_blinds": "ሁሉንም መጋረጃዎች ወደ ላይ መክፈት",
+  "Stopping_all_blinds": "ሁሉንም መጋረጃዎች ማቆም",
+  "Pulling_down_all_blinds": "ሁሉንም መጋረጃዎች ወደ ታች መዝጋት",
+  "Turning_On_boiler": "ማሞቂያውን በማብራት ላይ",
+  "Turning_Off_boiler": "ማሞቂያውን በማጥፋት ላይ",
+  "Waiting_for_user_to_get_connected_to_WiFi": "ተጠቃሚ ወደ ዋይፋይ እስኪገናኝ በመጠበቅ ላይ",
+  "Can't_add_unsupported_device": "የማይደገፍ መ ማከል አይቻልም"
+}
diff --git a/assets/translations/bn-IN.json b/assets/translations/bn-IN.json
new file mode 100644
index 000000000..a09747510
--- /dev/null
+++ b/assets/translations/bn-IN.json
@@ -0,0 +1,112 @@
+{
+  "Create_new_account": "নতুন একাউন্ট বানান",
+  "Actions_History": "কর্ম ইতিহাস",
+  "Empty_history": "শুন্য ইতিহাস",
+  "History_Settings_Page": "ইতিহাস সেটিং পেজ",
+  "Lamps_Page": "ল্যাম্প পেজ",
+  "Name:_": "নাম: {}",
+  "Room:_": "ঘর: {}",
+  "Lamps_Settings_Page": "ল্যাম্পস সেটিং পেজ",
+  "Welcome_to_your_Smart_Home": "আপনার স্মার্ট বাড়িতে স্বাগত",
+  "Scene_Settings_Page": "দৃশ্য সেটিং পেজ",
+  "Move_to_blinds_full_settings_page": "পূর্ণ সেটিং পেজ অন্ধ মোডে করুন",
+  "Blinds_Page": "অন্ধ পেজ",
+  "Down": "নিচ",
+  "Stop": "থামুন",
+  "Up": "উপর",
+  "Smart_Devices_Settings_Page": "স্মার্ট যন্ত্র সেটিং পেজ",
+  "Air_Conditioners": "বাতনুকূল যন্ত্র",
+  "Blinds": "অন্ধ",
+  "Medical_Device": "ঔষধি যন্ত্র",
+  "Medical_Devices": "ঔষধি যন্ত্রাবলী",
+  "Smart_Phone": "স্মার্টফোন",
+  "Smart_Phones": "স্মার্টফোনেগুলি",
+  "Smart_Speakers": "স্মার্ট স্পিকার",
+  "Smart_Devices_page": "স্মার্ট যন্ত্রবলির পেজ",
+  "History": "ইতিহাস",
+  "Scene": "দৃশ্য",
+  "Scenes": "দৃশ্যবলী",
+  "Lamps": "ল্যাম্পস",
+  "Devices": "যন্ত্রাবলী",
+  "Email_is_required": "ইমেইল প্রয়োজন",
+  "Email_cannot_contain_spaces": "ইমেইলে শূন্যস্থান থাকতে পারে না",
+  "Email_is_invalid": "ইমেইল অনুমোদিত নয়",
+  "Email": "ইমেইল",
+  "Password_is_required": "পাসওয়ার্ড প্রয়োজন",
+  "Password_cannot_contain_spaces": "পাসওয়ার্ডে শূন্যস্থান থাকতে পারে না",
+  "Password_must_be_bigger_than__characters": "পাসওয়ার্ডটা {}গুলি অক্ষর এর চেয়ে বড়ো হতে হবে",
+  "Password": "পাসওয়ার্ড",
+  "Log_In": "লগ ইন করুন",
+  "Forgot_password": "পাসওয়ার্ড ভুলে গেছি",
+  "Forgot_password?": "পাসওয়ার্ড ভুলে গেছেন?",
+  "title": "শীর্ষক",
+  "number": "সংখ্যা",
+  "IP_is_required": "আইপি প্রয়োজন",
+  "IP_syntax_is_incorrect": "আইপির বিন্যাস ভুল",
+  "Add_Smart_Device": "স্মার্ট যন্ত্র যোগ করুন",
+  "Cancel": "বাদ দিন",
+  "Add": "যোগ",
+  "Light": "লাইট",
+  "Device_ip:_": "যন্ত্রের আইপি: {}",
+  "New_devices": "নতুন যন্ত্রাবলী",
+  "Add_devices": "যন্ত্রাবলী যোগ করুন",
+  "Device_type:_": "যন্ত্রের প্রকৃতি: {}",
+  "Room_name_is_required": "ঘরোর নাম প্রয়োজন",
+  "Room_name:": "ঘরের নাম:",
+  "Device_name_is_required": "যন্ত্রের নাম প্রয়োজন",
+  "Device_name:": "যন্ত্রের নাম:",
+  "Update": "আপডেট",
+  "IP": "আইপি",
+  "This_is_firebase": "এটা ফায়ারবেস",
+  "Device_with_ip:_": "আইপি সহ যন্ত্র: {}",
+  "Update_WiFi_configuration": "ওয়াইফাই কনফিগারেশন আপডেট করুন",
+  "WiFi_name_is_required": "ওয়াইফাই এর নাম প্রয়োজন",
+  "WiFi_Name": "ওয়াইফাই এর নাম",
+  "WiFi_password_is_required": "ওয়াইফাই এর পাসওয়ার্ড প্রয়োজন",
+  "WiFi_Password": "ওয়াইফাই এর পাসওয়ার্ড",
+  "Insert_WiFi_Credentials": "ওয়াইফাই এর তথ্য দিন",
+  "Conditioners": "বাতনুকূলক",
+  "Medical": "ঔষধি",
+  "Phones": "ফোন",
+  "Speakers": "স্পিকার",
+  "Send": "সেন্ড করুন",
+  "All_Devices": "সকল যন্ত্রাবলী",
+  "Summary": "সংক্ষেপ",
+  "Switches": "সুইচ",
+  "Boilers": "বয়লার",
+  "Lights": "লাইটস",
+  "RGBw_Lights": "আরজিবিডাবলু লাইটস",
+  "_Switches": "{} গুলি সুইচ",
+  "_SmartTvs": "{} গুলি স্মার্ট টিভি",
+  "_RGBW_Lights": "{} গুলি আরজিবিডাবলু লাইটস",
+  "_Lights": "{} গুলি লাইটস",
+  "_Boilers": "{} গুলি বয়লার",
+  "_Blinds": "{} গুলি ব্লাইন্ডস",
+  "Rooms": "ঘরগুলি",
+  "_device": "{} গুলি যন্ত্র",
+  "_devices": "{} devices",
+  "_SmartPlugs": "{} গুলি স্মার্ট প্লাগ",
+  "On": "অন",
+  "Off": "অফ",
+  "Color": "রং",
+  "White": "সাদা",
+  "Area": "ক্ষেত্র",
+  "Areas": "ক্ষেত্রগুলি",
+  "Automations": "স্বয়ংক্রীয়তা",
+  "Scenes_In_Folder": "ফোল্ডারের দৃশ্য",
+  "Select": "সিলেক্ট করুন",
+  "Exist": "এক্সিস্ট",
+  "OK": "ওকে",
+  "Nothing": "কিছু না",
+  "No_need_here": "কোনো প্রয়োজন নেই",
+  "Do_not_need": "আমি চাই না ভাই",
+  "Finish": "খতম করুন",
+  "Select_Purposes_Of_The_Area": "এই ক্ষেত্রের কাজ বলুন",
+  "Pulling_Up_all_blinds": "সব ব্লাইন্ড তুলে ধরুন",
+  "Stopping_all_blinds": "সব ব্লাইন্ড থামিয়ে দিন",
+  "Pulling_down_all_blinds": "সব ব্লাইন্ড নামিয়ে দিন",
+  "Turning_On_boiler": "বয়লার অন করুন",
+  "Turning_Off_boiler": "বয়লার অফ করুন",
+  "Waiting_for_user_to_get_connected_to_WiFi": "ওয়াইফাই এর সাথে সংযোগের জন্য অপেক্ষা",
+  "Can't_add_unsupported_device": "আনসাপোর্টেড যন্ত্র যোগ করা যাবে না"
+}
\ No newline at end of file
diff --git a/assets/translations/de-AT.json b/assets/translations/de-AT.json
new file mode 100644
index 000000000..f538549c7
--- /dev/null
+++ b/assets/translations/de-AT.json
@@ -0,0 +1,112 @@
+{
+  "Create_new_account": "Neues Konto erstellen",
+  "Actions_History": "Verlauf",
+  "Empty_history": "Verlauf löschen",
+  "History_Settings_Page": "Verlaufseinstellungen",
+  "Lamps_Page": "Lampen-Seite",
+  "Name:_": "Name: {}",
+  "Room:_": "Raum: {}",
+  "Lamps_Settings_Page": "Lampen-Einstellungsseite",
+  "Welcome_to_your_Smart_Home": "Willkommen in deinem Smart Home",
+  "Scene_Settings_Page": "Szenen-Einstellungsseite",
+  "Move_to_blinds_full_settings_page": "Gehe zur Rollo-Einstellungsseite",
+  "Blinds_Page": "Rollo-Seite",
+  "Down": "Nach unten",
+  "Stop": "Stopp",
+  "Up": "Nach oben",
+  "Smart_Devices_Settings_Page": "Einstellungsseite Smarte Geräte",
+  "Air_Conditioners": "Klimaanlagen",
+  "Blinds": "Rollos",
+  "Medical_Device": "Medizinisches Gerät",
+  "Medical_Devices": "Medizinische Geräte",
+  "Smart_Phone": "Smartphone",
+  "Smart_Phones": "Smartphones",
+  "Smart_Speakers": "Smarter Lautsprecher",
+  "Smart_Devices_page": "Smarte Geräte Seite",
+  "History": "Verlauf",
+  "Scene": "Szene",
+  "Scenes": "Szenen",
+  "Lamps": "Lampen",
+  "Devices": "Geräte",
+  "Email_is_required": "E-Mail benötigt",
+  "Email_cannot_contain_spaces": "E-Mail darf keine Leerzeichen enthalten",
+  "Email_is_invalid": "E-Mail ist ungültig",
+  "Email": "E-Mail",
+  "Password_is_required": "Passwort benötigt",
+  "Password_cannot_contain_spaces": "Passwort darf keine Leerzeichen enthalten",
+  "Password_must_be_bigger_than__characters": "Passwort muss länger als {} Zeichen sein",
+  "Password": "Passwort",
+  "Log_In": "Login",
+  "Forgot_password": "Passwort vergessen",
+  "Forgot_password?": "Passwort vergessen?",
+  "title": "Titel",
+  "number": "Nummer",
+  "IP_is_required": "IP benötigt",
+  "IP_syntax_is_incorrect": "IP Syntax ist falsch",
+  "Add_Smart_Device": "Smartes Gerät hinzufügen",
+  "Cancel": "Abbrechen",
+  "Add": "Hinzufügen",
+  "Light": "Licht",
+  "Device_ip:_": "Gerät IP: {}",
+  "New_devices": "Neue Geräte",
+  "Add_devices": "Geräte hinzufügen",
+  "Device_type:_": "Gerätetyp: {}",
+  "Room_name_is_required": "Raumname muss angegeben werden",
+  "Room_name:": "Raumname:",
+  "Device_name_is_required": "Gerätename muss angegeben werden",
+  "Device_name:": "Gerätename:",
+  "Update": "Aktualisierung",
+  "IP": "IP",
+  "This_is_firebase": "Das ist Firebase",
+  "Device_with_ip:_": "Gerät mit der IP: {}",
+  "Update_WiFi_configuration": "WiFi Einstellungen updaten",
+  "WiFi_name_is_required": "WIFI Name muss angegeben werden",
+  "WiFi_Name": "WIFI Name",
+  "WiFi_password_is_required": "WIFI Passwort muss angegeben werden",
+  "WiFi_Password": "WIFI Passwort",
+  "Insert_WiFi_Credentials": "WIFI Zugangsdaten eingeben",
+  "Conditioners": "Spülungen",
+  "Medical": "Medizinisch",
+  "Phones": "Telefone",
+  "Speakers": "Lautsprecher",
+  "Send": "Senden",
+  "All_Devices": "Alle Geräte",
+  "Summary": "Zusammenfassung",
+  "Switches": "Schalter",
+  "Boilers": "Boiler",
+  "Lights": "Lichter",
+  "RGBw_Lights": "RGB Lichter",
+  "_Switches": "{} Schalter",
+  "_SmartTvs": "{} Smarte Fernseher",
+  "_RGBW_Lights": "{} RGBW Lichter",
+  "_Lights": "{} Lichter",
+  "_Boilers": "{} Boiler",
+  "_Blinds": "{} Rollos",
+  "Rooms": "Räume",
+  "_device": "{} Gerät",
+  "_devices": "{} Geräte",
+  "_SmartPlugs": "{} Smarte Steckdosen",
+  "On": "Ein",
+  "Off": "Aus",
+  "Color": "Farbe",
+  "White": "Weiß",
+  "Area": "Bereich",
+  "Areas": "Bereiche",
+  "Automations": "Automatisierungen",
+  "Scenes_In_Folder": "Szenen im Ordner",
+  "Select": "Auswählen",
+  "Exist": "Existtieren",
+  "OK": "OK",
+  "Nothing": "Nichts",
+  "No_need_here": "Nicht benötigt",
+  "Do_not_need": "Benötige ich nicht",
+  "Finish": "Fertigstellen",
+  "Select_Purposes_Of_The_Area": "Zweck für das Areal festlegen",
+  "Pulling_Up_all_blinds": "Alle Rollos öffnen",
+  "Stopping_all_blinds": "Alle Rollos stoppen",
+  "Pulling_down_all_blinds": "Alle Rollos schließen",
+  "Turning_On_boiler": "Boiler einschalten",
+  "Turning_Off_boiler": "Boiler ausschalten",
+  "Waiting_for_user_to_get_connected_to_WiFi": "Warten auf Verbindung des Users mit WIFI",
+  "Can't_add_unsupported_device": "Nicht unterstütztes Gerät kann nicht hinzugefügt werden"
+}
diff --git a/assets/translations/de-DE.json b/assets/translations/de-DE.json
index d8d7cd43c..4c0bc0a11 100644
--- a/assets/translations/de-DE.json
+++ b/assets/translations/de-DE.json
@@ -1,5 +1,5 @@
 {
-  "Create_new_account": "Erstelle einen neues Konto",
+  "Create_new_account": "Erstelle ein neues Konto",
   "Actions_History": "Aktivitätsverlauf",
   "Empty_history": "Verlauf leeren",
   "History_Settings_Page": "Verlaufs Einstellungsseite",
@@ -14,26 +14,26 @@
   "Down": "Runter",
   "Stop": "Stopp",
   "Up": "Hoch",
-  "Smart_Devices_Settings_Page": "Intelligente Geräte Einstellungsseite",
+  "Smart_Devices_Settings_Page": "Einstellungsseite für intelligente Geräte",
   "Air_Conditioners": "Klimaanlagen",
   "Blinds": "Jalousien",
   "Medical_Device": "Medizinisches Gerät",
   "Medical_Devices": "Medizinische Geräte",
   "Smart_Phone": "Smartphone",
   "Smart_Phones": "Smartphones",
-  "Smart_Speakers": "Intelligente Lautsprecher",
-  "Smart_Devices_page": "Intelligente Geräte Seite",
+  "Smart_Speakers": "Intelligenter Lautsprecher",
+  "Smart_Devices_page": "Seite für intelligente Geräte",
   "History": "Verlauf",
-  "Scene": "Szenerie",
-  "Scenes": "Szenerien",
+  "Scene": "Szene",
+  "Scenes": "Szenen",
   "Lamps": "Lampen",
   "Devices": "Geräte",
   "Email_is_required": "E-Mail Addresse ist erforderlich",
-  "Email_cannot_contain_spaces": "E-Mail Addresse kann keine Leerzeichen enthalten",
+  "Email_cannot_contain_spaces": "E-Mail Addresse darf keine Leerzeichen enthalten",
   "Email_is_invalid": "E-Mail Addresse ist ungültig",
   "Email": "E-Mail",
   "Password_is_required": "Passwort ist erforderlich",
-  "Password_cannot_contain_spaces": "Das Passwort kann keine Leerzeichen enthalten",
+  "Password_cannot_contain_spaces": "Das Passwort darf keine Leerzeichen enthalten",
   "Password_must_be_bigger_than__characters": "Passwort muss länger als {} Zeichen sein",
   "Password": "Passwort",
   "Log_In": "Anmelden",
@@ -46,14 +46,14 @@
   "Cancel": "Abbrechen",
   "Add": "Hinzufügen",
   "Light": "Licht",
-  "Device_ip:_": "Geräte IP-Adresse: {}",
+  "Device_ip:_": "Gerät IP-Adresse: {}",
   "New_devices": "Neues Gerät",
   "Add_devices": "Geräte hinzufügen",
   "Device_type:_": "Gerätetyp: {}",
   "Room_name_is_required": "Raumname is erforderlich",
   "Room_name:": "Raumname:",
-  "Device_name_is_required": "Gerätenamen ist erforderlich",
-  "Device_name:": "Gerätenamen:",
+  "Device_name_is_required": "Gerätename ist erforderlich",
+  "Device_name:": "Gerätename:",
   "Update": "Aktualisieren",
   "IP": "IP-Adresse",
   "This_is_firebase": "Das ist Firebase",
diff --git a/assets/translations/en-AU.json b/assets/translations/en-AU.json
new file mode 100644
index 000000000..a319c5e5f
--- /dev/null
+++ b/assets/translations/en-AU.json
@@ -0,0 +1,112 @@
+{
+  "Create_new_account": "Create new account",
+  "Actions_History": "Actions History",
+  "Empty_history": "Empty history",
+  "History_Settings_Page": "History Settings Page",
+  "Lamps_Page": "Lamps Page",
+  "Name:_": "Name: {}",
+  "Room:_": "Room: {}",
+  "Lamps_Settings_Page": "Lamps Settings Page",
+  "Welcome_to_your_Smart_Home": "Welcome to your Smart Home",
+  "Scene_Settings_Page": "Scene Settings Page",
+  "Move_to_blinds_full_settings_page": "Move to blinds full settings page",
+  "Blinds_Page": "Blinds Page",
+  "Down": "Down",
+  "Stop": "Stop",
+  "Up": "Up",
+  "Smart_Devices_Settings_Page": "Smart Devices Settings Page",
+  "Air_Conditioners": "Air Conditioners",
+  "Blinds": "Blinds",
+  "Medical_Device": "Medical Device",
+  "Medical_Devices": "Medical Devices",
+  "Smart_Phone": "Smart Phone",
+  "Smart_Phones": "Smart Phones",
+  "Smart_Speakers": "Smart Speakers",
+  "Smart_Devices_page": "Smart Devices page",
+  "History": "History",
+  "Scene": "Scene",
+  "Scenes": "Scenes",
+  "Lamps": "Lamps",
+  "Devices": "Devices",
+  "Email_is_required": "Email is required",
+  "Email_cannot_contain_spaces": "Email cannot contain spaces",
+  "Email_is_invalid": "Email is invalid",
+  "Email": "Email",
+  "Password_is_required": "Password is required",
+  "Password_cannot_contain_spaces": "Password cannot contain spaces",
+  "Password_must_be_bigger_than__characters": "Password must be bigger than {} characters",
+  "Password": "Password",
+  "Log_In": "Log In",
+  "Forgot_password": "Forgot Password",
+  "Forgot_password?": "Forgot password?",
+  "title": "title",
+  "number": "number",
+  "IP_is_required": "IP is required",
+  "IP_syntax_is_incorrect": "IP syntax is incorrect",
+  "Add_Smart_Device": "Add Smart Device",
+  "Cancel": "Cancel",
+  "Add": "Add",
+  "Light": "Light",
+  "Device_ip:_": "Device ip: {}",
+  "New_devices": "New devices",
+  "Add_devices": "Add devices",
+  "Device_type:_": "Device type: {}",
+  "Room_name_is_required": "Room name is required",
+  "Room_name:": "Room name:",
+  "Device_name_is_required": "Device name is required",
+  "Device_name:": "Device name:",
+  "Update": "Update",
+  "IP": "IP",
+  "This_is_firebase": "This is firebase",
+  "Device_with_ip:_": "Device with ip: {}",
+  "Update_WiFi_configuration": "Update WiFi configuration",
+  "WiFi_name_is_required": "WiFi name is required",
+  "WiFi_Name": "WiFi Name",
+  "WiFi_password_is_required": "WiFi password is required",
+  "WiFi_Password": "WiFi Password",
+  "Insert_WiFi_Credentials": "Insert WiFi Credentials",
+  "Conditioners": "Conditioners",
+  "Medical": "Medical",
+  "Phones": "Phones",
+  "Speakers": "Speakers",
+  "Send": "Send",
+  "All_Devices": "All Devices",
+  "Summary": "Summary",
+  "Switches": "Switches",
+  "Boilers": "Boilers",
+  "Lights": "Lights",
+  "RGBw_Lights": "RGBw Lights",
+  "_Switches": "{} Switches",
+  "_SmartTvs": "{} SmartTvs",
+  "_RGBW_Lights": "{} RGBW Lights",
+  "_Lights": "{} Lights",
+  "_Boilers": "{} Boilers",
+  "_Blinds": "{} Blinds",
+  "Rooms": "Rooms",
+  "_device": "{} device",
+  "_devices": "{} devices",
+  "_SmartPlugs": "{} SmartPlugs",
+  "On": "On",
+  "Off": "Off",
+  "Color": "Color",
+  "White": "White",
+  "Area": "Area",
+  "Areas": "Areas",
+  "Automations": "Automations",
+  "Scenes_In_Folder": "Scenes In Folder",
+  "Select": "Select",
+  "Exist": "Exist",
+  "OK": "OK",
+  "Nothing": "Nothing",
+  "No_need_here": "No need here",
+  "Do_not_need": "Do not need",
+  "Finish": "Finish",
+  "Select_Purposes_Of_The_Area": "Select Purposes Of The Area",
+  "Pulling_Up_all_blinds": "Pulling Up all blinds",
+  "Stopping_all_blinds": "Stopping all blinds",
+  "Pulling_down_all_blinds": "Pulling down all blinds",
+  "Turning_On_boiler": "Turning On boiler",
+  "Turning_Off_boiler": "Turning Off boiler",
+  "Waiting_for_user_to_get_connected_to_WiFi": "Waiting for user to get connected to WiFi",
+  "Can't_add_unsupported_device": "Can't add unsupported device"
+}
diff --git a/assets/translations/en-BD.json b/assets/translations/en-BD.json
new file mode 100644
index 000000000..a319c5e5f
--- /dev/null
+++ b/assets/translations/en-BD.json
@@ -0,0 +1,112 @@
+{
+  "Create_new_account": "Create new account",
+  "Actions_History": "Actions History",
+  "Empty_history": "Empty history",
+  "History_Settings_Page": "History Settings Page",
+  "Lamps_Page": "Lamps Page",
+  "Name:_": "Name: {}",
+  "Room:_": "Room: {}",
+  "Lamps_Settings_Page": "Lamps Settings Page",
+  "Welcome_to_your_Smart_Home": "Welcome to your Smart Home",
+  "Scene_Settings_Page": "Scene Settings Page",
+  "Move_to_blinds_full_settings_page": "Move to blinds full settings page",
+  "Blinds_Page": "Blinds Page",
+  "Down": "Down",
+  "Stop": "Stop",
+  "Up": "Up",
+  "Smart_Devices_Settings_Page": "Smart Devices Settings Page",
+  "Air_Conditioners": "Air Conditioners",
+  "Blinds": "Blinds",
+  "Medical_Device": "Medical Device",
+  "Medical_Devices": "Medical Devices",
+  "Smart_Phone": "Smart Phone",
+  "Smart_Phones": "Smart Phones",
+  "Smart_Speakers": "Smart Speakers",
+  "Smart_Devices_page": "Smart Devices page",
+  "History": "History",
+  "Scene": "Scene",
+  "Scenes": "Scenes",
+  "Lamps": "Lamps",
+  "Devices": "Devices",
+  "Email_is_required": "Email is required",
+  "Email_cannot_contain_spaces": "Email cannot contain spaces",
+  "Email_is_invalid": "Email is invalid",
+  "Email": "Email",
+  "Password_is_required": "Password is required",
+  "Password_cannot_contain_spaces": "Password cannot contain spaces",
+  "Password_must_be_bigger_than__characters": "Password must be bigger than {} characters",
+  "Password": "Password",
+  "Log_In": "Log In",
+  "Forgot_password": "Forgot Password",
+  "Forgot_password?": "Forgot password?",
+  "title": "title",
+  "number": "number",
+  "IP_is_required": "IP is required",
+  "IP_syntax_is_incorrect": "IP syntax is incorrect",
+  "Add_Smart_Device": "Add Smart Device",
+  "Cancel": "Cancel",
+  "Add": "Add",
+  "Light": "Light",
+  "Device_ip:_": "Device ip: {}",
+  "New_devices": "New devices",
+  "Add_devices": "Add devices",
+  "Device_type:_": "Device type: {}",
+  "Room_name_is_required": "Room name is required",
+  "Room_name:": "Room name:",
+  "Device_name_is_required": "Device name is required",
+  "Device_name:": "Device name:",
+  "Update": "Update",
+  "IP": "IP",
+  "This_is_firebase": "This is firebase",
+  "Device_with_ip:_": "Device with ip: {}",
+  "Update_WiFi_configuration": "Update WiFi configuration",
+  "WiFi_name_is_required": "WiFi name is required",
+  "WiFi_Name": "WiFi Name",
+  "WiFi_password_is_required": "WiFi password is required",
+  "WiFi_Password": "WiFi Password",
+  "Insert_WiFi_Credentials": "Insert WiFi Credentials",
+  "Conditioners": "Conditioners",
+  "Medical": "Medical",
+  "Phones": "Phones",
+  "Speakers": "Speakers",
+  "Send": "Send",
+  "All_Devices": "All Devices",
+  "Summary": "Summary",
+  "Switches": "Switches",
+  "Boilers": "Boilers",
+  "Lights": "Lights",
+  "RGBw_Lights": "RGBw Lights",
+  "_Switches": "{} Switches",
+  "_SmartTvs": "{} SmartTvs",
+  "_RGBW_Lights": "{} RGBW Lights",
+  "_Lights": "{} Lights",
+  "_Boilers": "{} Boilers",
+  "_Blinds": "{} Blinds",
+  "Rooms": "Rooms",
+  "_device": "{} device",
+  "_devices": "{} devices",
+  "_SmartPlugs": "{} SmartPlugs",
+  "On": "On",
+  "Off": "Off",
+  "Color": "Color",
+  "White": "White",
+  "Area": "Area",
+  "Areas": "Areas",
+  "Automations": "Automations",
+  "Scenes_In_Folder": "Scenes In Folder",
+  "Select": "Select",
+  "Exist": "Exist",
+  "OK": "OK",
+  "Nothing": "Nothing",
+  "No_need_here": "No need here",
+  "Do_not_need": "Do not need",
+  "Finish": "Finish",
+  "Select_Purposes_Of_The_Area": "Select Purposes Of The Area",
+  "Pulling_Up_all_blinds": "Pulling Up all blinds",
+  "Stopping_all_blinds": "Stopping all blinds",
+  "Pulling_down_all_blinds": "Pulling down all blinds",
+  "Turning_On_boiler": "Turning On boiler",
+  "Turning_Off_boiler": "Turning Off boiler",
+  "Waiting_for_user_to_get_connected_to_WiFi": "Waiting for user to get connected to WiFi",
+  "Can't_add_unsupported_device": "Can't add unsupported device"
+}
diff --git a/assets/translations/en-CA.json b/assets/translations/en-CA.json
new file mode 100644
index 000000000..a319c5e5f
--- /dev/null
+++ b/assets/translations/en-CA.json
@@ -0,0 +1,112 @@
+{
+  "Create_new_account": "Create new account",
+  "Actions_History": "Actions History",
+  "Empty_history": "Empty history",
+  "History_Settings_Page": "History Settings Page",
+  "Lamps_Page": "Lamps Page",
+  "Name:_": "Name: {}",
+  "Room:_": "Room: {}",
+  "Lamps_Settings_Page": "Lamps Settings Page",
+  "Welcome_to_your_Smart_Home": "Welcome to your Smart Home",
+  "Scene_Settings_Page": "Scene Settings Page",
+  "Move_to_blinds_full_settings_page": "Move to blinds full settings page",
+  "Blinds_Page": "Blinds Page",
+  "Down": "Down",
+  "Stop": "Stop",
+  "Up": "Up",
+  "Smart_Devices_Settings_Page": "Smart Devices Settings Page",
+  "Air_Conditioners": "Air Conditioners",
+  "Blinds": "Blinds",
+  "Medical_Device": "Medical Device",
+  "Medical_Devices": "Medical Devices",
+  "Smart_Phone": "Smart Phone",
+  "Smart_Phones": "Smart Phones",
+  "Smart_Speakers": "Smart Speakers",
+  "Smart_Devices_page": "Smart Devices page",
+  "History": "History",
+  "Scene": "Scene",
+  "Scenes": "Scenes",
+  "Lamps": "Lamps",
+  "Devices": "Devices",
+  "Email_is_required": "Email is required",
+  "Email_cannot_contain_spaces": "Email cannot contain spaces",
+  "Email_is_invalid": "Email is invalid",
+  "Email": "Email",
+  "Password_is_required": "Password is required",
+  "Password_cannot_contain_spaces": "Password cannot contain spaces",
+  "Password_must_be_bigger_than__characters": "Password must be bigger than {} characters",
+  "Password": "Password",
+  "Log_In": "Log In",
+  "Forgot_password": "Forgot Password",
+  "Forgot_password?": "Forgot password?",
+  "title": "title",
+  "number": "number",
+  "IP_is_required": "IP is required",
+  "IP_syntax_is_incorrect": "IP syntax is incorrect",
+  "Add_Smart_Device": "Add Smart Device",
+  "Cancel": "Cancel",
+  "Add": "Add",
+  "Light": "Light",
+  "Device_ip:_": "Device ip: {}",
+  "New_devices": "New devices",
+  "Add_devices": "Add devices",
+  "Device_type:_": "Device type: {}",
+  "Room_name_is_required": "Room name is required",
+  "Room_name:": "Room name:",
+  "Device_name_is_required": "Device name is required",
+  "Device_name:": "Device name:",
+  "Update": "Update",
+  "IP": "IP",
+  "This_is_firebase": "This is firebase",
+  "Device_with_ip:_": "Device with ip: {}",
+  "Update_WiFi_configuration": "Update WiFi configuration",
+  "WiFi_name_is_required": "WiFi name is required",
+  "WiFi_Name": "WiFi Name",
+  "WiFi_password_is_required": "WiFi password is required",
+  "WiFi_Password": "WiFi Password",
+  "Insert_WiFi_Credentials": "Insert WiFi Credentials",
+  "Conditioners": "Conditioners",
+  "Medical": "Medical",
+  "Phones": "Phones",
+  "Speakers": "Speakers",
+  "Send": "Send",
+  "All_Devices": "All Devices",
+  "Summary": "Summary",
+  "Switches": "Switches",
+  "Boilers": "Boilers",
+  "Lights": "Lights",
+  "RGBw_Lights": "RGBw Lights",
+  "_Switches": "{} Switches",
+  "_SmartTvs": "{} SmartTvs",
+  "_RGBW_Lights": "{} RGBW Lights",
+  "_Lights": "{} Lights",
+  "_Boilers": "{} Boilers",
+  "_Blinds": "{} Blinds",
+  "Rooms": "Rooms",
+  "_device": "{} device",
+  "_devices": "{} devices",
+  "_SmartPlugs": "{} SmartPlugs",
+  "On": "On",
+  "Off": "Off",
+  "Color": "Color",
+  "White": "White",
+  "Area": "Area",
+  "Areas": "Areas",
+  "Automations": "Automations",
+  "Scenes_In_Folder": "Scenes In Folder",
+  "Select": "Select",
+  "Exist": "Exist",
+  "OK": "OK",
+  "Nothing": "Nothing",
+  "No_need_here": "No need here",
+  "Do_not_need": "Do not need",
+  "Finish": "Finish",
+  "Select_Purposes_Of_The_Area": "Select Purposes Of The Area",
+  "Pulling_Up_all_blinds": "Pulling Up all blinds",
+  "Stopping_all_blinds": "Stopping all blinds",
+  "Pulling_down_all_blinds": "Pulling down all blinds",
+  "Turning_On_boiler": "Turning On boiler",
+  "Turning_Off_boiler": "Turning Off boiler",
+  "Waiting_for_user_to_get_connected_to_WiFi": "Waiting for user to get connected to WiFi",
+  "Can't_add_unsupported_device": "Can't add unsupported device"
+}
diff --git a/assets/translations/en-IM.json b/assets/translations/en-IM.json
new file mode 100644
index 000000000..a319c5e5f
--- /dev/null
+++ b/assets/translations/en-IM.json
@@ -0,0 +1,112 @@
+{
+  "Create_new_account": "Create new account",
+  "Actions_History": "Actions History",
+  "Empty_history": "Empty history",
+  "History_Settings_Page": "History Settings Page",
+  "Lamps_Page": "Lamps Page",
+  "Name:_": "Name: {}",
+  "Room:_": "Room: {}",
+  "Lamps_Settings_Page": "Lamps Settings Page",
+  "Welcome_to_your_Smart_Home": "Welcome to your Smart Home",
+  "Scene_Settings_Page": "Scene Settings Page",
+  "Move_to_blinds_full_settings_page": "Move to blinds full settings page",
+  "Blinds_Page": "Blinds Page",
+  "Down": "Down",
+  "Stop": "Stop",
+  "Up": "Up",
+  "Smart_Devices_Settings_Page": "Smart Devices Settings Page",
+  "Air_Conditioners": "Air Conditioners",
+  "Blinds": "Blinds",
+  "Medical_Device": "Medical Device",
+  "Medical_Devices": "Medical Devices",
+  "Smart_Phone": "Smart Phone",
+  "Smart_Phones": "Smart Phones",
+  "Smart_Speakers": "Smart Speakers",
+  "Smart_Devices_page": "Smart Devices page",
+  "History": "History",
+  "Scene": "Scene",
+  "Scenes": "Scenes",
+  "Lamps": "Lamps",
+  "Devices": "Devices",
+  "Email_is_required": "Email is required",
+  "Email_cannot_contain_spaces": "Email cannot contain spaces",
+  "Email_is_invalid": "Email is invalid",
+  "Email": "Email",
+  "Password_is_required": "Password is required",
+  "Password_cannot_contain_spaces": "Password cannot contain spaces",
+  "Password_must_be_bigger_than__characters": "Password must be bigger than {} characters",
+  "Password": "Password",
+  "Log_In": "Log In",
+  "Forgot_password": "Forgot Password",
+  "Forgot_password?": "Forgot password?",
+  "title": "title",
+  "number": "number",
+  "IP_is_required": "IP is required",
+  "IP_syntax_is_incorrect": "IP syntax is incorrect",
+  "Add_Smart_Device": "Add Smart Device",
+  "Cancel": "Cancel",
+  "Add": "Add",
+  "Light": "Light",
+  "Device_ip:_": "Device ip: {}",
+  "New_devices": "New devices",
+  "Add_devices": "Add devices",
+  "Device_type:_": "Device type: {}",
+  "Room_name_is_required": "Room name is required",
+  "Room_name:": "Room name:",
+  "Device_name_is_required": "Device name is required",
+  "Device_name:": "Device name:",
+  "Update": "Update",
+  "IP": "IP",
+  "This_is_firebase": "This is firebase",
+  "Device_with_ip:_": "Device with ip: {}",
+  "Update_WiFi_configuration": "Update WiFi configuration",
+  "WiFi_name_is_required": "WiFi name is required",
+  "WiFi_Name": "WiFi Name",
+  "WiFi_password_is_required": "WiFi password is required",
+  "WiFi_Password": "WiFi Password",
+  "Insert_WiFi_Credentials": "Insert WiFi Credentials",
+  "Conditioners": "Conditioners",
+  "Medical": "Medical",
+  "Phones": "Phones",
+  "Speakers": "Speakers",
+  "Send": "Send",
+  "All_Devices": "All Devices",
+  "Summary": "Summary",
+  "Switches": "Switches",
+  "Boilers": "Boilers",
+  "Lights": "Lights",
+  "RGBw_Lights": "RGBw Lights",
+  "_Switches": "{} Switches",
+  "_SmartTvs": "{} SmartTvs",
+  "_RGBW_Lights": "{} RGBW Lights",
+  "_Lights": "{} Lights",
+  "_Boilers": "{} Boilers",
+  "_Blinds": "{} Blinds",
+  "Rooms": "Rooms",
+  "_device": "{} device",
+  "_devices": "{} devices",
+  "_SmartPlugs": "{} SmartPlugs",
+  "On": "On",
+  "Off": "Off",
+  "Color": "Color",
+  "White": "White",
+  "Area": "Area",
+  "Areas": "Areas",
+  "Automations": "Automations",
+  "Scenes_In_Folder": "Scenes In Folder",
+  "Select": "Select",
+  "Exist": "Exist",
+  "OK": "OK",
+  "Nothing": "Nothing",
+  "No_need_here": "No need here",
+  "Do_not_need": "Do not need",
+  "Finish": "Finish",
+  "Select_Purposes_Of_The_Area": "Select Purposes Of The Area",
+  "Pulling_Up_all_blinds": "Pulling Up all blinds",
+  "Stopping_all_blinds": "Stopping all blinds",
+  "Pulling_down_all_blinds": "Pulling down all blinds",
+  "Turning_On_boiler": "Turning On boiler",
+  "Turning_Off_boiler": "Turning Off boiler",
+  "Waiting_for_user_to_get_connected_to_WiFi": "Waiting for user to get connected to WiFi",
+  "Can't_add_unsupported_device": "Can't add unsupported device"
+}
diff --git a/assets/translations/en-IN.json b/assets/translations/en-IN.json
new file mode 100644
index 000000000..a319c5e5f
--- /dev/null
+++ b/assets/translations/en-IN.json
@@ -0,0 +1,112 @@
+{
+  "Create_new_account": "Create new account",
+  "Actions_History": "Actions History",
+  "Empty_history": "Empty history",
+  "History_Settings_Page": "History Settings Page",
+  "Lamps_Page": "Lamps Page",
+  "Name:_": "Name: {}",
+  "Room:_": "Room: {}",
+  "Lamps_Settings_Page": "Lamps Settings Page",
+  "Welcome_to_your_Smart_Home": "Welcome to your Smart Home",
+  "Scene_Settings_Page": "Scene Settings Page",
+  "Move_to_blinds_full_settings_page": "Move to blinds full settings page",
+  "Blinds_Page": "Blinds Page",
+  "Down": "Down",
+  "Stop": "Stop",
+  "Up": "Up",
+  "Smart_Devices_Settings_Page": "Smart Devices Settings Page",
+  "Air_Conditioners": "Air Conditioners",
+  "Blinds": "Blinds",
+  "Medical_Device": "Medical Device",
+  "Medical_Devices": "Medical Devices",
+  "Smart_Phone": "Smart Phone",
+  "Smart_Phones": "Smart Phones",
+  "Smart_Speakers": "Smart Speakers",
+  "Smart_Devices_page": "Smart Devices page",
+  "History": "History",
+  "Scene": "Scene",
+  "Scenes": "Scenes",
+  "Lamps": "Lamps",
+  "Devices": "Devices",
+  "Email_is_required": "Email is required",
+  "Email_cannot_contain_spaces": "Email cannot contain spaces",
+  "Email_is_invalid": "Email is invalid",
+  "Email": "Email",
+  "Password_is_required": "Password is required",
+  "Password_cannot_contain_spaces": "Password cannot contain spaces",
+  "Password_must_be_bigger_than__characters": "Password must be bigger than {} characters",
+  "Password": "Password",
+  "Log_In": "Log In",
+  "Forgot_password": "Forgot Password",
+  "Forgot_password?": "Forgot password?",
+  "title": "title",
+  "number": "number",
+  "IP_is_required": "IP is required",
+  "IP_syntax_is_incorrect": "IP syntax is incorrect",
+  "Add_Smart_Device": "Add Smart Device",
+  "Cancel": "Cancel",
+  "Add": "Add",
+  "Light": "Light",
+  "Device_ip:_": "Device ip: {}",
+  "New_devices": "New devices",
+  "Add_devices": "Add devices",
+  "Device_type:_": "Device type: {}",
+  "Room_name_is_required": "Room name is required",
+  "Room_name:": "Room name:",
+  "Device_name_is_required": "Device name is required",
+  "Device_name:": "Device name:",
+  "Update": "Update",
+  "IP": "IP",
+  "This_is_firebase": "This is firebase",
+  "Device_with_ip:_": "Device with ip: {}",
+  "Update_WiFi_configuration": "Update WiFi configuration",
+  "WiFi_name_is_required": "WiFi name is required",
+  "WiFi_Name": "WiFi Name",
+  "WiFi_password_is_required": "WiFi password is required",
+  "WiFi_Password": "WiFi Password",
+  "Insert_WiFi_Credentials": "Insert WiFi Credentials",
+  "Conditioners": "Conditioners",
+  "Medical": "Medical",
+  "Phones": "Phones",
+  "Speakers": "Speakers",
+  "Send": "Send",
+  "All_Devices": "All Devices",
+  "Summary": "Summary",
+  "Switches": "Switches",
+  "Boilers": "Boilers",
+  "Lights": "Lights",
+  "RGBw_Lights": "RGBw Lights",
+  "_Switches": "{} Switches",
+  "_SmartTvs": "{} SmartTvs",
+  "_RGBW_Lights": "{} RGBW Lights",
+  "_Lights": "{} Lights",
+  "_Boilers": "{} Boilers",
+  "_Blinds": "{} Blinds",
+  "Rooms": "Rooms",
+  "_device": "{} device",
+  "_devices": "{} devices",
+  "_SmartPlugs": "{} SmartPlugs",
+  "On": "On",
+  "Off": "Off",
+  "Color": "Color",
+  "White": "White",
+  "Area": "Area",
+  "Areas": "Areas",
+  "Automations": "Automations",
+  "Scenes_In_Folder": "Scenes In Folder",
+  "Select": "Select",
+  "Exist": "Exist",
+  "OK": "OK",
+  "Nothing": "Nothing",
+  "No_need_here": "No need here",
+  "Do_not_need": "Do not need",
+  "Finish": "Finish",
+  "Select_Purposes_Of_The_Area": "Select Purposes Of The Area",
+  "Pulling_Up_all_blinds": "Pulling Up all blinds",
+  "Stopping_all_blinds": "Stopping all blinds",
+  "Pulling_down_all_blinds": "Pulling down all blinds",
+  "Turning_On_boiler": "Turning On boiler",
+  "Turning_Off_boiler": "Turning Off boiler",
+  "Waiting_for_user_to_get_connected_to_WiFi": "Waiting for user to get connected to WiFi",
+  "Can't_add_unsupported_device": "Can't add unsupported device"
+}
diff --git a/assets/translations/en-PK.json b/assets/translations/en-PK.json
new file mode 100644
index 000000000..a319c5e5f
--- /dev/null
+++ b/assets/translations/en-PK.json
@@ -0,0 +1,112 @@
+{
+  "Create_new_account": "Create new account",
+  "Actions_History": "Actions History",
+  "Empty_history": "Empty history",
+  "History_Settings_Page": "History Settings Page",
+  "Lamps_Page": "Lamps Page",
+  "Name:_": "Name: {}",
+  "Room:_": "Room: {}",
+  "Lamps_Settings_Page": "Lamps Settings Page",
+  "Welcome_to_your_Smart_Home": "Welcome to your Smart Home",
+  "Scene_Settings_Page": "Scene Settings Page",
+  "Move_to_blinds_full_settings_page": "Move to blinds full settings page",
+  "Blinds_Page": "Blinds Page",
+  "Down": "Down",
+  "Stop": "Stop",
+  "Up": "Up",
+  "Smart_Devices_Settings_Page": "Smart Devices Settings Page",
+  "Air_Conditioners": "Air Conditioners",
+  "Blinds": "Blinds",
+  "Medical_Device": "Medical Device",
+  "Medical_Devices": "Medical Devices",
+  "Smart_Phone": "Smart Phone",
+  "Smart_Phones": "Smart Phones",
+  "Smart_Speakers": "Smart Speakers",
+  "Smart_Devices_page": "Smart Devices page",
+  "History": "History",
+  "Scene": "Scene",
+  "Scenes": "Scenes",
+  "Lamps": "Lamps",
+  "Devices": "Devices",
+  "Email_is_required": "Email is required",
+  "Email_cannot_contain_spaces": "Email cannot contain spaces",
+  "Email_is_invalid": "Email is invalid",
+  "Email": "Email",
+  "Password_is_required": "Password is required",
+  "Password_cannot_contain_spaces": "Password cannot contain spaces",
+  "Password_must_be_bigger_than__characters": "Password must be bigger than {} characters",
+  "Password": "Password",
+  "Log_In": "Log In",
+  "Forgot_password": "Forgot Password",
+  "Forgot_password?": "Forgot password?",
+  "title": "title",
+  "number": "number",
+  "IP_is_required": "IP is required",
+  "IP_syntax_is_incorrect": "IP syntax is incorrect",
+  "Add_Smart_Device": "Add Smart Device",
+  "Cancel": "Cancel",
+  "Add": "Add",
+  "Light": "Light",
+  "Device_ip:_": "Device ip: {}",
+  "New_devices": "New devices",
+  "Add_devices": "Add devices",
+  "Device_type:_": "Device type: {}",
+  "Room_name_is_required": "Room name is required",
+  "Room_name:": "Room name:",
+  "Device_name_is_required": "Device name is required",
+  "Device_name:": "Device name:",
+  "Update": "Update",
+  "IP": "IP",
+  "This_is_firebase": "This is firebase",
+  "Device_with_ip:_": "Device with ip: {}",
+  "Update_WiFi_configuration": "Update WiFi configuration",
+  "WiFi_name_is_required": "WiFi name is required",
+  "WiFi_Name": "WiFi Name",
+  "WiFi_password_is_required": "WiFi password is required",
+  "WiFi_Password": "WiFi Password",
+  "Insert_WiFi_Credentials": "Insert WiFi Credentials",
+  "Conditioners": "Conditioners",
+  "Medical": "Medical",
+  "Phones": "Phones",
+  "Speakers": "Speakers",
+  "Send": "Send",
+  "All_Devices": "All Devices",
+  "Summary": "Summary",
+  "Switches": "Switches",
+  "Boilers": "Boilers",
+  "Lights": "Lights",
+  "RGBw_Lights": "RGBw Lights",
+  "_Switches": "{} Switches",
+  "_SmartTvs": "{} SmartTvs",
+  "_RGBW_Lights": "{} RGBW Lights",
+  "_Lights": "{} Lights",
+  "_Boilers": "{} Boilers",
+  "_Blinds": "{} Blinds",
+  "Rooms": "Rooms",
+  "_device": "{} device",
+  "_devices": "{} devices",
+  "_SmartPlugs": "{} SmartPlugs",
+  "On": "On",
+  "Off": "Off",
+  "Color": "Color",
+  "White": "White",
+  "Area": "Area",
+  "Areas": "Areas",
+  "Automations": "Automations",
+  "Scenes_In_Folder": "Scenes In Folder",
+  "Select": "Select",
+  "Exist": "Exist",
+  "OK": "OK",
+  "Nothing": "Nothing",
+  "No_need_here": "No need here",
+  "Do_not_need": "Do not need",
+  "Finish": "Finish",
+  "Select_Purposes_Of_The_Area": "Select Purposes Of The Area",
+  "Pulling_Up_all_blinds": "Pulling Up all blinds",
+  "Stopping_all_blinds": "Stopping all blinds",
+  "Pulling_down_all_blinds": "Pulling down all blinds",
+  "Turning_On_boiler": "Turning On boiler",
+  "Turning_Off_boiler": "Turning Off boiler",
+  "Waiting_for_user_to_get_connected_to_WiFi": "Waiting for user to get connected to WiFi",
+  "Can't_add_unsupported_device": "Can't add unsupported device"
+}
diff --git a/assets/translations/en-PR.json b/assets/translations/en-PR.json
new file mode 100644
index 000000000..858f5b5c5
--- /dev/null
+++ b/assets/translations/en-PR.json
@@ -0,0 +1,112 @@
+{
+    "Create_new_account": "Create new account",
+    "Actions_History": "Actions History",
+    "Empty_history": "Empty history",
+    "History_Settings_Page": "History Settings Page",
+    "Lamps_Page": "Lamps Page",
+    "Name:_": "Name: {}",
+    "Room:_": "Room: {}",
+    "Lamps_Settings_Page": "Lamps Settings Page",
+    "Welcome_to_your_Smart_Home": "Welcome to your Smart Home",
+    "Scene_Settings_Page": "Scene Settings Page",
+    "Move_to_blinds_full_settings_page": "Move to blinds full settings page",
+    "Blinds_Page": "Blinds Page",
+    "Down": "Down",
+    "Stop": "Stop",
+    "Up": "Up",
+    "Smart_Devices_Settings_Page": "Smart Devices Settings Page",
+    "Air_Conditioners": "Air Conditioners",
+    "Blinds": "Blinds",
+    "Medical_Device": "Medical Device",
+    "Medical_Devices": "Medical Devices",
+    "Smart_Phone": "Smart Phone",
+    "Smart_Phones": "Smart Phones",
+    "Smart_Speakers": "Smart Speakers",
+    "Smart_Devices_page": "Smart Devices page",
+    "History": "History",
+    "Scene": "Scene",
+    "Scenes": "Scenes",
+    "Lamps": "Lamps",
+    "Devices": "Devices",
+    "Email_is_required": "Email is required",
+    "Email_cannot_contain_spaces": "Email cannot contain spaces",
+    "Email_is_invalid": "Email is invalid",
+    "Email": "Email",
+    "Password_is_required": "Password is required",
+    "Password_cannot_contain_spaces": "Password cannot contain spaces",
+    "Password_must_be_bigger_than__characters": "Password must be bigger than {} characters",
+    "Password": "Password",
+    "Log_In": "Log In",
+    "Forgot_password": "Forgot Password",
+    "Forgot_password?": "Forgot password?",
+    "title": "title",
+    "number": "number",
+    "IP_is_required": "IP is required",
+    "IP_syntax_is_incorrect": "IP syntax is incorrect",
+    "Add_Smart_Device": "Add Smart Device",
+    "Cancel": "Cancel",
+    "Add": "Add",
+    "Light": "Light",
+    "Device_ip:_": "Device ip: {}",
+    "New_devices": "New devices",
+    "Add_devices": "Add devices",
+    "Device_type:_": "Device type: {}",
+    "Room_name_is_required": "Room name is required",
+    "Room_name:": "Room name:",
+    "Device_name_is_required": "Device name is required",
+    "Device_name:": "Device name:",
+    "Update": "Update",
+    "IP": "IP",
+    "This_is_firebase": "This is firebase",
+    "Device_with_ip:_": "Device with ip: {}",
+    "Update_WiFi_configuration": "Update WiFi configuration",
+    "WiFi_name_is_required": "WiFi name is required",
+    "WiFi_Name": "WiFi Name",
+    "WiFi_password_is_required": "WiFi password is required",
+    "WiFi_Password": "WiFi Password",
+    "Insert_WiFi_Credentials": "Insert WiFi Credentials",
+    "Conditioners": "Conditioners",
+    "Medical": "Medical",
+    "Phones": "Phones",
+    "Speakers": "Speakers",
+    "Send": "Send",
+    "All_Devices": "All Devices",
+    "Summary": "Summary",
+    "Switches": "Switches",
+    "Boilers": "Boilers",
+    "Lights": "Lights",
+    "RGBw_Lights": "RGBw Lights",
+    "_Switches": "{} Switches",
+    "_SmartTvs": "{} SmartTvs",
+    "_RGBW_Lights": "{} RGBW Lights",
+    "_Lights": "{} Lights",
+    "_Boilers": "{} Boilers",
+    "_Blinds": "{} Blinds",
+    "Rooms": "Rooms",
+    "_device": "{} device",
+    "_devices": "{} devices",
+    "_SmartPlugs": "{} SmartPlugs",
+    "On": "On",
+    "Off": "Off",
+    "Color": "Color",
+    "White": "White",
+    "Area": "Area",
+    "Areas": "Areas",
+    "Automations": "Automations",
+    "Scenes_In_Folder": "Scenes In Folder",
+    "Select": "Select",
+    "Exist": "Exist",
+    "OK": "OK",
+    "Nothing": "Nothing",
+    "No_need_here": "No need here",
+    "Do_not_need": "Do not need",
+    "Finish": "Finish",
+    "Select_Purposes_Of_The_Area": "Select Purposes Of The Area",
+    "Pulling_Up_all_blinds": "Pulling Up all blinds",
+    "Stopping_all_blinds": "Stopping all blinds",
+    "Pulling_down_all_blinds": "Pulling down all blinds",
+    "Turning_On_boiler": "Turning On boiler",
+    "Turning_Off_boiler": "Turning Off boiler",
+    "Waiting_for_user_to_get_connected_to_WiFi": "Waiting for user to get connected to WiFi",
+    "Can't_add_unsupported_device": "Can't add unsupported device"
+}
diff --git a/assets/translations/en-SG.json b/assets/translations/en-SG.json
new file mode 100644
index 000000000..a319c5e5f
--- /dev/null
+++ b/assets/translations/en-SG.json
@@ -0,0 +1,112 @@
+{
+  "Create_new_account": "Create new account",
+  "Actions_History": "Actions History",
+  "Empty_history": "Empty history",
+  "History_Settings_Page": "History Settings Page",
+  "Lamps_Page": "Lamps Page",
+  "Name:_": "Name: {}",
+  "Room:_": "Room: {}",
+  "Lamps_Settings_Page": "Lamps Settings Page",
+  "Welcome_to_your_Smart_Home": "Welcome to your Smart Home",
+  "Scene_Settings_Page": "Scene Settings Page",
+  "Move_to_blinds_full_settings_page": "Move to blinds full settings page",
+  "Blinds_Page": "Blinds Page",
+  "Down": "Down",
+  "Stop": "Stop",
+  "Up": "Up",
+  "Smart_Devices_Settings_Page": "Smart Devices Settings Page",
+  "Air_Conditioners": "Air Conditioners",
+  "Blinds": "Blinds",
+  "Medical_Device": "Medical Device",
+  "Medical_Devices": "Medical Devices",
+  "Smart_Phone": "Smart Phone",
+  "Smart_Phones": "Smart Phones",
+  "Smart_Speakers": "Smart Speakers",
+  "Smart_Devices_page": "Smart Devices page",
+  "History": "History",
+  "Scene": "Scene",
+  "Scenes": "Scenes",
+  "Lamps": "Lamps",
+  "Devices": "Devices",
+  "Email_is_required": "Email is required",
+  "Email_cannot_contain_spaces": "Email cannot contain spaces",
+  "Email_is_invalid": "Email is invalid",
+  "Email": "Email",
+  "Password_is_required": "Password is required",
+  "Password_cannot_contain_spaces": "Password cannot contain spaces",
+  "Password_must_be_bigger_than__characters": "Password must be bigger than {} characters",
+  "Password": "Password",
+  "Log_In": "Log In",
+  "Forgot_password": "Forgot Password",
+  "Forgot_password?": "Forgot password?",
+  "title": "title",
+  "number": "number",
+  "IP_is_required": "IP is required",
+  "IP_syntax_is_incorrect": "IP syntax is incorrect",
+  "Add_Smart_Device": "Add Smart Device",
+  "Cancel": "Cancel",
+  "Add": "Add",
+  "Light": "Light",
+  "Device_ip:_": "Device ip: {}",
+  "New_devices": "New devices",
+  "Add_devices": "Add devices",
+  "Device_type:_": "Device type: {}",
+  "Room_name_is_required": "Room name is required",
+  "Room_name:": "Room name:",
+  "Device_name_is_required": "Device name is required",
+  "Device_name:": "Device name:",
+  "Update": "Update",
+  "IP": "IP",
+  "This_is_firebase": "This is firebase",
+  "Device_with_ip:_": "Device with ip: {}",
+  "Update_WiFi_configuration": "Update WiFi configuration",
+  "WiFi_name_is_required": "WiFi name is required",
+  "WiFi_Name": "WiFi Name",
+  "WiFi_password_is_required": "WiFi password is required",
+  "WiFi_Password": "WiFi Password",
+  "Insert_WiFi_Credentials": "Insert WiFi Credentials",
+  "Conditioners": "Conditioners",
+  "Medical": "Medical",
+  "Phones": "Phones",
+  "Speakers": "Speakers",
+  "Send": "Send",
+  "All_Devices": "All Devices",
+  "Summary": "Summary",
+  "Switches": "Switches",
+  "Boilers": "Boilers",
+  "Lights": "Lights",
+  "RGBw_Lights": "RGBw Lights",
+  "_Switches": "{} Switches",
+  "_SmartTvs": "{} SmartTvs",
+  "_RGBW_Lights": "{} RGBW Lights",
+  "_Lights": "{} Lights",
+  "_Boilers": "{} Boilers",
+  "_Blinds": "{} Blinds",
+  "Rooms": "Rooms",
+  "_device": "{} device",
+  "_devices": "{} devices",
+  "_SmartPlugs": "{} SmartPlugs",
+  "On": "On",
+  "Off": "Off",
+  "Color": "Color",
+  "White": "White",
+  "Area": "Area",
+  "Areas": "Areas",
+  "Automations": "Automations",
+  "Scenes_In_Folder": "Scenes In Folder",
+  "Select": "Select",
+  "Exist": "Exist",
+  "OK": "OK",
+  "Nothing": "Nothing",
+  "No_need_here": "No need here",
+  "Do_not_need": "Do not need",
+  "Finish": "Finish",
+  "Select_Purposes_Of_The_Area": "Select Purposes Of The Area",
+  "Pulling_Up_all_blinds": "Pulling Up all blinds",
+  "Stopping_all_blinds": "Stopping all blinds",
+  "Pulling_down_all_blinds": "Pulling down all blinds",
+  "Turning_On_boiler": "Turning On boiler",
+  "Turning_Off_boiler": "Turning Off boiler",
+  "Waiting_for_user_to_get_connected_to_WiFi": "Waiting for user to get connected to WiFi",
+  "Can't_add_unsupported_device": "Can't add unsupported device"
+}
diff --git a/assets/translations/en-US.json b/assets/translations/en-US.json
index 39dabdfc2..a319c5e5f 100644
--- a/assets/translations/en-US.json
+++ b/assets/translations/en-US.json
@@ -101,5 +101,12 @@
   "No_need_here": "No need here",
   "Do_not_need": "Do not need",
   "Finish": "Finish",
-  "Select_Purposes_Of_The_Area": "Select Purposes Of The Area"
+  "Select_Purposes_Of_The_Area": "Select Purposes Of The Area",
+  "Pulling_Up_all_blinds": "Pulling Up all blinds",
+  "Stopping_all_blinds": "Stopping all blinds",
+  "Pulling_down_all_blinds": "Pulling down all blinds",
+  "Turning_On_boiler": "Turning On boiler",
+  "Turning_Off_boiler": "Turning Off boiler",
+  "Waiting_for_user_to_get_connected_to_WiFi": "Waiting for user to get connected to WiFi",
+  "Can't_add_unsupported_device": "Can't add unsupported device"
 }
diff --git a/assets/translations/es-US.json b/assets/translations/es-US.json
new file mode 100644
index 000000000..825dcb24d
--- /dev/null
+++ b/assets/translations/es-US.json
@@ -0,0 +1,105 @@
+{
+  "Create_new_account": "Crear nueva cuenta",
+  "Actions_History": "Historial de acciones",
+  "Empty_history": "historial",
+  "History_Settings_Page": "Pagina de configuraciones del Historial",
+  "Lamps_Page": "Pagina de iluminacion",
+  "Name:_": "Nombre: {}",
+  "Room:_": "Habitacion: {}",
+  "Lamps_Settings_Page": "Página de configuración de iluminacion",
+  "Welcome_to_your_Smart_Home": "Bienvenido a su casa inteligente",
+  "Scene_Settings_Page": "Página de configuración de escenas",
+  "Move_to_blinds_full_settings_page": "Mover a la página de configuración de persianas",
+  "Blinds_Page": "Pagina de Persianas",
+  "Down": "Bajar",
+  "Stop": "Parar",
+  "Up": "Subir",
+  "Smart_Devices_Settings_Page": "Página de configuración de dispositivos inteligentes",
+  "Air_Conditioners": "Aires acondicionados",
+  "Blinds": "persianas",
+  "Medical_Device": "Dispositivo medico",
+  "Medical_Devices": "Dispositivos medicos",
+  "Smart_Phone": "Teléfono inteligente",
+  "Smart_Phones": "Teléfonos inteligentes",
+  "Smart_Speakers": "Parlantes inteligentes",
+  "Smart_Devices_page": "Página de dispositivos inteligentes",
+  "History": "Historial",
+  "Scene": "Escena",
+  "Scenes": "Escenas",
+  "Lamps": "Iluminación",
+  "Devices": "Dispositivos",
+  "Email_is_required": "El Email es requerido",
+  "Email_cannot_contain_spaces": "El Email no puede contener espacios",
+  "Email_is_invalid": "El Email es invalido",
+  "Email": "Email",
+  "Password_is_required": "Contraseña requerida",
+  "Password_cannot_contain_spaces": "La contraseña no puede contener espacios",
+  "Password_must_be_bigger_than__characters": "La contraseña no puede contener más de {} caracteres",
+  "Password": "Contraseña",
+  "Log_In": "Iniciar sesión",
+  "Forgot_password": "Olvidaste tu contraseña",
+  "Forgot_password?": "Olvidaste tu contraseña ?",
+  "title": "Título",
+  "number": "Número",
+  "IP_is_required": "La IP es requerida",
+  "IP_syntax_is_incorrect": "La sintaxis de la IP es incorrecta",
+  "Add_Smart_Device": "Añadir dispositivo inteligente",
+  "Cancel": "Cancelar",
+  "Add": "Añadir",
+  "Light": "Luz",
+  "Device_ip:_": "IP del dispositivo: {}",
+  "New_devices": "Nuevos dispositivos",
+  "Add_devices": "Añadir dispositivos",
+  "Device_type:_": "Tipo de dispositivo: {}",
+  "Room_name_is_required": "El nombre de la habitación es requerido",
+  "Room_name:": "Nombre de la habitación:",
+  "Device_name_is_required": "El nombre del dispositivo es requerido",
+  "Device_name:": "Nombre del dispositivo:",
+  "Update": "Actualizar",
+  "IP": "IP",
+  "This_is_firebase": "Esto es firebase",
+  "Device_with_ip:_": "Dispositivo con ip: {}",
+  "Update_WiFi_configuration": "Actualizar configuración del WiFi",
+  "WiFi_name_is_required": "Nombre del WiFi es requerido",
+  "WiFi_Name": "Nombre del WiFi",
+  "WiFi_password_is_required": "La contraseña del WiFi es requerida",
+  "WiFi_Password": "Contraseña del WiFi",
+  "Insert_WiFi_Credentials": "Introduce las credenciales del WiFi",
+  "Conditioners": "Acondicionadores",
+  "Medical": "Medico",
+  "Phones": "Telefonos",
+  "Speakers": "Parlantes",
+  "Send": "Enviar",
+  "All_Devices": "Todos los dispositivos",
+  "Summary": "Resumen",
+  "Switches": "interruptores",
+  "Boilers": "Hervidoras",
+  "Lights": "Luces",
+  "RGBw_Lights": "Luces RGBw",
+  "_Switches": "{} Interruptores",
+  "_SmartTvs": "{} Televisores inteligentes",
+  "_RGBW_Lights": "{} Luces RGBW",
+  "_Lights": "{} Luces",
+  "_Boilers": "{} Hervidoras",
+  "_Blinds": "{} Persianas",
+  "Rooms": "habitaciones",
+  "_device": "{} dispositivo",
+  "_devices": "{} dispositivos",
+  "_SmartPlugs": "{} Enchufes Inteligentes",
+  "On": "Encendido",
+  "Off": "Apagado",
+  "Color": "Color",
+  "White": "Blanco",
+  "Area": "Área",
+  "Areas": "Áreas",
+  "Automations": "Automatizaciones",
+  "Scenes_In_Folder": "Escenas en carpeta",
+  "Select": "Seleccionar",
+  "Exist": "Existe",
+  "OK": "OK",
+  "Nothing": "Nada",
+  "No_need_here": "No es necesario aquí",
+  "Do_not_need": "No se necesita",
+  "Finish": "Terminar",
+  "Select_Purposes_Of_The_Area": "Seleccionar el proposito de esta área"
+}
diff --git a/assets/translations/gu-IN b/assets/translations/gu-IN
new file mode 100644
index 000000000..00408b0d0
--- /dev/null
+++ b/assets/translations/gu-IN
@@ -0,0 +1,112 @@
+{
+  "Create_new_account": "નવું_ખાતું બનાવો",
+  "Actions_History": "ક્રિયાઓ_ઇતિહાસ",
+  "Empty_history": "ખાલી_ઇતિહાસ",
+  "History_Settings_Page": "ઇતિહાસ_સેટિંગ્સ_પૃષ્ઠ",
+  "Lamps_Page": "લેમ્પ્સ_પેજ",
+  "Name:_": "નામ: {}",
+  "Room:_": "રૂમ: {}",
+  "Lamps_Settings_Page": "લેમ્પ્સ_સેટિંગ્સ_પેજ",
+  "Welcome_to_your_Smart_Home": "તમારા_સ્માર્ટ_હોમમાં_સ્વાગત છે",
+  "Scene_Settings_Page": "સીન_સેટિંગ્સ_પેજ",
+  "Move_to_blinds_full_settings_page": "બ્લાઇંડ્સ_પૂર્ણ_સેટિંગ્સ_પેજ પર_મૂવ કરો",
+  "Blinds_Page": "બ્લાઇંડ્સ_પેજ",
+  "Down": "નીચે",
+  "Stop": "રોકો",
+  "Up": "અપ",
+  "Smart_Devices_Settings_Page": "સ્માર્ટ_ઉપકરણો_સેટિંગ્સ_પૃષ્ઠ",
+  "Air_Conditioners": "એર_કંડિશનર",
+  "Blinds": "બ્લાઈન્ડ્સ",
+  "Medical_Device": "તબીબી ઉપકરણ",
+  "Medical_Devices": "Medical Devices",
+  "Smart_Phone": "સ્માર્ટ_ફોન",
+  "Smart_Phones": "સ્માર્ટ_ફોન્સ",
+  "Smart_Speakers": "સ્માર્ટ_સ્પીકર્સ",
+  "Smart_Devices_page": "સ્માર્ટ_ઉપકરણો_પૃષ્ઠ",
+  "History": "ઇતિહાસ",
+  "Scene": "દ્રશ્ય",
+  "Scenes": "દ્રશ્યો",
+  "Lamps": "લેમ્પ્સ",
+  "Devices": "ઉપકરણો",
+  "Email_is_required": "ઇમેઇલ આવશ્યક છે",
+  "Email_cannot_contain_spaces": "ઈમેલમાં જગ્યાઓ હોઈ શકતી નથી",
+  "Email_is_invalid": "ઇમેઇલ છે અમાન્ય",
+  "Email": "ઈમેલ",
+  "Password_is_required": "પાસવર્ડ છે જરૂરી",
+  "Password_cannot_contain_spaces": "પાસવર્ડ કન્ટેન કોન્ટેન સ્પેસ સમાવી શકાતો નથી",
+  "Password_must_be_bigger_than__characters": "પાસવર્ડ પાસવર્ડ અક્ષરો કરતાંમોટા {} હોવા જોઈએ ",
+  "Password": "પાસવર્ડ",
+  "Log_In": "લૉગ ઇન",
+  "Forgot_password": "પાસવર્ડ ભૂલી ગયા છો",
+  "Forgot_password?": "પાસવર્ડ ભૂલી ગયા છો?",
+  "title": "શીર્ષક",
+  "number": "સંખ્યા",
+  "IP_is_required": "IP જરૂરી છે",
+  "IP_syntax_is_incorrect": "IP સિન્ટેક્સ ખોટો છે",
+  "Add_Smart_Device": "સ્માર્ટ ઉપકરણ ઉમેરો",
+  "Cancel": "રદ કરો",
+  "Add": "ઉમેરો",
+  "Light": "લાઈટ",
+  "Device_ip:_": "ઉપકરણ_ip: {}",
+  "New_devices": "નવા ઉપકરણો",
+  "Add_devices": "ઉપકરણો ઉમેરો",
+  "Device_type:_": "ઉપકરણ પ્રકાર: {}",
+  "Room_name_is_required": "રૂમનું નામ જરૂરી છે",
+  "Room_name:": "રૂમ નામ",
+  "Device_name_is_required": "ઉપકરણ નામ જરૂરી છે",
+  "Device_name:": "ઉપકરણનું નામ",
+  "Update": "અપડેટ કરો",
+  "IP": "આઈપી",
+  "This_is_firebase": "આ ફાયરબેઝ છે",
+  "Device_with_ip:_": "આઇપી સાથેનું ઉપકરણ: {}",
+  "Update_WiFi_configuration": "WiFi ગોઠવણી અપડેટ કરો",
+  "WiFi_name_is_required": "વાઇફાઇ નામ આવશ્યક છે",
+  "WiFi_Name": "વાઇફાઇનું નામ",
+  "WiFi_password_is_required": "વાઇફાઇ પાસવર્ડ આવશ્યક છે",
+  "WiFi_Password": "વાઇફાઇ પાસવર્ડ",
+  "Insert_WiFi_Credentials": "વાઇફાઇ ઓળખપત્રો દાખલ કરો",
+  "Conditioners": "કન્ડિશનર્સ",
+  "Medical": "મેડિકલ",
+  "Phones": "ફોન્સ",
+  "Speakers": "સ્પીકર્સ",
+  "Send": "મોકલો",
+  "All_Devices": "બધા ઉપકરણો",
+  "Summary": "સારાંશ",
+  "Switches": "સ્વીચો",
+  "Boilers": "બોઇલર્સ",
+  "Lights": "Lightલાઈટ્સ",
+  "RGBw_Lights": "આરજીબી લાઈટ્સ",
+  "_Switches": "{} સ્વીચો",
+  "_SmartTvs": "{} સ્માર્ટ ટીવી",
+  "_RGBW_Lights": "{} આરજીબીડબ્લ્યુ લાઈટ્સ",
+  "_Lights": "{} લાઈટ્સ",
+  "_Boilers": "{} બોઇલર્સ",
+  "_Blinds": "{} બ્લાઇંડ્સ",
+  "Rooms": "ઓરડાઓ",
+  "_device": "{} ઉપકરણ",
+  "_devices": "{} ઉપકરણો",
+  "_SmartPlugs": "{} સ્માર્ટપ્લગ્સ",
+  "On": "પર",
+  "Off": "બંધ",
+  "Color": "રંગ",
+  "White": "સફેદ",
+  "Area": "વિસ્તાર",
+  "Areas": "વિસ્તારો",
+  "Automations": "ઓટોમેશન્સ",
+  "Scenes_In_Folder": "ફોલ્ડરમાં દ્રશ્યો",
+  "Select": "સિલેક્ટ કરો",
+  "Exist": "અસ્તિત્વમાં છે",
+  "OK": "ઠીક છે",
+  "Nothing": "કંઈ નહીં",
+  "No_need_here": "અહીં જરૂર નથી",
+  "Do_not_need": "જરૂર નથી",
+  "Finish": "સમાપ્ત કરો",
+  "Select_Purposes_Of_The_Area": "વિસ્તારના હેતુઓ પસંદ કરો",
+  "Pulling_Up_all_blinds": "બધા બ્લાઇંડ્સ ઉપર ખેંચી રહ્યા છીએ",
+  "Stopping_all_blinds": "બધા બ્લાઇંડ્સ અટકાવી રહ્યા છીએ",
+  "Pulling_down_all_blinds": "બધા બ્લાઇંડ્સ નીચે ખેંચીને",
+  "Turning_On_boiler": "બોઈલર ચાલુ કરી રહ્યા છીએ",
+  "Turning_Off_boiler": "બોઈલર બંધ કરી રહ્યા છીએ",
+  "Waiting_for_user_to_get_connected_to_WiFi": "વપરાશકર્તા WiFi સાથે કનેક્ટ થાય તેની રાહ જોઈ રહ્યાં છીએ",
+  "Can't_add_unsupported_device": "અસમર્થિત ઉપકરણ ઉમેરી શકાતું નથી"
+}
diff --git a/assets/translations/hi-IN.json b/assets/translations/hi-IN.json
index 4e024394e..2fd3806f2 100644
--- a/assets/translations/hi-IN.json
+++ b/assets/translations/hi-IN.json
@@ -3,34 +3,37 @@
   "Actions_History": "क्रिया इतिहास",
   "Empty_history": "खाली इतिहास",
   "History_Settings_Page": "इतिहास सेटिंग पेज",
-  "Lamps_Page": "लैंप पेज",
+  "Lamps_Page": "लैंप पृष्ठ",
   "Name:_": "नाम: {}",
-  "Room:_": "कक्ष: {}",
-  "Lamps_Settings_Page": "लैंप सेटिंग पेज",
+  "Room:_": "कमरा: {}",
+  "Lamps_Settings_Page": "लैंप सेटिंग पृष्ठ",
   "Welcome_to_your_Smart_Home": "अपने स्मार्ट होम में आपका स्वागत है",
-  "Scene_Settings_Page": "दृश्य सेटिंग्स पेज",
-  "Move_to_blinds_full_settings_page": "पूर्ण सेटिंग्स पृष्ठ अंधा करने के लिए ले जाएँ",
-  "Blinds_Page": "अंधा पृष्ठ",
+  "Scene_Settings_Page": "दृश्य समायोजन पृष्ठ",
+  "Move_to_blinds_full_settings_page": "पूर्ण चिलमन समायोजन पृष्ठ पर जाएं",
+  "Blinds_Page": "चिलमन पृष्ठ",
   "Down": "नीचे",
   "Stop": "रुकें",
   "Up": "ऊपर",
-  "Smart_Devices_Settings_Page": "स्मार्ट डिवाइस सेटिंग्स पेज",
+  "Smart_Devices_Settings_Page": "स्मार्ट उपकरण समायोजन पृष्ठ",
   "Air_Conditioners": "एयर कंडिशनर",
-  "Blinds": "ब्लाइंड",
+  "Blinds": "चिलमन",
+  "Smart_Devices_Settings_Page": "स्मार्ट डिवाइस सेटिंग्स पेज",
+  "Air_Conditioners": "वातानुकूलक",
+  "Blinds": "पर्देा",
   "Medical_Device": "चिकित्सीय उपकरण",
   "Smart_Phone": "स्मार्टफोन",
   "Smart_Speakers": "स्मार्ट स्पीकर",
-  "Smart_Devices_page": "स्मार्ट डिवाइसेस पेज",
+  "Smart_Devices_page": "स्मार्ट उपकरण पृष्ठ",
   "History": "इतिहास",
-  "Scene": "स्थल",
-  "Lamps": "लैंप",
+  "Scene": "दृश्य",
+  "Lamps": "चिराग",
   "Devices": "उपकरण",
-  "Email_is_required": "ईमेल जरुरी है",
+  "Email_is_required": "ईमेल की आवश्यकता है",
   "Email_cannot_contain_spaces": "ईमेल में रिक्त स्थान नहीं हो सकते",
   "Email_is_invalid": "ईमेल अमान्य है",
   "Email": "ईमेल",
   "Password_is_required": "पासवर्ड की आवश्यकता है",
-  "Password_cannot_contain_spaces": "पासवर्ड में खाली स्थान नहीं हो सकता",
+  "Password_cannot_contain_spaces": "पासवर्ड में रिक्त स्थान नहीं हो सकता",
   "Password_must_be_bigger_than__characters": "पासवर्ड {} वर्णों से बड़ा होना चाहिए",
   "Password": "पासवर्ड",
   "Log_In": "लॉग इन करें",
@@ -39,20 +42,65 @@
   "number": "संख्या",
   "IP_is_required": "आईपी आवश्यक है",
   "IP_syntax_is_incorrect": "आईपी सिंटेक्स गलत है",
-  "Add_Smart_Device": "स्मार्ट डिवाइस जोड़ें",
-  "Cancel": "रद्द करना",
-  "Add": "जोड़ना",
+  "Add_Smart_Device": "स्मार्ट उपकरण जोड़ें",
+  "Cancel": "रद्द",
+  "Add": "जोड़ें",
   "Light": "रोशनी",
-  "Device_ip:_": "डिवाइस आई.पी.: {}",
+  "Device_ip:_": "उपकरण आई.पी.: {}",
   "New_devices": "नए उपकरण",
   "Add_devices": "उपकरण जोड़ें",
   "Device_type:_": "उपकरण का प्रकार: {}",
   "Room_name_is_required": "कमरे का नाम आवश्यक है",
   "Room_name:": "कमरे का नाम:",
-  "Device_name_is_required": "डिवाइस का नाम आवश्यक है",
+  "Device_name_is_required": "उपकरण का नाम आवश्यक है",
+  "Device_name:": "उपकरण का नाम:",
+  "Device_name_is_required": "यन्त्र का नाम आवश्यक है",
   "Device_name:": "यन्त्र का नाम:",
   "Update": "अपडेट करें",
   "IP": "आईपी",
   "This_is_firebase": "यह फायरबेस है",
-  "Device_with_ip:_": "आईपी के साथ डिवाइस: {}"
+  "Device_with_ip:_": "आईपी के साथ उपकरण: {}",
+  "Update_WiFi_configuration": "वाईफाई कॉन्फ़िगरेशन अपडेट करें",
+  "WiFi_name_is_required": "वाईफाई का नाम आवश्यक है",
+  "WiFi_Name": "वाईफाई का नाम",
+  "WiFi_password_is_required": "वाईफाई पासवर्ड आवश्यक है",
+  "WiFi_Password": "वाईफाई पासवर्ड",
+  "Insert_WiFi_Credentials": "वाईफाई के प्रत्यायक डालें",
+  "Conditioners": "कंडीशनर",
+  "Medical": "चिकित्सा",
+  "Phones": "दूरभाष",
+  "Speakers": "वक्ताओं",
+  "Send": "भेजना",
+  "All_Devices": "सभी उपकरण",
+  "Summary": "सारांश",
+  "Switches": "स्विच",
+  "Boilers": "बॉयलर",
+  "Lights": "रोशनी",
+  "RGBw_Lights": "RGBw रोशनी",
+  "_Switches": "{} स्विच",
+  "_SmartTvs": "{} स्मार्टदूरदर्शन",
+  "_RGBW_Lights": "{} RGBW रोशनी",
+  "_Lights": "{} रोशनी",
+  "_Boilers": "{} बॉयलर",
+  "_Blinds": "{} परदा",
+  "Rooms": "कमरे",
+  "_device": "{} उपकरण",
+  "_devices": "{} उपकरण",
+  "_SmartPlugs": "{} स्मार्टप्लग",
+  "On": "चालू",
+  "Off": "बंद",
+  "Color": "रंग",
+  "White": "सफेद",
+  "Area": "क्षेत्र",
+  "Areas": "क्षेत्रों",
+  "Automations": "स्वचालन",
+  "Scenes_In_Folder": "फ़ोल्डर के दृश्य",
+  "Select": "चयन करें",
+  "Exist": "अस्तित्व रखना",
+  "OK": "ठीक है",
+  "Nothing": "कुछ भी तो नहीं",
+  "No_need_here": "यहाँ कोई ज़रूरत नहीं है",
+  "Do_not_need": "जरूरत नहीं है",
+  "Finish": "पूर्ण करना",
+  "Select_Purposes_Of_The_Area": "क्षेत्र के प्रयोजनों का चयन करें"
 }
diff --git a/assets/translations/id-ID.json b/assets/translations/id-ID.json
index 144135b4b..c135b8d55 100644
--- a/assets/translations/id-ID.json
+++ b/assets/translations/id-ID.json
@@ -1,11 +1,11 @@
 {
   "Create_new_account": "Buat akun baru",
-  "Actions_History": "History tindakan",
-  "Empty_history": "Kosongkan history",
-  "History_Settings_Page": "Halaman Pengaturan History",
+  "Actions_History": "Riwayat tindakan",
+  "Empty_history": "Kosongkan riwayat",
+  "History_Settings_Page": "Halaman Pengaturan Riwayat",
   "Lamps_Page": "Halaman lampu",
   "Name:_": "Nama: {}",
-  "Room:_": "Kamar: {}",
+  "Room:_": "Ruang: {}",
   "Lamps_Settings_Page": "Halaman Pengaturan Lampu",
   "Welcome_to_your_Smart_Home": "Selamat datang di Smart Home milikmu",
   "Scene_Settings_Page": "Halaman Pengaturan Scene",
@@ -21,20 +21,20 @@
   "Smart_Phone": "Smart Phone",
   "Smart_Speakers": "Smart Speakers",
   "Smart_Devices_page": "Halaman Smart Devices",
-  "History": "History",
+  "History": "Riwayat",
   "Scene": "Scene",
   "Lamps": "Lampu",
   "Devices": "Perangkat",
   "Email_is_required": "Email dibutuhkan",
-  "Email_cannot_contain_spaces": "Email tidak dapat mengandung spasi",
+  "Email_cannot_contain_spaces": "Email tidak boleh mengandung spasi",
   "Email_is_invalid": "Email tidak valid",
   "Email": "Email",
-  "Password_is_required": "Password dibutuhkan",
-  "Password_cannot_contain_spaces": "Password tidak dapat mengandung spasi",
-  "Password_must_be_bigger_than__characters": "Password harus lebih dari {} karakter",
-  "Password": "Password",
+  "Password_is_required": "Kata sandi diperlukan",
+  "Password_cannot_contain_spaces": "Kata sandi tidak dapat mengandung spasi",
+  "Password_must_be_bigger_than__characters": "Kata sandi harus lebih dari {} karakter",
+  "Password": "Kata sandi",
   "Log_In": "Masuk",
-  "Forgot_password?": "Lupa password?",
+  "Forgot_password?": "Lupa kata sandi?",
   "title": "judul",
   "number": "angka",
   "IP_is_required": "IP dibutuhkan",
@@ -47,12 +47,59 @@
   "New_devices": "Perangkat baru",
   "Add_devices": "Tambahkan perangkat",
   "Device_type:_": "Tipe Perangkat: {}",
-  "Room_name_is_required": "Nama kamar dibutuhkan",
-  "Room_name:": "Nama Kamar:",
+  "Room_name_is_required": "Nama ruang dibutuhkan",
+  "Room_name:": "Nama Ruang:",
   "Device_name_is_required": "Nama perangkat dibutuhkan",
   "Device_name:": "Nama perangkat:",
-  "Update": "Update",
+  "Update": "Perbarui",
   "IP": "IP",
   "This_is_firebase": "Ini adalah firebase",
-  "Device_with_ip:_": "Perangkat dengan ip: {}"
+  "Device_with_ip:_": "Perangkat dengan ip: {}",
+  "Update_WiFi_configuration": "Update konfigurasi WiFi",
+  "WiFi_name_is_required": "Nama WiFi dibutuhkan",
+  "WiFi_Name": "Nama WiFi",
+  "WiFi_password_is_required": "Kata sandi WiFi dibutuhkan",
+  "WiFi_Password": "Kata sandi WiFi",
+  "Insert_WiFi_Credentials": "Masukkan Kredensial WiFi",
+  "Conditioners": "Kondisioner",
+  "Medical": "Medis",
+  "Phones": "Telepon",
+  "Speakers": "Speaker",
+  "Send": "Kirim",
+  "All_Devices": "Semua perangkat",
+  "Summary": "Ringkasan",
+  "Switches": "Sakelar",
+  "Boilers": "Boiler",
+  "Lights": "Lampu",
+  "RGBw_Lights": "Lampu RGBw",
+  "_Switches": "{} Sakelar",
+  "_SmartTvs": "{} Smart TV",
+  "_RGBW_Lights": "{} Lampu RGBW",
+  "_Lights": "{} Lampu",
+  "_Boilers": "{} Boiler",
+  "_Blinds": "{} Tirai",
+  "Rooms": "Ruangan",
+  "_device": "{} perangkat",
+  "_devices": "{} perangkat",
+  "_SmartPlugs": "{} SmartPlug",
+  "On": "Hidup",
+  "Off": "Mati",
+  "Color": "Warna",
+  "White": "Putih",
+  "Area": "Area",
+  "Areas": "Area",
+  "Automations": "Otomatis",
+  "Scenes_In_Folder": "Scenes In Folder",
+  "Select": "Pilih",
+  "Exist": "Ada",
+  "OK": "OK",
+  "Nothing": "Tidak ada",
+  "No_need_here": "Tidak perlu di sini",
+  "Do_not_need": "Tidak butuh",
+  "Finish": "Selesai",
+  "Select_Purposes_Of_The_Area": "Pilih Tujuan Area",
+  "Waiting_for_user_to_get_connected_to_WiFi": "Menunggu pengguna terhubung ke WiFi",
+  "Can't_add_unsupported_device": "Tidak dapat menambahkan perangkat yang tidak didukung",
+  "Delete": "Hapus",
+  "Don't touch me" : "Jangan sentuh saya"
 }
diff --git a/assets/translations/it-IT.json b/assets/translations/it-IT.json
index c096f9d73..3dd7ff083 100644
--- a/assets/translations/it-IT.json
+++ b/assets/translations/it-IT.json
@@ -9,20 +9,23 @@
   "Lamps_Settings_Page": "Pagina Impostazioni Lampade",
   "Welcome_to_your_Smart_Home": "Benvenuto nella tua Smart Home",
   "Scene_Settings_Page": "Pagina Impostazioni Scena",
-  "Move_to_blinds_full_settings_page": "Vai alla pagina impostazioni complete delle veneziane",
-  "Blinds_Page": "Pagina Veneziane",
+  "Move_to_blinds_full_settings_page": "Vai alla pagina impostazioni complete delle tapparelle",
+  "Blinds_Page": "Pagina Tapparelle",
   "Down": "Giù",
   "Stop": "Stop",
   "Up": "Su",
   "Smart_Devices_Settings_Page": "Pagina Impostazioni Dispositivi Smart",
   "Air_Conditioners": "Condizionatori",
-  "Blinds": "Veneziane",
+  "Blinds": "Tapparelle",
   "Medical_Device": "Dispositivo Medico",
-  "Smart_Phone": "Smart Phone",
-  "Smart_Speakers": "Speaker Smart",
+  "Medical_Devices": "Dispositivi Medici",
+  "Smart_Phone": "Smartphone",
+  "Smart Phones": "Smartphone", 
+  "Smart_Speakers": "Smart Speaker",
   "Smart_Devices_page": "Pagina Dispositivi Smart",
   "History": "Cronologia",
   "Scene": "Scena",
+  "Scenes": "Scene",
   "Lamps": "Lampade",
   "Devices": "Dispositivi",
   "Email_is_required": "Email richiesta",
@@ -33,7 +36,8 @@
   "Password_cannot_contain_spaces": "La password non può contenere spazi",
   "Password_must_be_bigger_than__characters": "La password deve avere più di {} caratteri",
   "Password": "Password",
-  "Log_In": "Log In",
+  "Log_In": "Accedi",
+  "Forgot_password": "Password dimenticata",
   "Forgot_password?": "Password dimenticata?",
   "title": "titolo",
   "number": "numero",
@@ -54,5 +58,55 @@
   "Update": "Aggiorna",
   "IP": "IP",
   "This_is_firebase": "Questo è firebase",
-  "Device_with_ip:_": "Dispositivo con IP: {}"
+  "Device_with_ip:_": "Dispositivo con IP: {}",
+  "Update_WiFi_configuration": "Aggiorna le impostazioni WiFi",
+  "WiFi_name_is_required": "Nome WiFi richiesto",
+  "WiFi_Name": "Nome WiFi",
+  "WiFi_password_is_required": "Pasword WiFi richiesta",
+  "WiFi_Password": "Password WiFi",
+  "Insert_WiFi_Credentials": "Inserisci le credenziali della WiFi",
+  "Conditioners": "Condizionatori",
+  "Medical": "Medico",
+  "Phones": "Telefoni",
+  "Speakers": "Casse",
+  "Send": "Invia",
+  "All_Devices": "Tutti i dipositivi",
+  "Summary": "Riepilogo",
+  "Switches": "Interruttori",
+  "Boilers": "Caldaie",
+  "Lights": "Luci",
+  "RGBw_Lights": "Luci RGBw",
+  "_Switches": "{} Interruttori",
+  "_SmartTvs": "{} Smart TV",
+  "_RGBW_Lights": "{} Luci RGBWs",
+  "_Lights": "{} Luci",
+  "_Boilers": "{} Caldaie",
+  "_Blinds": "{} Tapparelle",
+  "Rooms": "Stanze",
+  "_device": "{} dispositivo",
+  "_devices": "{} dispositivi",
+  "_SmartPlugs": "{} Presa Smart",
+  "On": "On",
+  "Off": "Off",
+  "Color": "Colore",
+  "White": "Bianco",
+  "Area": "Area",
+  "Areas": "Aree",
+  "Automations": "Automazioni",
+  "Scenes_In_Folder": "Scene nella cartella",
+  "Select": "Seleziona",
+  "Exist": "Esistente",
+  "OK": "OK",
+  "Nothing": "Niente",
+  "No_need_here": "Non serve qui",
+  "Do_not_need": "Non serve",
+  "Finish": "Termina",
+  "Select_Purposes_Of_The_Area": "Seleziona lo scopo dell'area",
+  "Pulling_Up_all_blinds": "Apri tutte le tapparelle",
+  "Stopping_all_blinds": "Ferma tutte le tapparelle",
+  "Pulling_down_all_blinds": "Chiudi tutte le tapparelle",
+  "Turning_On_boiler": "Accendi la caldaia",
+  "Turning_Off_boiler": "Spegni la caldaia",
+  "Waiting_for_user_to_get_connected_to_WiFi": "In attesa che l'utente si connetta alla WiFi",
+  "Can't_add_unsupported_device": "Impossibile aggiungere dispositivo non supportato"
 }
diff --git a/assets/translations/ja-JP.json b/assets/translations/ja-JP.json
new file mode 100644
index 000000000..f05b5ba08
--- /dev/null
+++ b/assets/translations/ja-JP.json
@@ -0,0 +1,105 @@
+{
+  "Create_new_account": "新しいアカウントを作成する",
+  "Actions_History": "アクション履歴",
+  "Empty_history": "空の履歴",
+  "History_Settings_Page": "履歴設定ページ",
+  "Lamps_Page": "ランプページ",
+  "Name:_": "名前: {}",
+  "Room:_": "部屋: {}",
+  "Lamps_Settings_Page": "ランプ設定ページ",
+  "Welcome_to_your_Smart_Home": "スマートホームへようこそ",
+  "Scene_Settings_Page": "シーン設定ページ",
+  "Move_to_blinds_full_settings_page": "ブラインドフル設定ページへ移動",
+  "Blinds_Page": "ブラインドページ",
+  "Down": "下",
+  "Stop": "止まる",
+  "Up": "上",
+  "Smart_Devices_Settings_Page": "スマート デバイス設定ページ",
+  "Air_Conditioners": "エアコン",
+  "Blinds": "ブラインド",
+  "Medical_Device": "医療機器",
+  "Medical_Devices": "医療機器",
+  "Smart_Phone": "スマートフォン",
+  "Smart_Phones": "スマートフォン",
+  "Smart_Speakers": "スマートスピーカー",
+  "Smart_Devices_page": "スマート デバイス ページ",
+  "History": "歴史",
+  "Scene": "シーン",
+  "Scenes": "シーン",
+  "Lamps": "ランプ",
+  "Devices": "デバイス",
+  "Email_is_required": "メールアドレス必須",
+  "Email_cannot_contain_spaces": "メールにスペースを含めることはできません",
+  "Email_is_invalid": "メールが無効です",
+  "Email": "電子メイル",
+  "Password_is_required": "パスワードが必要です",
+  "Password_cannot_contain_spaces": "パスワードにはスペースを含めることはできません",
+  "Password_must_be_bigger_than__characters": "パスワードは {} 文字以上にする必要があります",
+  "Password": "パスワード",
+  "Log_In": "ログインする",
+  "Forgot_password": "パスワードをお忘れですか",
+  "Forgot_password?": "パスワードをお忘れですか？",
+  "title": "題名",
+  "number": "番号",
+  "IP_is_required": "IP が必要です",
+  "IP_syntax_is_incorrect": "IP 構文が正しくありません",
+  "Add_Smart_Device": "スマート デバイスの追加",
+  "Cancel": "キャンセル",
+  "Add": "追加",
+  "Light": "光",
+  "Device_ip:_": "デバイス IP: {}",
+  "New_devices": "新しいデバイス",
+  "Add_devices": "デバイスを追加",
+  "Device_type:_": "デバイスタイプ: {}",
+  "Room_name_is_required": "部屋名必須",
+  "Room_name:": "部屋の名前 :",
+  "Device_name_is_required": "デバイス名は必須です",
+  "Device_name:": "装置名:",
+  "Update": "アップデート",
+  "IP": "IP",
+  "This_is_firebase": "これはファイアーベースです",
+  "Device_with_ip:_": "IP を持つデバイス: {}",
+  "Update_WiFi_configuration": "WiFi 構成の更新",
+  "WiFi_name_is_required": "Wi-Fi 名は必須です",
+  "WiFi_Name": "WiFi 名",
+  "WiFi_password_is_required": "WiFiパスワードが必要です",
+  "WiFi_Password": "WiFi パスワード",
+  "Insert_WiFi_Credentials": "WiFi クレデンシャルの挿入",
+  "Conditioners": "コンディショナー",
+  "Medical": "医学",
+  "Phones": "電話",
+  "Speakers": "スピーカー",
+  "Send": "送信",
+  "All_Devices": "すべてのデバイス",
+  "Summary": "概要",
+  "Switches": "スイッチ",
+  "Boilers": "ボイラー",
+  "Lights": "ライト",
+  "RGBw_Lights": "RGBwライト",
+  "_Switches": "{} スイッチ",
+  "_SmartTvs": "{} スマートテレビ",
+  "_RGBW_Lights": "{} RGBwライト",
+  "_Lights": "{} ライト",
+  "_Boilers": "{} ボイラー",
+  "_Blinds": "{} ブラインド",
+  "Rooms": "部屋",
+  "_device": "{} デバイス",
+  "_devices": "{} デバイス",
+  "_SmartPlugs": "{} スマートプラグ",
+  "On": "の上",
+  "Off": "オフ",
+  "Color": "色",
+  "White": "白",
+  "Area": "領域",
+  "Areas": "エリア",
+  "Automations": "自動化",
+  "Scenes_In_Folder": "フォルダー内のシーン",
+  "Select": "選択する",
+  "Exist": "存在",
+  "OK": "わかった",
+  "Nothing": "何もない",
+  "No_need_here": "ここはいらない",
+  "Do_not_need": "必要はありません",
+  "Finish": "終了",
+  "Select_Purposes_Of_The_Area": "エリアの目的を選択"
+}
diff --git a/assets/translations/ml-IN.json b/assets/translations/ml-IN.json
new file mode 100644
index 000000000..166e2edb9
--- /dev/null
+++ b/assets/translations/ml-IN.json
@@ -0,0 +1,105 @@
+{
+  "Create_new_account": "പുതിയ അക്കൗണ്ട് സൃഷ്ടിക്കുക",
+  "Actions_History": "പ്രവൃത്തികളുടെ ചരിത്രം",
+  "Empty_history": "ശൂന്യമായ ചരിത്രം",
+  "History_Settings_Page": "ചരിത്ര സജ്ജീകരണങ്ങൾ പേജ്",
+  "Lamps_Page": "വിളക്കുകളുടെ പേജ്",
+  "Name:_": "നാമം: {}",
+  "Room:_": "മുറി: {}",
+  "Lamps_Settings_Page": "വിളക്കുകളുടെ സജ്ജീകരണങ്ങൾ പേജ്",
+  "Welcome_to_your_Smart_Home": "നിങ്ങളുടെ സ്മാർട്ട് ഹോമിലേക്ക് സ്വാഗതം",
+  "Scene_Settings_Page": "രംഗ സജ്ജീകരണങ്ങൾ പേജ്",
+  "Move_to_blinds_full_settings_page": "മുഴുവൻ സജ്ജീകരണങ്ങളും എന്ന താളിലേക്ക് നീങ്ങുക",
+  "Blinds_Page": "ബ്ലൈൻഡ്സ് പേജ്",
+  "Down": "താഴേക്ക്",
+  "Stop": "നിര് ത്തൂ.",
+  "Up": "മുകളിലേക്ക്",
+  "Smart_Devices_Settings_Page": "സ്മാർട്ട് ഉപകരണങ്ങളുടെ സജ്ജീകരണങ്ങൾ പേജ്",
+  "Air_Conditioners": "എയർ കണ്ടീഷണറുകൾ",
+  "Blinds": "ബ്ലൈൻഡ്സ്",
+  "Medical_Device": "മെഡിക്കൽ ഉപകരണം",
+  "Medical_Devices": "മെഡിക്കൽ ഉപകരണങ്ങൾ",
+  "Smart_Phone": "സ്മാർട്ട് ഫോൺ",
+  "Smart_Phones": "സ്മാർട്ട് ഫോണുകൾ",
+  "Smart_Speakers": "സ്മാർട്ട് സ്പീക്കറുകൾ",
+  "Smart_Devices_page": "സ്മാർട്ട് ഉപകരണങ്ങളുടെ പേജ്",
+  "History": "ചരിത്രം",
+  "Scene": "രംഗം",
+  "Scenes": "രംഗങ്ങൾ",
+  "Lamps": "വിളക്കുകൾ",
+  "Devices": "ഉപകരണങ്ങൾ",
+  "Email_is_required": "ഇമെയിൽ ആവശ്യമാണ്",
+  "Email_cannot_contain_spaces": "ഇമെയിലിൽ സ്പേസുകൾ അടങ്ങിയിരിക്കാൻ കഴിയില്ല",
+  "Email_is_invalid": "ഇമെയിൽ അസാധുവാണ്",
+  "Email": "ഇമെയിൽ",
+  "Password_is_required": "രഹസ്യവാക്ക് ആവശ്യമാണ്",
+  "Password_cannot_contain_spaces": "പാസ് വേഡില് സ്പേസുകള് ഉള് ക്കൊള്ളുവാന് സാധ്യമല്ല",
+  "Password_must_be_bigger_than__characters": "രഹസ്യവാക്ക് {} പ്രതീകങ്ങളേക്കാൾ വലുതായിരിക്കണം",
+  "Password": "അടയാളവാക്ക്",
+  "Log_In": "ലോഗ് ഇൻ",
+  "Forgot_password": "പാസ് വേഡ് മറന്നു",
+  "Forgot_password?": "പാസ് വേഡ് മറന്നോ?",
+  "title": "തലക്കെട്ട്",
+  "number": "സംഖ്യ",
+  "IP_is_required": "IP ആവശ്യമാണ്",
+  "IP_syntax_is_incorrect": "IP സിന്റാക്സ് തെറ്റാണ്",
+  "Add_Smart_Device": "സ്മാർട്ട് ഉപകരണം ചേർക്കുക",
+  "Cancel": "ക്യാൻസൽ ചെയ്യ്",
+  "Add": "ചേര് ക്കുക",
+  "Light": "വെളിച്ചം",
+  "Device_ip:_": "ഉപകരണ ip: {}",
+  "New_devices": "പുതിയ ഉപകരണങ്ങൾ",
+  "Add_devices": "ഉപകരണങ്ങള് ചേര് ക്കുക",
+  "Device_type:_": "ഉപകരണ തരം: {}",
+  "Room_name_is_required": "മുറിയുടെ പേര് ആവശ്യമാണ്",
+  "Room_name:": "മുറിയുടെ പേര്:",
+  "Device_name_is_required": "ഉപകരണത്തിന്റെ പേര് ആവശ്യമാണ്",
+  "Device_name:": "ഉപകരണത്തിന്റെ പേര്:",
+  "Update": "അപ് ഡേറ്റ് ചെയ്യുക",
+  "IP": "IP",
+  "This_is_firebase": "ഇത് ഫയർബേസ് ആണ്",
+  "Device_with_ip:_": "ip ഉള്ള ഉപകരണം: {}",
+  "Update_WiFi_configuration": "WiFi ക്രമീകരണം അപ് ഡേറ്റ് ചെയ്യുക",
+  "WiFi_name_is_required": "വൈഫൈയുടെ പേര് ആവശ്യമാണ്",
+  "WiFi_Name": "വൈഫൈയുടെ പേര്",
+  "WiFi_password_is_required": "വൈഫൈ പാസ് വേഡ് ആവശ്യമാണ്",
+  "WiFi_Password": "വൈഫൈ പാസ് വേഡ്",
+  "Insert_WiFi_Credentials": "WiFi ക്രെഡൻഷ്യലുകൾ ചേർക്കുക",
+  "Conditioners": "കണ്ടീഷണറുകൾ",
+  "Medical": "മെഡിക്കൽ",
+  "Phones": "ഫോണുകൾ",
+  "Speakers": "സംസാരിക്കുന്നവർ",
+  "Send": "അയയ്ക്കുക",
+  "All_Devices": "എല്ലാ ഉപകരണങ്ങളും",
+  "Summary": "സംഗ്രഹം",
+  "Switches": "സ്വിച്ചുകള്",
+  "Boilers": "ബോയിലറുകൾ",
+  "Lights": "ലൈറ്റുകൾ",
+  "RGBw_Lights": "RGBw ലൈറ്റുകൾ",
+  "_Switches": "{} സ്വിച്ചുകള്",
+  "_SmartTvs": "{} സ്മാർട്ട് ടിവികൾ",
+  "_RGBW_Lights": "{} RGBW ലൈറ്റുകൾ",
+  "_Lights": "{} ലൈറ്റുകൾ",
+  "_Boilers": "{} ബോയിലറുകൾ",
+  "_Blinds": "{} ബ്ലൈൻഡ്സ്",
+  "Rooms": "മുറികൾ",
+  "_device": "{} ഉപകരണം",
+  "_devices": "{} ഉപകരണങ്ങൾ",
+  "_SmartPlugs": "{} സ്മാർട്ട് പ്ലഗുകൾ",
+  "On": "ഓൺ",
+  "Off": "ഓഫ് ചെയ്യുക",
+  "Color": "നിറം",
+  "White": "വെള്ള",
+  "Area": "പ്രദേശം",
+  "Areas": "പ്രദേശങ്ങൾ",
+  "Automations": "ഓട്ടോമേഷനുകൾ",
+  "Scenes_In_Folder": "ഫോൾഡറിലെ രംഗങ്ങൾ",
+  "Select": "തെരഞ്ഞെടുക്കുക",
+  "Exist": "നിലവിലുണ്ട്",
+  "OK": "ശരി",
+  "Nothing": "ഒന്നുമില്ല.",
+  "No_need_here": "ഇവിടെ ആവശ്യമില്ല.",
+  "Do_not_need": "ആവശ്യമില്ല.",
+  "Finish": "പൂർത്തിയാക്കുക",
+  "Select_Purposes_Of_The_Area": "പ്രദേശത്തിന്റെ ഉദ്ദേശ്യങ്ങൾ തിരഞ്ഞെടുക്കുക"
+}
diff --git a/assets/translations/mr-IN.json b/assets/translations/mr-IN.json
new file mode 100644
index 000000000..960533d26
--- /dev/null
+++ b/assets/translations/mr-IN.json
@@ -0,0 +1,113 @@
+{
+"Create_new_account": "नवीन खाते तयार करा,"
+"Actions_History": "क्रिया इतिहास,"
+"Empty_history": "रिकामा इतिहास,"
+"History_Settings_Page": "इतिहास सेटिंग्ज पृष्ठ,"
+"Lamps_Page": "दिवे पान,"
+"Name_": "नाव {},"
+"Room_": "खोली {},"
+"Lamps_Settings_Page": "दिवे सेटिंग्ज पृष्ठ,"
+"Welcome_to_your_Smart_Home": "तुमच्या स्मार्ट होममध्ये स्वागत आहे,"
+"Scene_Settings_Page": "दृश्य सेटिंग्ज पृष्ठ,"
+"Move_to_blinds_full_settings_page": "आंधळे पूर्ण सेटिंग्ज पृष्ठावर जा,"
+"Blinds_Page": "आंधळे पृष्ठ,"
+"Down": "खाली,"
+"Stop": "थांबा,"
+"Up": "वर,"
+"Smart_Devices_Settings_Page": "स्मार्ट डिव्हाइस सेटिंग्ज पृष्ठ,"
+"Air_Conditioners": "एअर कंडिशनर,"
+"Blinds": "पट्ट्या,"
+"Medical_Device": "वैद्यकीय उपकरण,"
+"Medical_Devices": "वैद्यकीय उपकरणे,"
+"Smart_Phone": "स्मार्ट फोन,"
+"Smart_Phones": "स्मार्ट फोन,"
+"Smart_Speakers": "स्मार्ट स्पीकर्स,"
+"Smart_Devices_page": "स्मार्ट उपकरण पृष्ठ,"
+"History": "इतिहास,"
+"Scene": "देखावा,"
+"Scenes": "दृश्ये,"
+"Lamps": "दिवे,"
+"Devices": "उपकरणे,"
+"Email_is_required": "ईमेल आवश्यक आहे,"
+"Email_cannot_contain_spaces": "ईमेलमध्ये स्पेस असू शकत नाही,"
+"Email_is_invalid": "ईमेल अवैध आहे,"
+"Email": "ईमेल,"
+"Password_is_required": "पासवर्ड आवश्यक आहे,"
+"Password_cannot_contain_spaces": "पासवर्डमध्ये मोकळी जागा असू शकत नाही,"
+"Password_must_be_bigger_than__characters": "पासवर्ड {} वर्णांपेक्षा मोठा असणे आवश्यक आहे,"
+"Password": "पासवर्ड,"
+"Log_In": "लॉग इन,"
+"Forgot_password": "पासवर्ड विसरलात,"
+"Forgot_password?": "पासवर्ड विसरलात?,"
+"title": "शीर्षक,"
+"number": "संख्या"
+"IP_is_required": "आयपी आवश्यक आहे,"
+"IP_syntax_is_incorrect": "IP वाक्यरचना चुकीची आहे,"
+"Add_Smart_Device": "स्मार्ट डिव्हाइस जोडा,"
+"Cancel": "रद्द करा,"
+"Add": "जोडा,"
+"Light": "प्रकाश,"
+"Device_ip_": "डिव्हाइस ip {},"
+"New_devices": "नवीन उपकरणे,"
+"Add_devices": "उपकरणे जोडा,"
+"Device_type_": "डिव्हाइस प्रकार {},"
+"Room_name_is_required": "खोलीचे नाव आवश्यक आहे,"
+"Room_name": "खोलीचे नाव,"
+"Device_name_is_required": "डिव्हाइसचे नाव आवश्यक आहे,"
+"Device_name": "उपकरणाचे नाव ,"
+"Update": "अपडेट करा,"
+"IP": "आयपी,"
+"This_is_firebase": "हे फायरबेस आहे,"
+"Device_with_ip_": "ip {} सह उपकरण,"
+"Update_WiFi_configuration": "वायफाय कॉन्फिगरेशन अपडेट करा,"
+"WiFi_name_is_required": "वायफाय नाव आवश्यक आहे,"
+"WiFi_Name": "वायफाय नाव,"
+"WiFi_password_is_required": "वायफाय पासवर्ड आवश्यक आहे,"
+"WiFi_Password": "वायफाय पासवर्ड,"
+"Insert_WiFi_Credentials": "वायफाय क्रेडेन्शियल्स घाला,"
+"Conditioners": "कंडिशनर्स,"
+"Medical": "वैद्यकीय,"
+"Phones": "फोन,"
+"Speakers": "वक्ते,"
+"Send": "पाठवा,"
+"All_Devices": "सर्व उपकरणे,"
+"Summary": "सारांश,"
+"Switches": "स्विचेस,"
+"Boilers": "बॉयलर,"
+"Lights": "दिवे,"
+"RGBw_Lights": "RGBw दिवे,"
+"_Switches": "{} स्विचेस,"
+"_SmartTvs": "{} स्मार्टटीव्ही,"
+"_RGBW_Lights": "{} RGBW दिवे,"
+"_Lights": "{} दिवे,"
+"_Boilers": "{} बॉयलर,"
+"_Blinds": "{} पट्ट्या,"
+"Rooms": "खोल्या,"
+"_device": "{} साधन,"
+"_devices": "{} उपकरणे,"
+"_SmartPlugs": "{} स्मार्टप्लग,"
+"On": "चालू,"
+"Off": "बंद,"
+"Color": "रंग,"
+"White": "पांढरा,"
+"Area": "क्षेत्रफळ,"
+"Areas": "क्षेत्रे,"
+"Automations": "ऑटोमेशन,"
+"Scenes_In_Folder": "फोल्डरमधील दृश्ये,"
+"Select": "निवडा,"
+"Exist": "अस्तित्वात आहे,"
+"OK": "ठीक आहे,"
+"Nothing": "काही नाही,"
+"No_need_here": "इथे गरज नाही,"
+"Do_not_need": "गरज नाही,"
+"Finish": "समाप्त,"
+"Select_Purposes_Of_The_Area": "क्षेत्राची उद्दिष्टे निवडा,"
+"Pulling_Up_all_blinds": "सर्व पट्ट्या वर खेचणे,"
+"Stopping_all_blinds": "सर्व पट्ट्या थांबवून,"
+"Pulling_down_all_blinds": "सर्व पट्ट्या खाली खेचणे,"
+"Turning_On_boiler": "बॉयलर चालू करणे,"
+"Turning_Off_boiler": "बॉयलर बंद करणे,"
+"Waiting_for_user_to_get_connected_to_WiFi": "वापरकर्ता वायफायशी कनेक्ट होण्याची वाट पाहत आहे,"
+"Can't_add_unsupported_device": "असमर्थित डिव्हाइस जोडू शकत नाही"
+
+}
diff --git a/assets/translations/ms-MY.json b/assets/translations/ms-MY.json
new file mode 100644
index 000000000..8a40be2d7
--- /dev/null
+++ b/assets/translations/ms-MY.json
@@ -0,0 +1,45 @@
+{
+  "Create_new_account": "Buat akaun baru",
+  "Actions_History": "Sejarah Tindakan",
+  "Empty_history": "Sejarah kosong",
+  "History_Settings_Page": "Halaman Tetapan Sejarah",
+  "Lamps_Page": "Halaman Lampu",
+  "Name:_": "Nama: {}",
+  "Room:_": "Bilik: {}",
+  "Lamps_Settings_Page": "Halaman Tetapan Lampu",
+  "Welcome_to_your_Smart_Home": "Selamat datang ke Rumah Pintar anda",
+  "Scene_Settings_Page": "Halaman Tetapan Pemandangan",
+  "Move_to_blinds_full_settings_page": "Beralih ke halaman tetapan penuh blinds",
+  "Blinds_Page": "Halaman Blinds",
+  "Down": "Bawah",
+  "Stop": "Berhenti",
+  "Up": "Naik",
+  "Smart_Devices_Settings_Page": "Halaman Tetapan Peranti Pintar",
+  "Air_Conditioners": "Penghawa dingin",
+  "Blinds": "Blind",
+  "Medical_Device": "Peranti Perubatan",
+  "Medical_Devices": "Peranti Perubatan",
+  "Smart_Phone": "Telefon Pintar",
+  "Smart_Phones": "Telefon Pintar",
+  "Smart_Speakers": "Pembesar Suara Pintar",
+  "Smart_Devices_page": "Halaman Pembesar Suara Pintar",
+  "History": "Sejarah",
+  "Scene": "Scene",
+  "Scenes": "Scene",
+  "Lamps": "Lampu",
+  "Devices": "Peranti",
+  "Email_is_required": "E-mel diperlukan",
+  "Email_cannot_contain_spaces": "E-mel tidak boleh mengandungi space",
+  "Email_is_invalid": "Email tidak sah",
+  "Email": "Email",
+  "Password_is_required": "kata laluan diperlukan",
+  "Password_cannot_contain_spaces": "Kata laluan tidak boleh mengandungi space",
+  "Password_must_be_bigger_than__characters": "Kata laluan mestilah lebih besar daripada {} aksara",
+  "Password": "Kata laluan",
+  "Log_In": "Log In",
+  "Forgot_password": "Lupa kata laluan",
+  "Forgot_password?": "Lupa kata laluan?",
+  "title": "tajuk",
+  "number": "nombor",
+  "IP_is_required": "IP diperlukan"
+}
diff --git a/assets/translations/nb-NO.json b/assets/translations/nb-NO.json
index b6cd28e75..9420688b3 100644
--- a/assets/translations/nb-NO.json
+++ b/assets/translations/nb-NO.json
@@ -18,11 +18,14 @@
   "Air_Conditioners": "Klimaanlegg",
   "Blinds": "Persienner",
   "Medical_Device": "Medisinsk enhet",
+  "Medical_Devices": "Medisinske enheter",
   "Smart_Phone": "Smarttelefon",
+  "Smart_Phones": "Smarttelefoner",
   "Smart_Speakers": "Smarthøyttaler",
   "Smart_Devices_page": "Smartenheter siden",
   "History": "Historikk",
   "Scene": "Scene",
+  "Scenes": "Scener",
   "Lamps": "Lamper",
   "Devices": "Enheter",
   "Email_is_required": "E-post er påkrevd",
@@ -34,7 +37,7 @@
   "Password_must_be_bigger_than__characters": "Passordet må være lenger enn {} tegn",
   "Password": "Passord",
   "Log_In": "Logg inn",
-  "Forgot_password?": "Glemt passord?",
+  "Forgot_password": "Glemt passord",
   "title": "tittel",
   "number": "nummer",
   "IP_is_required": "IP er påkrevd",
@@ -54,5 +57,48 @@
   "Update": "Oppdater",
   "IP": "IP",
   "This_is_firebase": "Dette er Firebase",
-  "Device_with_ip:_": "Enhet med IP: {}"
-}
\ No newline at end of file
+  "Device_with_ip:_": "Enhet med IP: {}",
+  "Update_WiFi_configuration": "Oppdater WiFi-konfigurasjon",
+  "WiFi_name_is_required": "WiFi-navn er påkrevd",
+  "WiFi_Name": "WiFi-navn",
+  "WiFi_password_is_required": "WiFi-passord er påkrevd",
+  "WiFi_Password": "WiFi-passord",
+  "Insert_WiFi_Credentials": "Skriv inn WiFi-innloggingsdetaljer",
+  "Conditioners": "Luftrensere",
+  "Medical": "Medisinsk",
+  "Phones": "Telefoner",
+  "Speakers": "Høyttalere",
+  "Send": "Send",
+  "All_Devices": "Alle enheter",
+  "Summary": "Oppsummering",
+  "Switches": "Brytere",
+  "Boilers": "Varmtvannstanker",
+  "Lights": "Lys",
+  "RGBw_Lights": "RGB-lys",
+  "_Switches": "{} Brytere",
+  "_SmartTvs": "{} Smart-TV-er",
+  "_RGBW_Lights": "{} RGB-lys",
+  "_Lights": "{} Lys",
+  "_Boilers": "{} Varmtvannstanker",
+  "_Blinds": "{} Persienner",
+  "Rooms": "Rom",
+  "_device": "{} enhet",
+  "_devices": "{} enheter",
+  "_SmartPlugs": "{} SmartPlugger",
+  "On": "På",
+  "Off": "Av",
+  "Color": "Farge",
+  "White": "Hvit",
+  "Area": "Område",
+  "Areas": "Områder",
+  "Automations": "Automatiseringer",
+  "Scenes_In_Folder": "Scener i mappe",
+  "Select": "Velg",
+  "Exist": "Finnes",
+  "OK": "OK",
+  "Nothing": "Ingenting",
+  "No_need_here": "Trengs ikke her",
+  "Do_not_need": "Trenger ikke",
+  "Finish": "Fullfør",
+  "Select_Purposes_Of_The_Area": "Velg bruk for område"
+}
diff --git a/assets/translations/pa-IN.json b/assets/translations/pa-IN.json
new file mode 100644
index 000000000..96489139f
--- /dev/null
+++ b/assets/translations/pa-IN.json
@@ -0,0 +1,73 @@
+{
+  "Create_new_account": "ਨਵਾਂ ਖਾਤਾ ਬਣਾਓ",
+  "Actions_History": "ਕਾਰਵਾਈਆਂ ਦਾ ਇਤਿਹਾਸ",
+  "Empty_history": "ਖਾਲੀ ਇਤਿਹਾਸ",
+  "History_Settings_Page": "ਇਤਿਹਾਸ ਸੈਟਿੰਗਾਂ ਪੰਨਾ",
+  "Lamps_Page": "ਲੈਂਪਸ ਪੰਨਾ",
+  "Name:_": "ਨਾਮ: {}",
+  "Room:_": "ਕਮਰਾ: {}",
+  "Lamps_Settings_Page": "ਲੈਂਪਸ ਸੈਟਿੰਗਾਂ ਪੰਨਾ",
+  "Welcome_to_your_Smart_Home": "ਤੁਹਾਡੇ ਸਮਾਰਟ ਹੋਮ ਵਿੱਚ ਸੁਆਗਤ ਹੈ",
+  "Scene_Settings_Page": "ਦ੍ਰਿਸ਼ ਸੈਟਿੰਗਾਂ ਪੰਨਾ",
+  "Move_to_blinds_full_settings_page": "ਬਲਾਇੰਡਸ ਪੂਰੇ ਸੈਟਿੰਗਾਂ ਪੰਨੇ 'ਤੇ ਜਾਓ",
+  "Blinds_Page": "ਬਲਾਇੰਡਸ ਪੰਨਾ",
+  "Down": "ਥੱਲੇ, ਹੇਠਾਂ, ਨੀਂਵਾ",
+  "Stop": "ਰੂਕੋ",
+  "Up": "ਉੱਪਰ",
+  "Smart_Devices_Settings_Page": "ਸਮਾਰਟ ਡਿਵਾਈਸ ਸੈਟਿੰਗਾਂ ਪੰਨਾ",
+  "Air_Conditioners": "ਏਅਰ ਕੰਡੀਸ਼ਨਰ",
+  "Blinds": "ਅੰਨ੍ਹੇ",
+  "Medical_Device": "ਮੈਡੀਕਲ ਜੰਤਰ",
+  "Medical_Devices": "ਮੈਡੀਕਲ ਉਪਕਰਨ",
+  "Smart_Phone": "ਸਮਾਰਟ ਫ਼ੋਨ",
+  "Smart_Phones": "ਸਮਾਰਟ ਫ਼ੋਨ",
+  "Smart_Speakers": "ਸਮਾਰਟ ਸਪੀਕਰ",
+  "Smart_Devices_page": "ਸਮਾਰਟ ਡਿਵਾਈਸਾਂ ਪੰਨਾ",
+  "History": "ਇਤਿਹਾਸ",
+  "Scene": "ਦ੍ਰਿਸ਼",
+  "Scenes": "ਦ੍ਰਿਸ਼",
+  "Lamps": "ਦੀਵੇ",
+  "Devices": "ਡਿਵਾਈਸਾਂ",
+  "Email_is_required": "ਈਮੇਲ ਦੀ ਲੋੜ ਹੈ",
+  "Email_cannot_contain_spaces": "ਈਮੇਲ ਵਿੱਚ ਖਾਲੀ ਥਾਂ ਨਹੀਂ ਹੋ ਸਕਦੀ",
+  "Email_is_invalid": "ਈਮੇਲ ਵਿੱਚ ਖਾਲੀ ਥਾਂ ਨਹੀਂ ਹੋ",
+  "Email": "ਈਮੇਲ",
+  "Password_is_required": "ਪਾਸਵਰਡ ਲੋੜੀਂਦਾ ਹੈ",
+  "Password_cannot_contain_spaces": "ਪਾਸਵਰਡ ਲੋੜੀਂਦਾ",
+  "Password_must_be_bigger_than__characters": "ਪਾਸਵਰਡ {} ਅੱਖਰਾਂ ਤੋਂ ਵੱਡਾ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ",
+  "Password": "ਪਾਸਵਰਡ",
+  "Log_In": "ਲਾਗਿਨ",
+  "Forgot_password": "ਪਾਸਵਰਡ ਭੁੱਲ ਗਏ",
+  "Forgot_password?": "ਪਾਸਵਰਡ ਭੁੱਲ ਗਏ?",
+  "title": "ਸਿਰਲੇਖ",
+  "number": "ਗਿਣਤੀ",
+  "IP_is_required": "IP ਲੋੜੀਂਦਾ ਹੈ",
+  "IP_syntax_is_incorrect": "IP ਲੋੜੀਂਦਾ",
+  "Add_Smart_Device": "ਸਮਾਰਟ ਡਿਵਾਈਸ ਸ਼ਾਮਲ ਕਰੋ",
+  "Cancel": "ਰੱਦ ਕਰੋ",
+  "Add": "ਸ਼ਾਮਲ ਕਰੋ",
+  "Light": "ਚਾਨਣ",
+  "Device_ip:_": "ਡਿਵਾਈਸ ip: {}",
+  "New_devices": "ਨਵੀਆਂ ਡਿਵਾਈਸਾਂ",
+  "Add_devices": "ਡਿਵਾਈਸਾਂ",
+  "Device_type:_": "ਨਵੀਆਂ: {}",
+  "Room_name_is_required": "ਕਮਰੇ ਦਾ ਨਾਮ ਲੋੜੀਂਦਾ ਹੈ",
+  "Room_name:": "ਕਮਰੇ ਦਾ ਨਾਮ:",
+  "Device_name_is_required": "ਡਿਵਾਈਸ ਦਾ ਨਾਮ ਲੋੜੀਂਦਾ ਹੈ",
+  "Device_name:": "ਡਿਵਾਈਸ ਦਾ ਨਾਮ:",
+  "Update": "ਅੱਪਡੇਟ ਕਰੋ",
+  "IP": "ਆਈ.ਪੀ",
+  "This_is_firebase": "ਇਹ ਫਾਇਰਬੇਸ ਹੈ",
+  "Device_with_ip:_": "ip ਨਾਲ ਜੰਤਰ: {}",
+  "Update_WiFi_configuration": "ਵਾਈ-ਫਾਈ ਕੌਂਫਿਗਰੇਸ਼ਨ ਅੱਪਡੇਟ ਕਰੋ",
+  "WiFi_name_is_required": "WiFi ਨਾਮ ਦੀ ਲੋੜ ਹੈ",
+  "WiFi_Name": "WiFi ਨਾਮ",
+  "WiFi_password_is_required": "WiFi ਪਾਸਵਰਡ ਦੀ ਲੋੜ ਹੈ",
+  "WiFi_Password": "WiFi ਪਾਸਵਰਡ",
+  "Nothing": "ਕੁਝ ਨਹੀਂ",
+  "Finish": "ਸਮਾਪਤ",
+  "On": "'ਤੇ",
+  "Off": "ਬੰਦ",
+  "Color": "ਰੰਗ",
+  "OK": "ਠੀਕ ਹੈ"
+}
diff --git a/assets/translations/ru-RU.json b/assets/translations/ru-RU.json
index 1ef0279e3..1412b88f4 100644
--- a/assets/translations/ru-RU.json
+++ b/assets/translations/ru-RU.json
@@ -28,9 +28,9 @@
   "Scene": "Сцены",  
   "Lamps": "Лампы",
   "Devices": "Устройства",
-  "Email_is_required": "Требуется email-адрес",
+  "Email_is_required": "Требуется Email-адрес",
   "Email_cannot_contain_spaces": "Email-адрес не может содержать пробелы",
-  "Email_is_invalid": "Неверный email-адрес",
+  "Email_is_invalid": "Неверный Email-адрес",
   "Email": "Email",
   "Password_is_required": "Требуется пароль",
   "Password_cannot_contain_spaces": "Пароль не может содержать пробелы",
@@ -64,7 +64,7 @@
   "WiFi_Name": "Имя WiFi-сети",
   "WiFi_password_is_required": "Требуется пароль от WiFi-сети",
   "WiFi_Password": "Пароль от WiFi-сети",
-  "Insert_WiFi_Credentials": "Введите данные для присоеднинения к WiFi",
+  "Insert_WiFi_Credentials": "Введите данные для подключения к WiFi-сети",
   "Conditioners": "Кондиционеры",
   "Medical": "Медицинские",
   "Phones": "Телефоны",
diff --git a/assets/translations/ta-IN.json b/assets/translations/ta-IN.json
new file mode 100644
index 000000000..608f5bbce
--- /dev/null
+++ b/assets/translations/ta-IN.json
@@ -0,0 +1,115 @@
+{
+  "Create_new_account": "புதிய கணக்கை உருவாக்க",
+  "Actions_History": "செயல்களின் வரலாறு",
+  "Empty_history": "வெற்று வரலாறு",
+  "History_Settings_Page": "வரலாறு அமைக்கும் பக்கம்",
+  "Lamps_Page": "விளக்குகள் பக்கம்",
+  "Name:_": "பெயர்: {}",
+  "Room:_": "அறை: {}",
+  "Lamps_Settings_Page": "விளக்குகள் அமைக்கும் பக்கம்",
+  "Welcome_to_your_Smart_Home": "உங்கள் ஸ்மார்ட் வீட்டிற்கு வரவேற்கிறோம்",
+  "Scene_Settings_Page": "காட்சி அமைப்பு பக்கம்",
+  "Move_to_blinds_full_settings_page": "பிளைண்ட்ஸ் முழு அமைப்பு பக்கத்திற்கு நகர்த்தவும்",
+  "Blinds_Page": "பார்வையற்றவரின் பக்கம்",
+  "History_Settings_Page": "வரலாறு அமைப்புகள் பக்கம்",
+  "Name:_": "பெயர்: {}",
+  "Room:_": "அறை: {}",
+  "Lamps_Settings_Page": "விளக்குகள் அமைப்புகள் பக்கம்",
+  "Welcome_to_your_Smart_Home": "உங்கள் ஸ்மார்ட் ஹோமுக்கு வரவேற்கிறோம்",
+  "Scene_Settings_Page": "காட்சி அமைப்புகள் பக்கம்",
+  "Move_to_blinds_full_settings_page": "Move to blinds full settings page",
+  "Blinds_Page": "குருட்டுப் பக்கம்",
+  "Down": "கீழ்",
+  "Stop": "நிறுத்து",
+  "Up": "மேலே",
+  "Smart_Devices_Settings_Page": "ஸ்மார்ட் சாதனங்கள் அமைப்புகள் பக்கம்",
+  "Air_Conditioners": "குளிரூட்டிகள்",
+  "Blinds": "குருடர்கள்",
+  "Medical_Device": "மருத்துவ சாதனம்",
+  "Medical_Devices": "மருத்துவ சாதனங்கள்",
+  "Smart_Phone": "திறன்பேசி",
+  "Smart_Phones": "திறன்பேசிகள்",
+  "Smart_Phones": "ஸ்மார்ட் போன்கள்",
+  "Smart_Speakers": "ஸ்மார்ட் ஸ்பீக்கர்கள்",
+  "Smart_Devices_page": "ஸ்மார்ட் சாதனங்கள் பக்கம்",
+  "History": "வரலாறு",
+  "Scene": "காட்சி",
+  "Scenes": "காட்சிகள்",
+  "Lamps": "விளக்குகள்",
+  "Devices": "சாதனங்கள்",
+  "Email_is_required": "மின்னஞ்சல் தேவை",
+  "Email_cannot_contain_spaces": "மின்னஞ்சலில் இடைவெளிகள் இருக்கக்கூடாது",
+  "Email_is_invalid": "மின்னஞ்சல் தவறானது",
+  "Email": "மின்னஞ்சல்",
+  "Password_is_required": "கடவுச்சொல் தேவை",
+  "Password_cannot_contain_spaces": "கடவுச்சொல் இடைவெளிகளை கொண்டிருத்தலாகாது",
+  "Password_must_be_bigger_than__characters": "கடவுச்சொல் {} எழுத்துகளை விட பெரியதாக இருக்க வேண்டும்",
+  "Password": "கடவுச்சொல்",
+  "Log_In": "உள்நுழைய",
+  "Forgot_password": "கடவுச்சொல்லை மறந்துவிட்டீர்களா",
+  "Forgot_password?": "கடவுச்சொல்லை மறந்துவிட்டீர்களா?",
+  "title": "தலைப்பு",
+  "number": "எண்",
+  "IP_is_required": "ஐபி தேவை",
+  "IP_syntax_is_incorrect": "ஐபி தொடரியல் தவறானது",
+  "Add_Smart_Device": "ஸ்மார்ட் சாதனத்தைச் சேர்க்கவும்",
+  "Cancel": "ரத்து செய்",
+  "Add": "கூட்டு",
+  "Light": "ஒளி",
+  "Device_ip:_": "சாதன ஐபி: {}",
+  "New_devices": "புதிய சாதனங்கள்",
+  "Add_devices": "சாதனங்களைச் சேர்க்கவும்",
+  "Device_type:_": "கருவியின் வகை: {}",
+  "Room_name_is_required": "அறையின் பெயர் தேவை",
+  "Room_name:": "அறையின் பெயர்:",
+  "Device_name_is_required": "சாதனத்தின் பெயர் தேவை",
+  "Device_name:": "சாதனத்தின் பெயர்:",
+  "Update": "புதுப்பிக்கவும்",
+  "IP": "ஐபி",
+  "This_is_firebase": "இது ஃபயர்பேஸ்",
+  "Device_with_ip:_": "ஐபி கொண்ட சாதனம்: {}",
+  "Update_WiFi_configuration": "வைஃபை உள்ளமைவைப் புதுப்பிக்கவும்",
+  "WiFi_name_is_required": "வைஃபை பெயர் தேவை",
+  "WiFi_Name": "வைஃபை பெயர்",
+  "WiFi_password_is_required": "வைஃபை கடவுச்சொல் தேவை",
+  "WiFi_Password": "வைஃபை கடவுச்சொல்",
+  "Insert_WiFi_Credentials": "வைஃபை நற்சான்றிதழ்களைச் செருகவும்",
+  "Conditioners": "கண்டிஷனர்கள்",
+  "Medical": "மருத்துவம்",
+  "Phones": "தொலைபேசிகள்",
+  "Speakers": "பேச்சாளர்கள்",
+  "Send": "அனுப்பு",
+  "All_Devices": "அனைத்து சாதனங்களும்",
+  "Summary": "சுருக்கம்",
+  "Switches": "மாறுகிறது",
+  "Boilers": "கொதிகலன்கள்",
+  "Lights": "விளக்குகள்",
+  "RGBw_Lights": "RGBw விளக்குகள்",
+  "_Switches": "{} மாறுகிறது",
+  "_SmartTvs": "{} ஸ்மார்ட் டிவிகள்",
+  "_RGBW_Lights": "{} RGBW விளக்குகள்",
+  "_Lights": "{} விளக்குகள்",
+  "_Boilers": "{} கொதிகலன்கள்",
+  "_Blinds": "{} குருடர்கள்",
+  "Rooms": "அறைகள்",
+  "_device": "{} சாதனம்",
+  "_devices": "{} சாதனங்கள்",
+  "_SmartPlugs": "{} ஸ்மார்ட் பிளக்குகள்",
+  "On": "ஆன்",
+  "Off": "ஆஃப்",
+  "Color": "நிறம்",
+  "White": "வெள்ளை",
+  "Area": "பகுதி",
+  "Areas": "பகுதி",
+  "Automations": "ஆட்டோமேஷன்கள்",
+  "Scenes_In_Folder": "கோப்புறையில் காட்சிகள்",
+  "Select": "தேர்ந்தெடு",
+  "Exist": "உள்ளன",
+  "OK": "சரி",
+  "Nothing": "ஒன்றுமில்லை",
+  "No_need_here": "இங்கே தேவையில்லை",
+  "Do_not_need": "தேவையில்லை",
+  "Finish": "முடிக்கவும்",
+  "Select_Purposes_Of_The_Area": "பகுதியின் நோக்கங்களைத் தேர்ந்தெடுக்கவும்"
+  "Add_devices": "சாதனங்களைச் சேர்க்கவும்"
+}
diff --git a/assets/translations/tl-PH.json b/assets/translations/tl-PH.json
new file mode 100644
index 000000000..f6c5772ff
--- /dev/null
+++ b/assets/translations/tl-PH.json
@@ -0,0 +1,112 @@
+{
+  "Create_new_account": "Gumawa ng account",
+  "Actions_History": "Kasaysayan ng Mga Aksyon",
+  "Empty_history": "Walang laman ang kasaysayan",
+  "History_Settings_Page": "Mga Kasaysayan",
+  "Lamps_Page": "Pahina ng Mga Lamp",
+  "Name:_": "Pangalan: {}",
+  "Room:_": "Kwarto: {}",
+  "Lamps_Settings_Page": "Pahina ng Mga Lamps Setting",
+  "Welcome_to_your_Smart_Home": "Welcome sa iyong Smart Home",
+  "Scene_Settings_Page": "Pahina ng Mga Scene Setting",
+  "Move_to_blinds_full_settings_page": "Ilipat sa blinds full settings page",
+  "Blinds_Page": "Pahina ng Mga Blind",
+  "Down": "Baba",
+  "Stop": "Tigil",
+  "Up": "Taas",
+  "Smart_Devices_Settings_Page": "Pahina ng Smart Devices Settings",
+  "Air_Conditioners": "Air Conditioners",
+  "Blinds": "Blinds",
+  "Medical_Device": "Medikal na Device",
+  "Medical_Devices": "Mga Medikal na Device",
+  "Smart_Phone": "Smart Phone",
+  "Smart_Phones": "Mga Smart Phone",
+  "Smart_Speakers": "Mga Smart Speaker",
+  "Smart_Devices_page": "Pahina ng Mga Smart Device",
+  "History": "Kasaysayan",
+  "Scene": "Scene",
+  "Scenes": "Mga Scene",
+  "Lamps": "Mga Lamp",
+  "Devices": "Mga Device",
+  "Email_is_required": "Kinakailangan ang email",
+  "Email_cannot_contain_spaces": "Ang email ay hindi maaaring maglaman ng Mga puwang",
+  "Email_is_invalid": "Hindi wasto ang email",
+  "Email": "Email",
+  "Password_is_required": "Kinakailangan ang password",
+  "Password_cannot_contain_spaces": "Hindi maaaring maglaman ng Mga puwang ang password",
+  "Password_must_be_bigger_than__characters": "Ang password ay dapat na mas malaki kaysa sa {} na character",
+  "Password": "Password",
+  "Log_In": "Mag Log In",
+  "Forgot_password": "Nakalimutan ang Password",
+  "Forgot_password?": "Nakalimutan ang password?",
+  "title": "pamagat",
+  "number": "numero",
+  "IP_is_required": "Kinakailangan ang IP",
+  "IP_syntax_is_incorrect": "Mali ang IP syntax",
+  "Add_Smart_Device": "Magdagdag ng Smart Device",
+  "Cancel": "Kanselahin",
+  "Add": "Magdagdag",
+  "Light": "Ilaw",
+  "Device_ip:_": "IP ng device: {}",
+  "New_devices": "Bagong Mga device",
+  "Add_devices": "Magdagdag ng Mga device",
+  "Device_type:_": "Uri ng device: {}",
+  "Room_name_is_required": "Kinakailangan ang pangalan ng kwarto",
+  "Room_name:": "Pangalan ng kwarto:",
+  "Device_name_is_required": "Kinakailangan ang pangalan ng device",
+  "Device_name:": "Pangalan ng device:",
+  "Update": "Update",
+  "IP": "IP",
+  "This_is_firebase": "Ito ay firebase",
+  "Device_with_ip:_": "Device na may ip: {}",
+  "Update_WiFi_configuration": "I-update ang configuration ng WiFi",
+  "WiFi_name_is_required": "Kinakailangan ang pangalan ng WiFi",
+  "WiFi_Name": "Pangalan ng WiFi",
+  "WiFi_password_is_required": "Kinakailangan ang password ng WiFi",
+  "WiFi_Password": "Password ng WiFi",
+  "Insert_WiFi_Credentials": "Ilagay ang Mga Kredensyal ng WiFi",
+  "Conditioners": "Mga Conditioner",
+  "Medical": "Medikal",
+  "Phones": "Mga Telepono",
+  "Speakers": "Mga Speaker",
+  "Send": "Ipadala",
+  "All_Devices": "Lahat ng Mga Device",
+  "Summary": "Buod",
+  "Switches": "Mga Switch",
+  "Boilers": "Mga Boiler",
+  "Lights": "Mga Ilaw",
+  "RGBw_Lights": "RGBw na Mga Ilaw",
+  "_Switches": "{} na Mga Switch",
+  "_SmartTvs": "{} na Mga SmartTv",
+  "_RGBW_Lights": "{} na Mga RGBW na Mga Ilaw",
+  "_Lights": "{} na Mga Ilaw",
+  "_Boilers": "{} na Mga Boiler",
+  "_Blinds": "{} na Mga Blind",
+  "Rooms": "Mga Kwarto",
+  "_device": "{} device",
+  "_devices": "{} na Mga device",
+  "_SmartPlugs": "{} na Mga SmartPlug",
+  "On": "I-sindi",
+  "Off": "Patayin",
+  "Color": "Kulay",
+  "White": "Puti",
+  "Area": "Lugar",
+  "Areas": "Mga Lugar",
+  "Automations": "Mga Automation",
+  "Scenes_In_Folder": "Mga Scene sa Folder",
+  "Select": "Piliin",
+  "Exist": "Umiiral",
+  "OK": "OK",
+  "Nothing": "Wala",
+  "No_need_here": "Hindi na kailangan dito",
+  "Do_not_need": "Hindi kailangan",
+  "Finish": "Tapusin",
+  "Select_Purposes_Of_The_Area": "Piliin ang Mga Layunin Ng Lugar",
+  "Pulling_Up_all_blinds": "Hilahin ang lahat ng mga blind",
+  "Stopping_all_blinds": "Itigil ang lahat ng mga blind",
+  "Pulling_down_all_blinds": "Hinila pababa ang lahat ng mga blind",
+  "Turning_On_boiler": "Binubuksan ang boiler",
+  "Turning_Off_boiler": "Pinapatay ang boiler",
+  "Waiting_for_user_to_get_connected_to_WiFi": "Hinihintay na makakonekta ang user sa WiFi",
+  "Can't_add_unsupported_device": "Hindi makapagdagdag ng hindi sinusuportahang device"
+}
diff --git a/assets/translations/zh-HK.json b/assets/translations/zh-HK.json
new file mode 100644
index 000000000..847417879
--- /dev/null
+++ b/assets/translations/zh-HK.json
@@ -0,0 +1,106 @@
+{
+    "Create_new_account": "開個新帳號",
+    "Actions_History": "行動紀錄",
+    "Empty_history": "清空紀錄",
+    "History_Settings_Page": "紀錄設定",
+    "Lamps_Page": "Lamps Page",
+    "Name:_": "名: {}",
+    "Room:_": "房: {}",
+    "Lamps_Settings_Page": "檯燈設定",
+    "Welcome_to_your_Smart_Home": "歡迎黎到你嘅智能屋企",
+    "Scene_Settings_Page": "佈景設定",
+    "Move_to_blinds_full_settings_page": "Move to blinds full settings page",
+    "Blinds_Page": "Blinds Page",
+    "Down": "下",
+    "Stop": "停",
+    "Up": "上",
+    "Smart_Devices_Settings_Page": "智能裝置設定",
+    "Air_Conditioners": "冷氣機",
+    "Blinds": "Blinds",
+    "Medical_Device": "醫療裝置",
+    "Medical_Devices": "醫療裝置",
+    "Smart_Phone": "智能手機",
+    "Smart_Phones": "智能手機",
+    "Smart_Speakers": "智能喇叭",
+    "Smart_Devices_page": "智能裝置頁面",
+    "History": "紀錄",
+    "Scene": "佈景",
+    "Scenes": "佈景",
+    "Lamps": "檯燈",
+    "Devices": "裝置",
+    "Email_is_required": "唔該入翻個Email",
+    "Email_cannot_contain_spaces": "個Email唔可以有空格",
+    "Email_is_invalid": "個Email唔啱",
+    "Email": "Email",
+    "Password_is_required": "唔該入翻個密碼",
+    "Password_cannot_contain_spaces": "個密碼唔可以有空格",
+    "Password_must_be_bigger_than__characters": "密碼要多過 {} 個字",
+    "Password": "密碼",
+    "Log_In": "登入",
+    "Forgot_password": "唔記得咗密碼",
+    "Forgot_password?": "唔記得咗密碼?",
+    "title": "title",
+    "number": "number",
+    "IP_is_required": "唔該入翻個IP",
+    "IP_syntax_is_incorrect": "個IP格式唔啱",
+    "Add_Smart_Device": "加入智能裝置",
+    "Cancel": "取消",
+    "Add": "加",
+    "Light": "燈",
+    "Device_ip:_": "裝置 ip: {}",
+    "New_devices": "新裝置",
+    "Add_devices": "加入裝置",
+    "Device_type:_": "裝置類型: {}",
+    "Room_name_is_required": "唔該入翻個房名",
+    "Room_name:": "房名:",
+    "Device_name_is_required": "唔該入翻個裝置名",
+    "Device_name:": "裝置名:",
+    "Update": "更新",
+    "IP": "IP",
+    "This_is_firebase": "呢個係firebase",
+    "Device_with_ip:_": "有IP嘅裝置: {}",
+    "Update_WiFi_configuration": "更新WiFi設定",
+    "WiFi_name_is_required": "唔該入翻個WiFi名",
+    "WiFi_Name": "WiFi名",
+    "WiFi_password_is_required": "唔該入翻個WiFi密碼",
+    "WiFi_Password": "WiFi密碼",
+    "Insert_WiFi_Credentials": "輸入WiFi資料",
+    "Conditioners": "冷氣機",
+    "Medical": "意料",
+    "Phones": "電話",
+    "Speakers": "喇叭",
+    "Send": "傳送",
+    "All_Devices": "全部裝置",
+    "Summary": "Summary",
+    "Switches": "開關",
+    "Boilers": "熱水爐",
+    "Lights": "燈",
+    "RGBw_Lights": "RGBw 燈",
+    "_Switches": "{} 開關",
+    "_SmartTvs": "{} 智能電視",
+    "_RGBW_Lights": "{} RGBW 燈",
+    "_Lights": "{} 燈",
+    "_Boilers": "{} 熱水爐",
+    "_Blinds": "{} 窗簾",
+    "Rooms": "Rooms",
+    "_device": "{} 裝置",
+    "_devices": "{} 裝置",
+    "_SmartPlugs": "{} 智能插蘇",
+    "On": "開",
+    "Off": "關",
+    "Color": "顏色",
+    "White": "白色",
+    "Area": "範圍",
+    "Areas": "範圍",
+    "Automations": "自動化",
+    "Scenes_In_Folder": "Scenes In Folder",
+    "Select": "選擇",
+    "Exist": "Exist",
+    "OK": "OK",
+    "Nothing": "冇嘢",
+    "No_need_here": "呢度唔洗",
+    "Do_not_need": "唔洗",
+    "Finish": "完",
+    "Select_Purposes_Of_The_Area": "選擇範圍嘅用途"
+  }
+  
\ No newline at end of file
diff --git a/lib/application/blinds/blinds_actor/blinds_actor_bloc.dart b/lib/application/blinds/blinds_actor/blinds_actor_bloc.dart
index ba28fa316..c165e8f26 100644
--- a/lib/application/blinds/blinds_actor/blinds_actor_bloc.dart
+++ b/lib/application/blinds/blinds_actor/blinds_actor_bloc.dart
@@ -5,6 +5,7 @@ import 'package:bloc/bloc.dart';
 import 'package:cybear_jinni/domain/devices/device/devices_failures.dart';
 import 'package:cybear_jinni/domain/devices/device/i_device_repository.dart';
 import 'package:cybear_jinni/domain/devices/generic_light_device/generic_light_entity.dart';
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:injectable/injectable.dart';
@@ -41,7 +42,7 @@ class BlindsActorBloc extends Bloc<BlindsActorEvent, BlindsActorState> {
     Emitter<BlindsActorState> emit,
   ) async {
     FlushbarHelper.createLoading(
-      message: 'Pulling Up all blinds',
+      message: 'Pulling_Up_all_blinds'.tr(),
       linearProgressIndicator: const LinearProgressIndicator(),
     ).show(event.context);
 
@@ -53,7 +54,7 @@ class BlindsActorBloc extends Bloc<BlindsActorEvent, BlindsActorState> {
     Emitter<BlindsActorState> emit,
   ) async {
     FlushbarHelper.createLoading(
-      message: 'Stopping all blinds',
+      message: 'Stopping_all_blinds'.tr(),
       linearProgressIndicator: const LinearProgressIndicator(),
     ).show(event.context);
 
@@ -65,7 +66,7 @@ class BlindsActorBloc extends Bloc<BlindsActorEvent, BlindsActorState> {
     Emitter<BlindsActorState> emit,
   ) async {
     FlushbarHelper.createLoading(
-      message: 'Pulling down all blinds',
+      message: 'Pulling_down_all_blinds'.tr(),
       linearProgressIndicator: const LinearProgressIndicator(),
     ).show(event.context);
 
diff --git a/lib/application/boilers/boilers_actor/boilers_actor_bloc.dart b/lib/application/boilers/boilers_actor/boilers_actor_bloc.dart
index 08b94f253..bb85daaff 100644
--- a/lib/application/boilers/boilers_actor/boilers_actor_bloc.dart
+++ b/lib/application/boilers/boilers_actor/boilers_actor_bloc.dart
@@ -5,6 +5,7 @@ import 'package:bloc/bloc.dart';
 import 'package:cybear_jinni/domain/devices/device/devices_failures.dart';
 import 'package:cybear_jinni/domain/devices/device/i_device_repository.dart';
 import 'package:cybear_jinni/domain/devices/generic_boiler_device/generic_boiler_entity.dart';
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:injectable/injectable.dart';
@@ -40,7 +41,7 @@ class BoilersActorBloc extends Bloc<BoilersActorEvent, BoilersActorState> {
     Emitter<BoilersActorState> emit,
   ) async {
     FlushbarHelper.createLoading(
-      message: 'Turning On boiler',
+      message: 'Turning_On_boiler'.tr(),
       linearProgressIndicator: const LinearProgressIndicator(),
     ).show(event.context);
 
@@ -52,7 +53,7 @@ class BoilersActorBloc extends Bloc<BoilersActorEvent, BoilersActorState> {
     Emitter<BoilersActorState> emit,
   ) async {
     FlushbarHelper.createLoading(
-      message: 'Turning Off boiler',
+      message: 'Turning_Off_boiler'.tr(),
       linearProgressIndicator: const LinearProgressIndicator(),
     ).show(event.context);
 
diff --git a/lib/application/configure_new_cbj_comp/configure_new_cbj_comp_bloc.dart b/lib/application/configure_new_cbj_comp/configure_new_cbj_comp_bloc.dart
index 3e46b1adf..8f700e532 100644
--- a/lib/application/configure_new_cbj_comp/configure_new_cbj_comp_bloc.dart
+++ b/lib/application/configure_new_cbj_comp/configure_new_cbj_comp_bloc.dart
@@ -16,6 +16,7 @@ import 'package:cybear_jinni/domain/security_bear/security_bear_failures.dart';
 import 'package:cybear_jinni/presentation/add_new_devices_process/configure_new_cbj_comp/widgets/configure_new_cbj_comp_widget.dart';
 import 'package:cybear_jinni/utils.dart';
 import 'package:dartz/dartz.dart';
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/widgets.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:injectable/injectable.dart';
@@ -245,7 +246,7 @@ class ConfigureNewCbjCompBloc
     // await WiFiScan.instance
 
     bool isConnectedToWifi = false;
-    logger.i('Waiting for user to get connected to WiFi');
+    logger.i('Waiting_for_user_to_get_connected_to_WiFi'.tr());
 
     while (true) {
       isConnectedToWifi = await WiFiForIoTPlugin.isConnected();
@@ -309,7 +310,7 @@ class ConfigureNewCbjCompBloc
           deviceE..defaultName = DeviceDefaultName(deviceName),
         );
       } catch (e) {
-        logger.w("Can't add unsupported device");
+        logger.w("Can't_add_unsupported_device".tr());
       }
     });
     final CBJCompEntity compUpdatedData = cbjCompEntity.copyWith(
diff --git a/lib/application/more_connections_options/more_connections_options_bloc.dart b/lib/application/more_connections_options/more_connections_options_bloc.dart
new file mode 100644
index 000000000..6c66d1342
--- /dev/null
+++ b/lib/application/more_connections_options/more_connections_options_bloc.dart
@@ -0,0 +1,62 @@
+import 'dart:async';
+
+import 'package:auto_route/auto_route.dart';
+import 'package:bloc/bloc.dart';
+import 'package:cybear_jinni/domain/devices/abstract_device/device_entity_abstract.dart';
+import 'package:cybear_jinni/domain/devices/device/devices_failures.dart';
+import 'package:cybear_jinni/domain/hub/hub_failures.dart';
+import 'package:cybear_jinni/domain/hub/i_hub_connection_repository.dart';
+import 'package:cybear_jinni/presentation/routes/app_router.gr.dart';
+import 'package:dartz/dartz.dart';
+import 'package:flutter/widgets.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:injectable/injectable.dart';
+import 'package:kt_dart/kt.dart';
+
+part 'more_connections_options_bloc.freezed.dart';
+part 'more_connections_options_event.dart';
+part 'more_connections_options_state.dart';
+
+@injectable
+class MoreConnectionsOptionsBloc
+    extends Bloc<MoreConnectionsOptionsEvent, MoreConnectionsOptionsState> {
+  MoreConnectionsOptionsBloc(this._hubConnectionRepository)
+      : super(MoreConnectionsOptionsState.initial()) {
+    on<InitialEvent>(_initialEvent);
+    on<ConnectToRemotePipes>(_connectToRemotePipes);
+    on<ConnectInDemoMode>(_connectInDemoMode);
+  }
+
+  final IHubConnectionRepository _hubConnectionRepository;
+  StreamSubscription<Either<DevicesFailure, KtList<DeviceEntityAbstract?>>>?
+      _deviceStreamSubscription;
+
+  late BuildContext context;
+
+  Future<void> _initialEvent(
+    InitialEvent event,
+    Emitter<MoreConnectionsOptionsState> emit,
+  ) async {
+    context = event.context;
+  }
+
+  Future<void> _connectToRemotePipes(
+    ConnectToRemotePipes event,
+    Emitter<MoreConnectionsOptionsState> emit,
+  ) async {}
+
+  Future<void> _connectInDemoMode(
+    ConnectInDemoMode event,
+    Emitter<MoreConnectionsOptionsState> emit,
+  ) async {
+    context.router.replace(const HomeRoute());
+    _hubConnectionRepository.connectWithHub(demoMod: true);
+  }
+
+  @override
+  Future<void> close() async {
+    await _deviceStreamSubscription?.cancel();
+
+    return super.close();
+  }
+}
diff --git a/lib/application/more_connections_options/more_connections_options_event.dart b/lib/application/more_connections_options/more_connections_options_event.dart
new file mode 100644
index 000000000..bb3c7498b
--- /dev/null
+++ b/lib/application/more_connections_options/more_connections_options_event.dart
@@ -0,0 +1,13 @@
+part of 'more_connections_options_bloc.dart';
+
+@freezed
+class MoreConnectionsOptionsEvent with _$MoreConnectionsOptionsEvent {
+  const factory MoreConnectionsOptionsEvent.initialEvent(BuildContext context) =
+      InitialEvent;
+
+  const factory MoreConnectionsOptionsEvent.connectToRemotePipes() =
+      ConnectToRemotePipes;
+
+  const factory MoreConnectionsOptionsEvent.connectInDemoMode() =
+      ConnectInDemoMode;
+}
diff --git a/lib/application/more_connections_options/more_connections_options_state.dart b/lib/application/more_connections_options/more_connections_options_state.dart
new file mode 100644
index 000000000..96d6e2ffa
--- /dev/null
+++ b/lib/application/more_connections_options/more_connections_options_state.dart
@@ -0,0 +1,14 @@
+part of 'more_connections_options_bloc.dart';
+
+@freezed
+class MoreConnectionsOptionsState with _$MoreConnectionsOptionsState {
+  factory MoreConnectionsOptionsState.initial() = _Initial;
+
+  const factory MoreConnectionsOptionsState.loadInProgress() = _LoadInProgress;
+
+  const factory MoreConnectionsOptionsState.loadSuccess() = _loadSuccess;
+
+  const factory MoreConnectionsOptionsState.loadFailure(
+    HubFailures hubFailure,
+  ) = _loadFailure;
+}
diff --git a/lib/application/plus_button_settings/plus_button_settings_bloc.dart b/lib/application/plus_button_settings/plus_button_settings_bloc.dart
new file mode 100644
index 000000000..53233ad1c
--- /dev/null
+++ b/lib/application/plus_button_settings/plus_button_settings_bloc.dart
@@ -0,0 +1,43 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:cybear_jinni/domain/hub/i_hub_connection_repository.dart';
+import 'package:cybear_jinni/presentation/routes/app_router.gr.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:injectable/injectable.dart';
+
+part 'plus_button_settings_bloc.freezed.dart';
+part 'plus_button_settings_event.dart';
+part 'plus_button_settings_state.dart';
+
+@injectable
+class PlusButtonSettingsBloc
+    extends Bloc<PlusButtonSettingsEvent, PlusButtonSettingsState> {
+  PlusButtonSettingsBloc(this._hubConnectionRepository)
+      : super(PlusButtonSettingsState.initial()) {
+    on<Initialized>(_initialized);
+
+    on<Logout>(_logout);
+  }
+
+  final IHubConnectionRepository _hubConnectionRepository;
+
+  late BuildContext context;
+
+  Future<void> _initialized(
+    Initialized event,
+    Emitter<PlusButtonSettingsState> emit,
+  ) async {
+    context = event.context;
+  }
+
+  Future<void> _logout(
+    Logout event,
+    Emitter<PlusButtonSettingsState> emit,
+  ) async {
+    emit(PlusButtonSettingsState.loadInProgress());
+    await _hubConnectionRepository.closeConnection();
+    context.router.replace(const ConnectToHubRoute());
+  }
+}
diff --git a/lib/application/plus_button_settings/plus_button_settings_event.dart b/lib/application/plus_button_settings/plus_button_settings_event.dart
new file mode 100644
index 000000000..c3ce55c1e
--- /dev/null
+++ b/lib/application/plus_button_settings/plus_button_settings_event.dart
@@ -0,0 +1,9 @@
+part of 'plus_button_settings_bloc.dart';
+
+@freezed
+class PlusButtonSettingsEvent with _$PlusButtonSettingsEvent {
+  const factory PlusButtonSettingsEvent.initialized(BuildContext context) =
+      Initialized;
+
+  const factory PlusButtonSettingsEvent.logout() = Logout;
+}
diff --git a/lib/application/plus_button_settings/plus_button_settings_state.dart b/lib/application/plus_button_settings/plus_button_settings_state.dart
new file mode 100644
index 000000000..ff7468406
--- /dev/null
+++ b/lib/application/plus_button_settings/plus_button_settings_state.dart
@@ -0,0 +1,12 @@
+part of 'plus_button_settings_bloc.dart';
+
+@freezed
+class PlusButtonSettingsState with _$PlusButtonSettingsState {
+  factory PlusButtonSettingsState.initial() = Initial;
+
+  factory PlusButtonSettingsState.loadInProgress() = LoadInProgress;
+
+  factory PlusButtonSettingsState.loadSuccess() = LoadSuccess;
+
+  factory PlusButtonSettingsState.loadFailure() = LoadFailure;
+}
diff --git a/lib/domain/hub/i_hub_connection_repository.dart b/lib/domain/hub/i_hub_connection_repository.dart
index 382ae3e04..526822ded 100644
--- a/lib/domain/hub/i_hub_connection_repository.dart
+++ b/lib/domain/hub/i_hub_connection_repository.dart
@@ -6,7 +6,7 @@ import 'package:dartz/dartz.dart';
 abstract class IHubConnectionRepository {
   static HubEntity? hubEntity;
 
-  Future<void> connectWithHub();
+  Future<void> connectWithHub({bool demoMod = false});
 
   Future<Either<HubFailures, CompHubInfo>> getHubCompInfo(
     CompHubInfo appInfoForHub,
diff --git a/lib/infrastructure/hub_client/hub_client_demo.dart b/lib/infrastructure/hub_client/hub_client_demo.dart
new file mode 100644
index 000000000..e12696af7
--- /dev/null
+++ b/lib/infrastructure/hub_client/hub_client_demo.dart
@@ -0,0 +1,172 @@
+import 'dart:async';
+
+import 'package:cybear_jinni/infrastructure/core/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.dart';
+import 'package:cybear_jinni/infrastructure/hub_client/hub_client.dart';
+import 'package:cybear_jinni/utils.dart';
+
+class HubClientDemo {
+  ///  Creates a stream with the Hub
+  static Future createStreamWithHub() async {
+    try {
+      await firstConnection();
+    } catch (e) {
+      logger.e('Error in demo Hub\n$e');
+    }
+  }
+
+  static Future<void> firstConnection() async {
+    for (final RequestsAndStatusFromHub roomRequest in getAllRooms()) {
+      HubRequestsToApp.hubRequestsStreamController.add(roomRequest);
+      await Future.delayed(const Duration(milliseconds: 400));
+    }
+
+    for (final RequestsAndStatusFromHub devicesRequest in getAllDevices()) {
+      HubRequestsToApp.hubRequestsStreamController.add(devicesRequest);
+      await Future.delayed(const Duration(milliseconds: 400));
+    }
+
+    for (final RequestsAndStatusFromHub sceneRequest in getAllScenes()) {
+      HubRequestsToApp.hubRequestsStreamController.add(sceneRequest);
+      await Future.delayed(const Duration(milliseconds: 400));
+    }
+  }
+
+  static List<RequestsAndStatusFromHub> getAllRooms() {
+    final List<RequestsAndStatusFromHub> roomsList = [];
+
+    const SendingType sendingTypeRoom = SendingType.roomType;
+
+    /// Discovered Room
+
+    const String allRemoteCommandsRoomDiscovered =
+        '{"uniqueId":"00000000-0000-0000-0000-000000000000","defaultName":"Discovered","roomTypes":[],"roomDevicesId":["65d84b10-434d-11ed-817a-7d350fb52f91"],"roomScenesId":[],"roomRoutinesId":[],"roomBindingsId":[],"roomMostUsedBy":[],"roomPermissions":[]}';
+    final RequestsAndStatusFromHub requestsAndStatusFromHubRoomDiscovered =
+        RequestsAndStatusFromHub(
+      sendingType: sendingTypeRoom,
+      allRemoteCommands: allRemoteCommandsRoomDiscovered,
+    );
+    roomsList.add(requestsAndStatusFromHubRoomDiscovered);
+
+    /// Guy Room
+
+    const String allRemoteCommandsRoomGuy =
+        '{"uniqueId":"23deb7f0-4193-11ed-9d1c-5747056d7848","defaultName":"Guy Room","roomTypes":["0","1","2","4"],"roomDevicesId":["a31523m6-463s-32ge-7426-g33c642r7m25","c90137f2-419b-11ed-8246-e17a279f4d89", "96386cd0-419b-11ed-8246-e17a279f4d89"],"roomScenesId":["01bd6880-419b-11ed-af10-f75196d26a5e"],"roomRoutinesId":[],"roomBindingsId":[],"roomMostUsedBy":[],"roomPermissions":[]}';
+
+    final RequestsAndStatusFromHub requestsAndStatusFromHubRoomGuy =
+        RequestsAndStatusFromHub(
+      sendingType: sendingTypeRoom,
+      allRemoteCommands: allRemoteCommandsRoomGuy,
+    );
+    roomsList.add(requestsAndStatusFromHubRoomGuy);
+
+    /// Out Side Room
+
+    const String allRemoteCommandsRoomOutSide =
+        '{"uniqueId":"38b45780-419c-11ed-bce9-8dc09da0062f","defaultName":"Outside","roomTypes":["0","1","2","5"],"roomDevicesId":["7189ed76-4351-11ed-b249-63fd7e165c16"],"roomScenesId":[],"roomRoutinesId":[],"roomBindingsId":[],"roomMostUsedBy":[],"roomPermissions":[]}';
+
+    final RequestsAndStatusFromHub requestsAndStatusFromHubRoomOutSide =
+        RequestsAndStatusFromHub(
+      sendingType: sendingTypeRoom,
+      allRemoteCommands: allRemoteCommandsRoomOutSide,
+    );
+    roomsList.add(requestsAndStatusFromHubRoomOutSide);
+
+    return roomsList;
+  }
+
+  static List<RequestsAndStatusFromHub> getAllDevices() {
+    final List<RequestsAndStatusFromHub> devicesList = [];
+
+    const SendingType sendingTypeDevice = SendingType.deviceType;
+
+    /// Guy Blinds
+
+    const String allRemoteCommandsBlinds =
+        '{"id":"96386cd0-419b-11ed-8246-e17a279f4d89","vendorUniqueId":"63b298","defaultName":"Guy Blinds","deviceStateGRPC":"ack","senderDeviceOs":"switcher","senderDeviceModel":"SwitcherDevicesTypes.switcherRunner","senderId":"94edb282-434a-11ed-bd96-f573a00b65aa","blindsSwitchState":"stop","deviceTypes":"blinds","compUuid":"34asdfrsd23gggg","deviceVendor":"switcherSmartHome","deviceDtoClass":"GenericBlindsDeviceDtos","stateMassage":"Hello World"}';
+
+    final RequestsAndStatusFromHub requestsAndStatusFromHubBlinds =
+        RequestsAndStatusFromHub(
+      sendingType: sendingTypeDevice,
+      allRemoteCommands: allRemoteCommandsBlinds,
+    );
+
+    devicesList.add(requestsAndStatusFromHubBlinds);
+
+    /// Guy Ceiling Button
+
+    const String allRemoteCommandsButton =
+        '{"id":"c90137f2-419b-11ed-8246-e17a279f4d89","vendorUniqueId":"67600068c44f33f5b515","defaultName":"Guy Ceiling Button","deviceStateGRPC":"ack","senderDeviceOs":"tuya_smart","senderDeviceModel":"Cloud","senderId":"90d20fc3-434a-11ed-bd96-f573a00b65aa","switchState":"false","deviceTypes":"switch","compUuid":"34asdfrsd23gggg","deviceVendor":"tuyaSmart","deviceDtoClass":"GenericSwitchDeviceDtos","stateMassage":"Hello World"}';
+
+    final RequestsAndStatusFromHub requestsAndStatusFromHubButton =
+        RequestsAndStatusFromHub(
+      sendingType: sendingTypeDevice,
+      allRemoteCommands: allRemoteCommandsButton,
+    );
+    devicesList.add(requestsAndStatusFromHubButton);
+
+    /// Guy Button 2
+
+    const String allRemoteCommandsButton2 =
+        '{"id":"a31523m6-463s-32ge-7426-g33c642r7m25","vendorUniqueId":"67600068c44f33f5b515","defaultName":"Guy Bedroom Button","deviceStateGRPC":"ack","senderDeviceOs":"tuya_smart","senderDeviceModel":"Cloud","senderId":"90d20fc3-434a-11ed-bd96-f573a00b65aa","switchState":"false","deviceTypes":"switch","compUuid":"34asdfrsd23gggg","deviceVendor":"tuyaSmart","deviceDtoClass":"GenericSwitchDeviceDtos","stateMassage":"Hello World"}';
+
+    final RequestsAndStatusFromHub requestsAndStatusFromHubButton2 =
+        RequestsAndStatusFromHub(
+      sendingType: sendingTypeDevice,
+      allRemoteCommands: allRemoteCommandsButton2,
+    );
+    devicesList.add(requestsAndStatusFromHubButton2);
+
+    /// Boiler
+
+    const String allRemoteCommandsBoiler =
+        '{"id":"65d84b10-434d-11ed-817a-7d350fb52f91","vendorUniqueId":"65fd2f","defaultName":"Boiler","deviceStateGRPC":"ack","senderDeviceOs":"switcher","senderDeviceModel":"SwitcherDevicesTypes.switcherV2Esp","senderId":"65d84b11-434d-11ed-817a-7d350fb52f91","boilerSwitchState":"off","deviceTypes":"boiler","compUuid":"34asdfrsd23gggg","deviceVendor":"switcherSmartHome","deviceDtoClass":"GenericBoilerDeviceDtos","stateMassage":"Hello World"}';
+
+    final RequestsAndStatusFromHub requestsAndStatusFromHubBoiler =
+        RequestsAndStatusFromHub(
+      sendingType: sendingTypeDevice,
+      allRemoteCommands: allRemoteCommandsBoiler,
+    );
+    devicesList.add(requestsAndStatusFromHubBoiler);
+
+    /// RGBLight
+
+    const String allRemoteCommandsRgbLight =
+        '{"id":"7189ed76-4351-11ed-b249-63fd7e165c16","vendorUniqueId":"bf4bccdaf68347e31dhiut","defaultName":"Dining Room Ceiling","deviceStateGRPC":"ack","senderDeviceOs":"tuya_smart","senderDeviceModel":"1SE","senderId":"7189ed77-4351-11ed-b249-63fd7e165c16","deviceTypes":"rgbwLights","compUuid":"34asdfrsd23gggg","deviceVendor":"tuyaSmart","lightSwitchState":"on","lightColorTemperature":"8129","lightBrightness":"1000","lightColorAlpha":"1.0","lightColorHue":"0.0","lightColorSaturation":"1.0","lightColorValue":"1.0","deviceDtoClass":"GenericRgbwLightDeviceDtos","stateMassage":"Hello World"}';
+
+    final RequestsAndStatusFromHub requestsAndStatusFromHubRgbLight =
+        RequestsAndStatusFromHub(
+      sendingType: sendingTypeDevice,
+      allRemoteCommands: allRemoteCommandsRgbLight,
+    );
+    devicesList.add(requestsAndStatusFromHubRgbLight);
+
+    return devicesList;
+  }
+
+  static List<RequestsAndStatusFromHub> getAllScenes() {
+    final List<RequestsAndStatusFromHub> scenesList = [];
+
+    const SendingType sendingTypeDevice = SendingType.sceneType;
+
+    /// Study Scene
+
+    const String allRemoteCommandsSceneOpen =
+        '''{"uniqueId":"01bd6880-419b-11ed-af10-f75196d26a5e","name":"Study Scene","backgroundColor":"0xFFFF9800","deviceStateGRPC":"waitingInComp","senderDeviceOs":null,"senderDeviceModel":null,"senderId":null,"compUuid":null,"stateMassage":null,"automationString":"[]","nodeRedFlowId":"6b63068c3c970eeb","firstNodeId":"3f1a9440-41a1-11ed-8b6a-5f136f4fe196","iconCodePoint":null,"image":null,"lastDateOfExecute":null}''';
+    final RequestsAndStatusFromHub requestsAndStatusFromHubSceneOpen =
+        RequestsAndStatusFromHub(
+      sendingType: sendingTypeDevice,
+      allRemoteCommands: allRemoteCommandsSceneOpen,
+    );
+
+    scenesList.add(requestsAndStatusFromHubSceneOpen);
+
+    return scenesList;
+  }
+
+  ///  Get Hub computer and software info
+  static Future<CompHubInfo?> getHubCompInfo(
+    String addressToHub,
+    int hubPort,
+    CompHubInfo compHubInfo,
+  ) async {}
+}
diff --git a/lib/infrastructure/hub_client/hub_connection_repository.dart b/lib/infrastructure/hub_client/hub_connection_repository.dart
index 20fe11603..2b2554b12 100644
--- a/lib/infrastructure/hub_client/hub_connection_repository.dart
+++ b/lib/infrastructure/hub_client/hub_connection_repository.dart
@@ -8,6 +8,7 @@ import 'package:cybear_jinni/domain/hub/i_hub_connection_repository.dart';
 import 'package:cybear_jinni/domain/local_db/i_local_db_repository.dart';
 import 'package:cybear_jinni/infrastructure/core/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.dart';
 import 'package:cybear_jinni/infrastructure/hub_client/hub_client.dart';
+import 'package:cybear_jinni/infrastructure/hub_client/hub_client_demo.dart';
 import 'package:cybear_jinni/infrastructure/hub_client/hub_dtos.dart';
 import 'package:cybear_jinni/injection.dart';
 import 'package:cybear_jinni/utils.dart';
@@ -38,8 +39,22 @@ class HubConnectionRepository extends IHubConnectionRepository {
 
   static int tryAgainConnectToTheHubOnceMore = 0;
 
+  static bool cancelConnectionWithHub = false;
+
+  static bool appInDemoMod = false;
+
   @override
-  Future<void> connectWithHub() async {
+  Future<void> connectWithHub({bool demoMod = false}) async {
+    if (cancelConnectionWithHub && !demoMod) {
+      return;
+    }
+    appInDemoMod = demoMod;
+
+    if (appInDemoMod) {
+      cancelConnectionWithHub = true;
+      return streamFromDemoMode();
+    }
+
     if (IHubConnectionRepository.hubEntity == null) {
       try {
         String? hubNetworkBssid;
@@ -327,9 +342,8 @@ class HubConnectionRepository extends IHubConnectionRepository {
   }
 
   @override
-  Future<void> closeConnection() {
-    // TODO: implement closeConnection
-    throw UnimplementedError();
+  Future<void> closeConnection() async {
+    cancelConnectionWithHub = true;
   }
 
   /// Search device IP by computer Avahi (mdns) name
@@ -460,6 +474,7 @@ class HubConnectionRepository extends IHubConnectionRepository {
     PermissionStatus _permissionGranted;
 
     int permissionCounter = 0;
+    int disabledCounter = 0;
 
     // Get location permission is not supported on Linux
     if (Platform.isLinux || Platform.isWindows) {
@@ -472,9 +487,13 @@ class HubConnectionRepository extends IHubConnectionRepository {
         _permissionGranted = await location.requestPermission();
         if (_permissionGranted != PermissionStatus.granted) {
           logger.e('Permission to use location is denied');
+          await Future.delayed(const Duration(seconds: 10));
+
           permissionCounter++;
           if (permissionCounter > 5) {
             permission_handler.openAppSettings();
+          } else if (permissionCounter > 7) {
+            return const Left(HubFailures.unexpected());
           }
           continue;
         }
@@ -484,7 +503,12 @@ class HubConnectionRepository extends IHubConnectionRepository {
       if (!_serviceEnabled) {
         _serviceEnabled = await location.requestService();
         if (!_serviceEnabled) {
+          disabledCounter++;
+          if (disabledCounter > 2) {
+            return const Left(HubFailures.unexpected());
+          }
           logger.w('Location is disabled');
+          await Future.delayed(const Duration(seconds: 5));
           continue;
         }
       }
@@ -519,4 +543,8 @@ class HubConnectionRepository extends IHubConnectionRepository {
     );
     return right(unit);
   }
+
+  Future<void> streamFromDemoMode() async {
+    await HubClientDemo.createStreamWithHub();
+  }
 }
diff --git a/lib/presentation/connect_to_hub/connect_to_hub_more_page.dart b/lib/presentation/connect_to_hub/connect_to_hub_more_page.dart
deleted file mode 100644
index ad24fece7..000000000
--- a/lib/presentation/connect_to_hub/connect_to_hub_more_page.dart
+++ /dev/null
@@ -1,180 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:cybear_jinni/presentation/routes/app_router.gr.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:hexcolor/hexcolor.dart';
-
-class ConnectToHubMorePage extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    final Size screenSize = MediaQuery.of(context).size;
-
-    return Scaffold(
-      appBar: AppBar(
-        toolbarHeight: 0,
-        backgroundColor: HexColor('#303030'),
-        systemOverlayStyle: SystemUiOverlayStyle.light,
-      ),
-      backgroundColor: HexColor('#303030'),
-      body: Column(
-        children: [
-          Expanded(
-            child: Container(
-              margin: const EdgeInsets.symmetric(horizontal: 30),
-              child: Column(
-                children: [
-                  const SizedBox(
-                    height: 50,
-                  ),
-                  Container(
-                    alignment: Alignment.center,
-                    child: const Text(
-                      'More Connections Options',
-                      textAlign: TextAlign.center,
-                      style: TextStyle(fontSize: 23),
-                    ),
-                  ),
-                  const SizedBox(
-                    height: 40,
-                  ),
-                  Expanded(
-                    child: Container(
-                      color: HexColor('#3A3A3A'),
-                      child: Column(
-                        children: [
-                          const SizedBox(
-                            height: 15,
-                          ),
-                          Container(
-                            margin: const EdgeInsets.symmetric(horizontal: 15),
-                            child: Row(
-                              children: [
-                                Container(
-                                  color: HexColor('#F8F9FA'),
-                                  width: 40,
-                                  height: 40,
-                                  child: Center(
-                                    child: FaIcon(
-                                      FontAwesomeIcons.globe,
-                                      color: HexColor('#495057'),
-                                    ),
-                                  ),
-                                ),
-                                const SizedBox(
-                                  width: 40,
-                                ),
-                                Flexible(
-                                  child: Text(
-                                    'Connect to Remote Pipes',
-                                    style:
-                                        TextStyle(color: HexColor('#D6D6D6')),
-                                  ),
-                                ),
-                              ],
-                            ),
-                          ),
-                          const Expanded(
-                            child: Center(
-                              child: Text('Currently not supported'),
-                              // BlocProvider(
-                              //   create: (context) => getIt<HubInNetworkBloc>()
-                              //     ..add(
-                              //       const HubInNetworkEvent
-                              //           .searchHubInNetwork(),
-                              //     ),
-                              //   child: CbjHubInNetwork(),
-                              // ),
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          ),
-          SizedBox(
-            height: screenSize.height / 20,
-          ),
-          GestureDetector(
-            onTap: () {
-              context.router.replace(const HomeRoute());
-            },
-            child: Container(
-              margin: const EdgeInsets.symmetric(horizontal: 30),
-              height: 60,
-              color: HexColor('#3A3A3A'),
-              child: Container(
-                margin: const EdgeInsets.symmetric(horizontal: 15),
-                child: Row(
-                  children: [
-                    Container(
-                      color: HexColor('#F8F9FA'),
-                      width: 40,
-                      height: 40,
-                      child: Center(
-                        child: FaIcon(
-                          FontAwesomeIcons.vial,
-                          color: HexColor('#495057'),
-                        ),
-                      ),
-                    ),
-                    const SizedBox(
-                      width: 40,
-                    ),
-                    Flexible(
-                      child: RichText(
-                        text: TextSpan(
-                          style:
-                              TextStyle(color: Colors.white.withOpacity(0.9)),
-                          /*defining default style is optional */
-                          children: <TextSpan>[
-                            const TextSpan(
-                              text: 'Open Demo\n',
-                              style: TextStyle(fontSize: 16),
-                            ),
-                            TextSpan(
-                              text: 'Demo mod will not let you add or control '
-                                  'real smart home device!',
-                              style: TextStyle(color: HexColor('#D6D6D6')),
-                            ),
-                          ],
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          ),
-          const SizedBox(
-            height: 15,
-          ),
-          Container(
-            margin: const EdgeInsets.symmetric(horizontal: 5),
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.end,
-              children: [
-                TextButton(
-                  onPressed: () async {
-                    context.router.pop();
-                  },
-                  style: TextButton.styleFrom(
-                    minimumSize: const Size(70, 30),
-                    backgroundColor: HexColor('#858585'),
-                  ),
-                  child: const Text(
-                    'Back',
-                    style: TextStyle(color: Colors.white),
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/presentation/connect_to_hub/connect_to_hub_page.dart b/lib/presentation/connect_to_hub/connect_to_hub_page.dart
index 63395db25..710caa46d 100644
--- a/lib/presentation/connect_to_hub/connect_to_hub_page.dart
+++ b/lib/presentation/connect_to_hub/connect_to_hub_page.dart
@@ -34,7 +34,7 @@ class ConnectToHubPage extends StatelessWidget {
                   Container(
                     alignment: Alignment.center,
                     child: const Text(
-                      'Connect to Hub',
+                      ' Connect to Hub',
                       textAlign: TextAlign.center,
                       style: TextStyle(fontSize: 35),
                     ),
@@ -43,7 +43,7 @@ class ConnectToHubPage extends StatelessWidget {
                     height: 40,
                   ),
                   Expanded(
-                    child: Container(
+                    child: ColoredBox(
                       color: HexColor('#3A3A3A'),
                       child: Column(
                         children: [
diff --git a/lib/presentation/connect_to_hub/widgets/cbj_hub_in_network.dart b/lib/presentation/connect_to_hub/widgets/cbj_hub_in_network.dart
index abbd79ede..ce97eec52 100644
--- a/lib/presentation/connect_to_hub/widgets/cbj_hub_in_network.dart
+++ b/lib/presentation/connect_to_hub/widgets/cbj_hub_in_network.dart
@@ -41,7 +41,7 @@ class CbjHubInNetwork extends StatelessWidget {
                         },
                         child: const Text('Retry'),
                       ),
-                      SizedBox(
+                      const SizedBox(
                         width: 40,
                       ),
                       TextButton(
diff --git a/lib/presentation/connect_to_hub_more/connect_to_hub_more_page.dart b/lib/presentation/connect_to_hub_more/connect_to_hub_more_page.dart
new file mode 100644
index 000000000..7073d13d8
--- /dev/null
+++ b/lib/presentation/connect_to_hub_more/connect_to_hub_more_page.dart
@@ -0,0 +1,80 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:cybear_jinni/application/more_connections_options/more_connections_options_bloc.dart';
+import 'package:cybear_jinni/injection.dart';
+import 'package:cybear_jinni/presentation/connect_to_hub_more/widgets/connect_to_hub_more_widget.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:hexcolor/hexcolor.dart';
+
+class ConnectToHubMorePage extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    final Size screenSize = MediaQuery.of(context).size;
+
+    return Scaffold(
+      appBar: AppBar(
+        toolbarHeight: 0,
+        backgroundColor: HexColor('#303030'),
+        systemOverlayStyle: SystemUiOverlayStyle.light,
+      ),
+      backgroundColor: HexColor('#303030'),
+      body: Column(
+        children: [
+          const SizedBox(
+            height: 50,
+          ),
+          Container(
+            alignment: Alignment.center,
+            child: const Text(
+              'More Connections Options',
+              textAlign: TextAlign.center,
+              style: TextStyle(fontSize: 23),
+            ),
+          ),
+          const SizedBox(
+            height: 40,
+          ),
+          Expanded(
+            child: Center(
+              child: BlocProvider(
+                create: (BuildContext context) =>
+                    getIt<MoreConnectionsOptionsBloc>()
+                      ..add(
+                        MoreConnectionsOptionsEvent.initialEvent(
+                          context,
+                        ),
+                      ),
+                child: ConnectToHubMoreWidget(),
+              ),
+            ),
+          ),
+          const SizedBox(
+            height: 15,
+          ),
+          Container(
+            margin: const EdgeInsets.symmetric(horizontal: 5),
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.end,
+              children: [
+                TextButton(
+                  onPressed: () async {
+                    context.router.pop();
+                  },
+                  style: TextButton.styleFrom(
+                    minimumSize: const Size(70, 30),
+                    backgroundColor: HexColor('#858585'),
+                  ),
+                  child: const Text(
+                    'Back',
+                    style: TextStyle(color: Colors.white),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/presentation/connect_to_hub_more/widgets/connect_to_hub_more_widget.dart b/lib/presentation/connect_to_hub_more/widgets/connect_to_hub_more_widget.dart
new file mode 100644
index 000000000..c619c97e1
--- /dev/null
+++ b/lib/presentation/connect_to_hub_more/widgets/connect_to_hub_more_widget.dart
@@ -0,0 +1,156 @@
+import 'package:cybear_jinni/application/more_connections_options/more_connections_options_bloc.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:hexcolor/hexcolor.dart';
+
+class ConnectToHubMoreWidget extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    final Size screenSize = MediaQuery.of(context).size;
+
+    return BlocBuilder<MoreConnectionsOptionsBloc, MoreConnectionsOptionsState>(
+      builder: (context, state) {
+        return state.map(
+          initial: (_) {
+            return Column(
+              children: [
+                Expanded(
+                  child: Container(
+                    margin: const EdgeInsets.symmetric(horizontal: 30),
+                    child: Column(
+                      children: [
+                        Expanded(
+                          child: ColoredBox(
+                            color: HexColor('#3A3A3A'),
+                            child: Column(
+                              children: [
+                                const SizedBox(
+                                  height: 15,
+                                ),
+                                Container(
+                                  margin: const EdgeInsets.symmetric(
+                                    horizontal: 15,
+                                  ),
+                                  child: Row(
+                                    children: [
+                                      Container(
+                                        color: HexColor('#F8F9FA'),
+                                        width: 40,
+                                        height: 40,
+                                        child: Center(
+                                          child: FaIcon(
+                                            FontAwesomeIcons.globe,
+                                            color: HexColor('#495057'),
+                                          ),
+                                        ),
+                                      ),
+                                      const SizedBox(
+                                        width: 40,
+                                      ),
+                                      Flexible(
+                                        child: Text(
+                                          'Connect to Remote Pipes',
+                                          style: TextStyle(
+                                            color: HexColor('#D6D6D6'),
+                                          ),
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                                const Expanded(
+                                  child: Center(
+                                    child: Text('Currently not supported'),
+                                    // BlocProvider(
+                                    //   create: (context) => getIt<HubInNetworkBloc>()
+                                    //     ..add(
+                                    //       const HubInNetworkEvent
+                                    //           .searchHubInNetwork(),
+                                    //     ),
+                                    //   child: CbjHubInNetwork(),
+                                    // ),
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+                SizedBox(
+                  height: screenSize.height / 20,
+                ),
+                GestureDetector(
+                  onTap: () {
+                    context.read<MoreConnectionsOptionsBloc>().add(
+                          const MoreConnectionsOptionsEvent.connectInDemoMode(),
+                        );
+                    // context.router.replace(const HomeRoute());
+                  },
+                  child: Container(
+                    margin: const EdgeInsets.symmetric(horizontal: 30),
+                    height: 60,
+                    color: HexColor('#3A3A3A'),
+                    child: Container(
+                      margin: const EdgeInsets.symmetric(horizontal: 15),
+                      child: Row(
+                        children: [
+                          Container(
+                            color: HexColor('#F8F9FA'),
+                            width: 40,
+                            height: 40,
+                            child: Center(
+                              child: FaIcon(
+                                FontAwesomeIcons.vial,
+                                color: HexColor('#495057'),
+                              ),
+                            ),
+                          ),
+                          const SizedBox(
+                            width: 40,
+                          ),
+                          Flexible(
+                            child: RichText(
+                              text: TextSpan(
+                                style: TextStyle(
+                                  color: Colors.white.withOpacity(0.9),
+                                ),
+                                children: <TextSpan>[
+                                  const TextSpan(
+                                    text: 'Open Demo\n',
+                                    style: TextStyle(fontSize: 16),
+                                  ),
+                                  TextSpan(
+                                    text:
+                                        'Demo mod will not let you add or control '
+                                        'real smart home device!',
+                                    style:
+                                        TextStyle(color: HexColor('#D6D6D6')),
+                                  ),
+                                ],
+                              ),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
+              ],
+            );
+          },
+          loadInProgress: (_) => const SizedBox(
+            height: 70,
+            width: 70,
+            child: CircularProgressIndicator(),
+          ),
+          loadSuccess: (_) => const Text('Found hub'),
+          loadFailure: (failure) => const Text('Failure'),
+        );
+      },
+    );
+  }
+}
diff --git a/lib/presentation/core/notifications.dart b/lib/presentation/core/notifications.dart
index d1c65e7d7..a7c93365a 100644
--- a/lib/presentation/core/notifications.dart
+++ b/lib/presentation/core/notifications.dart
@@ -28,8 +28,8 @@ Future<void> initialisationNotifications() async {
   // to the Android head project
   const AndroidInitializationSettings initializationSettingsAndroid =
       AndroidInitializationSettings('ic_launcher_foreground');
-  const IOSInitializationSettings initializationSettingsIOS =
-      IOSInitializationSettings(
+  const DarwinInitializationSettings initializationSettingsIOS =
+      DarwinInitializationSettings(
     onDidReceiveLocalNotification: selectNotificationIos,
   );
 
@@ -39,8 +39,8 @@ Future<void> initialisationNotifications() async {
     // defaultIcon: AssetsLinuxIcon('icons/app_icon.png'),
   );
 
-  const MacOSInitializationSettings initializationSettingsMacOS =
-      MacOSInitializationSettings();
+  const DarwinInitializationSettings initializationSettingsMacOS =
+      DarwinInitializationSettings();
   const InitializationSettings initializationSettings = InitializationSettings(
     android: initializationSettingsAndroid,
     iOS: initializationSettingsIOS,
@@ -49,7 +49,6 @@ Future<void> initialisationNotifications() async {
   );
   await flutterLocalNotificationsPlugin!.initialize(
     initializationSettings,
-    onSelectNotification: selectNotification,
   );
 }
 
@@ -112,10 +111,10 @@ Future<void> showNotificationCustomSound() async {
     'your other channel name',
     sound: RawResourceAndroidNotificationSound('alert_sfx_created_by_omer_luz'),
   );
-  const IOSNotificationDetails iOSPlatformChannelSpecifics =
-      IOSNotificationDetails(sound: 'alert_sfx_created_by_omer_luz.wav');
-  const MacOSNotificationDetails macOSPlatformChannelSpecifics =
-      MacOSNotificationDetails(sound: 'alert_sfx_created_by_omer_luz.wav');
+  const DarwinNotificationDetails iOSPlatformChannelSpecifics =
+      DarwinNotificationDetails(sound: 'alert_sfx_created_by_omer_luz.wav');
+  const DarwinNotificationDetails macOSPlatformChannelSpecifics =
+      DarwinNotificationDetails(sound: 'alert_sfx_created_by_omer_luz.wav');
   const NotificationDetails platformChannelSpecifics = NotificationDetails(
     android: androidPlatformChannelSpecifics,
     iOS: iOSPlatformChannelSpecifics,
diff --git a/lib/presentation/plus_button/plus_button.dart b/lib/presentation/plus_button/plus_button.dart
index ae1aba197..61aea2423 100644
--- a/lib/presentation/plus_button/plus_button.dart
+++ b/lib/presentation/plus_button/plus_button.dart
@@ -1,12 +1,8 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:cybear_jinni/domain/hub/hub_entity.dart';
-import 'package:cybear_jinni/domain/hub/i_hub_connection_repository.dart';
-import 'package:cybear_jinni/presentation/routes/app_router.gr.dart';
+import 'package:cybear_jinni/application/plus_button_settings/plus_button_settings_bloc.dart';
+import 'package:cybear_jinni/injection.dart';
+import 'package:cybear_jinni/presentation/plus_button/widgets/plus_button_wighet.dart';
 import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:iconify_flutter/iconify_flutter.dart';
-import 'package:iconify_flutter/icons/simple_icons.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 
 class PlusButtonPage extends StatelessWidget {
   @override
@@ -17,218 +13,12 @@ class PlusButtonPage extends StatelessWidget {
         backgroundColor: Colors.purple.withOpacity(0.7),
       ),
       backgroundColor: Colors.black.withOpacity(0.7),
-      body: SingleChildScrollView(
-        child: Column(
-          children: [
-            const SizedBox(
-              height: 30,
-            ),
-            Container(
-              padding: const EdgeInsets.symmetric(horizontal: 15),
-              alignment: Alignment.topLeft,
-              child: const Text(
-                'Add:',
-                style: TextStyle(
-                  color: Colors.white,
-                  fontSize: 20,
-                ),
-              ),
-            ),
-            const SizedBox(
-              height: 10,
-            ),
-            ColoredBox(
-              color: Colors.white,
-              child: Column(
-                children: [
-                  const SizedBox(
-                    height: 1,
-                  ),
-                  ColoredBox(
-                    color: Colors.purple.withOpacity(0.7),
-                    child: ListTile(
-                      leading: FaIcon(
-                        FontAwesomeIcons.sitemap,
-                        color: Theme.of(context).textTheme.bodyText1!.color,
-                        size: 25,
-                      ),
-                      title: Text(
-                        'Add Automation',
-                        style: TextStyle(
-                          color: Theme.of(context).textTheme.bodyText1!.color,
-                        ),
-                      ),
-                      onTap: () {
-                        context.router
-                            .push(const ChooseAutomationTypeToAddRoute());
-                      },
-                    ),
-                  ),
-                  const SizedBox(
-                    height: 1,
-                  ),
-                  ColoredBox(
-                    color: Colors.brown.withOpacity(0.9),
-                    child: ListTile(
-                      leading: FaIcon(
-                        FontAwesomeIcons.solidLightbulb,
-                        color: Theme.of(context).textTheme.bodyText1!.color,
-                        size: 25,
-                      ),
-                      title: Text(
-                        'Add Device',
-                        style: TextStyle(
-                          color: Theme.of(context).textTheme.bodyText1!.color,
-                        ),
-                      ),
-                      onTap: () {
-                        context.router
-                            .push(const ChooseDeviceVendorToAddRoute());
-                      },
-                    ),
-                  ),
-                  const SizedBox(
-                    height: 1,
-                  ),
-                  ColoredBox(
-                    color: Colors.blue,
-                    child: ListTile(
-                      leading: FaIcon(
-                        FontAwesomeIcons.globe,
-                        color: Theme.of(context).textTheme.bodyText1!.color,
-                        size: 25,
-                      ),
-                      title: Text(
-                        'Add Remote Control Support',
-                        style: TextStyle(
-                          color: Theme.of(context).textTheme.bodyText1!.color,
-                        ),
-                      ),
-                      onTap: () {
-                        context.router.push(const RemotePipesRoute());
-                      },
-                    ),
-                  ),
-                  const SizedBox(
-                    height: 1,
-                  ),
-                ],
-              ),
-            ),
-            const SizedBox(
-              height: 40,
-            ),
-            Container(
-              alignment: Alignment.topLeft,
-              padding: const EdgeInsets.symmetric(horizontal: 15),
-              child: const Text(
-                'Manage:',
-                style: TextStyle(
-                  color: Colors.white,
-                  fontSize: 20,
-                ),
-              ),
-            ),
-            const SizedBox(
-              height: 10,
-            ),
-            ColoredBox(
-              color: Colors.white,
-              child: Column(
-                children: [
-                  const SizedBox(
-                    height: 1,
-                  ),
-                  ColoredBox(
-                    color: Colors.redAccent.withOpacity(0.9),
-                    child: ListTile(
-                      leading: Iconify(
-                        SimpleIcons.node_red,
-                        color: Theme.of(context).textTheme.bodyText1!.color,
-                        size: 23,
-                      ),
-                      title: Text(
-                        'Open Node-RED of Hub',
-                        style: TextStyle(
-                          color: Theme.of(context).textTheme.bodyText1!.color,
-                        ),
-                      ),
-                      onTap: () {
-                        final HubEntity? hubEntity =
-                            IHubConnectionRepository.hubEntity;
-                        if (hubEntity != null &&
-                            hubEntity.lastKnownIp.isValid()) {
-                          final String lastKnownIp =
-                              hubEntity.lastKnownIp.getOrCrash();
-                          launchUrl(
-                            Uri.parse('http://$lastKnownIp:1880'),
-                            mode: LaunchMode.externalApplication,
-                          );
-                        } else {
-                          showDialog(
-                            context: context,
-                            builder: (_) => const AlertDialog(
-                              title: Text(
-                                "Can't find Hub/Node-Red IP to connect to",
-                              ),
-                            ),
-                          );
-                        }
-                      },
-                    ),
-                  ),
-                  const SizedBox(
-                    height: 1,
-                  ),
-                  ColoredBox(
-                    color: Colors.orangeAccent,
-                    child: ListTile(
-                      leading: FaIcon(
-                        FontAwesomeIcons.info,
-                        color: Theme.of(context).textTheme.bodyText1!.color,
-                        size: 25,
-                      ),
-                      title: Text(
-                        'Software Info',
-                        style: TextStyle(
-                          color: Theme.of(context).textTheme.bodyText1!.color,
-                        ),
-                      ),
-                      onTap: () {
-                        context.router.push(const SoftwareInfoRoute());
-                      },
-                    ),
-                  ),
-                  const SizedBox(
-                    height: 1,
-                  ),
-                  ColoredBox(
-                    color: Colors.greenAccent,
-                    child: ListTile(
-                      leading: FaIcon(
-                        FontAwesomeIcons.rightFromBracket,
-                        color: Theme.of(context).textTheme.bodyText1!.color,
-                        size: 25,
-                      ),
-                      title: Text(
-                        'Log Out',
-                        style: TextStyle(
-                          color: Theme.of(context).textTheme.bodyText1!.color,
-                        ),
-                      ),
-                      onTap: () {
-                        context.router.replace(const ConnectToHubRoute());
-                      },
-                    ),
-                  ),
-                  const SizedBox(
-                    height: 1,
-                  ),
-                ],
-              ),
-            ),
-          ],
-        ),
+      body: BlocProvider(
+        create: (BuildContext context) => getIt<PlusButtonSettingsBloc>()
+          ..add(
+            PlusButtonSettingsEvent.initialized(context),
+          ),
+        child: PlusButtonWidget(),
       ),
     );
   }
diff --git a/lib/presentation/plus_button/widgets/plus_button_wighet.dart b/lib/presentation/plus_button/widgets/plus_button_wighet.dart
new file mode 100644
index 000000000..1502edffc
--- /dev/null
+++ b/lib/presentation/plus_button/widgets/plus_button_wighet.dart
@@ -0,0 +1,271 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:cybear_jinni/application/plus_button_settings/plus_button_settings_bloc.dart';
+import 'package:cybear_jinni/domain/hub/hub_entity.dart';
+import 'package:cybear_jinni/domain/hub/i_hub_connection_repository.dart';
+import 'package:cybear_jinni/presentation/routes/app_router.gr.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:iconify_flutter/iconify_flutter.dart';
+import 'package:iconify_flutter/icons/simple_icons.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+class PlusButtonWidget extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    final Size screenSize = MediaQuery.of(context).size;
+
+    return BlocBuilder<PlusButtonSettingsBloc, PlusButtonSettingsState>(
+      builder: (context, state) {
+        return state.map(
+          initial: (_) {
+            return SingleChildScrollView(
+              child: Column(
+                children: [
+                  const SizedBox(
+                    height: 30,
+                  ),
+                  Container(
+                    padding: const EdgeInsets.symmetric(horizontal: 15),
+                    alignment: Alignment.topLeft,
+                    child: const Text(
+                      'Add:',
+                      style: TextStyle(
+                        color: Colors.white,
+                        fontSize: 20,
+                      ),
+                    ),
+                  ),
+                  const SizedBox(
+                    height: 10,
+                  ),
+                  ColoredBox(
+                    color: Colors.white,
+                    child: Column(
+                      children: [
+                        const SizedBox(
+                          height: 1,
+                        ),
+                        ColoredBox(
+                          color: Colors.purple.withOpacity(0.7),
+                          child: ListTile(
+                            leading: FaIcon(
+                              FontAwesomeIcons.sitemap,
+                              color:
+                                  Theme.of(context).textTheme.bodyText1!.color,
+                              size: 25,
+                            ),
+                            title: Text(
+                              'Add Automation',
+                              style: TextStyle(
+                                color: Theme.of(context)
+                                    .textTheme
+                                    .bodyText1!
+                                    .color,
+                              ),
+                            ),
+                            onTap: () {
+                              context.router
+                                  .push(const ChooseAutomationTypeToAddRoute());
+                            },
+                          ),
+                        ),
+                        const SizedBox(
+                          height: 1,
+                        ),
+                        ColoredBox(
+                          color: Colors.brown.withOpacity(0.9),
+                          child: ListTile(
+                            leading: FaIcon(
+                              FontAwesomeIcons.solidLightbulb,
+                              color:
+                                  Theme.of(context).textTheme.bodyText1!.color,
+                              size: 25,
+                            ),
+                            title: Text(
+                              'Add Device',
+                              style: TextStyle(
+                                color: Theme.of(context)
+                                    .textTheme
+                                    .bodyText1!
+                                    .color,
+                              ),
+                            ),
+                            onTap: () {
+                              context.router
+                                  .push(const ChooseDeviceVendorToAddRoute());
+                            },
+                          ),
+                        ),
+                        const SizedBox(
+                          height: 1,
+                        ),
+                        ColoredBox(
+                          color: Colors.blue,
+                          child: ListTile(
+                            leading: FaIcon(
+                              FontAwesomeIcons.globe,
+                              color:
+                                  Theme.of(context).textTheme.bodyText1!.color,
+                              size: 25,
+                            ),
+                            title: Text(
+                              'Add Remote Control Support',
+                              style: TextStyle(
+                                color: Theme.of(context)
+                                    .textTheme
+                                    .bodyText1!
+                                    .color,
+                              ),
+                            ),
+                            onTap: () {
+                              context.router.push(const RemotePipesRoute());
+                            },
+                          ),
+                        ),
+                        const SizedBox(
+                          height: 1,
+                        ),
+                      ],
+                    ),
+                  ),
+                  const SizedBox(
+                    height: 40,
+                  ),
+                  Container(
+                    alignment: Alignment.topLeft,
+                    padding: const EdgeInsets.symmetric(horizontal: 15),
+                    child: const Text(
+                      'Manage:',
+                      style: TextStyle(
+                        color: Colors.white,
+                        fontSize: 20,
+                      ),
+                    ),
+                  ),
+                  const SizedBox(
+                    height: 10,
+                  ),
+                  ColoredBox(
+                    color: Colors.white,
+                    child: Column(
+                      children: [
+                        const SizedBox(
+                          height: 1,
+                        ),
+                        ColoredBox(
+                          color: Colors.redAccent.withOpacity(0.9),
+                          child: ListTile(
+                            leading: Iconify(
+                              SimpleIcons.node_red,
+                              color:
+                                  Theme.of(context).textTheme.bodyText1!.color,
+                              size: 23,
+                            ),
+                            title: Text(
+                              'Open Node-RED of Hub',
+                              style: TextStyle(
+                                color: Theme.of(context)
+                                    .textTheme
+                                    .bodyText1!
+                                    .color,
+                              ),
+                            ),
+                            onTap: () {
+                              final HubEntity? hubEntity =
+                                  IHubConnectionRepository.hubEntity;
+                              if (hubEntity != null &&
+                                  hubEntity.lastKnownIp.isValid()) {
+                                final String lastKnownIp =
+                                    hubEntity.lastKnownIp.getOrCrash();
+                                launchUrl(
+                                  Uri.parse('http://$lastKnownIp:1880'),
+                                  mode: LaunchMode.externalApplication,
+                                );
+                              } else {
+                                showDialog(
+                                  context: context,
+                                  builder: (_) => const AlertDialog(
+                                    title: Text(
+                                      "Can't find Hub/Node-Red IP to connect to",
+                                    ),
+                                  ),
+                                );
+                              }
+                            },
+                          ),
+                        ),
+                        const SizedBox(
+                          height: 1,
+                        ),
+                        ColoredBox(
+                          color: Colors.orangeAccent,
+                          child: ListTile(
+                            leading: FaIcon(
+                              FontAwesomeIcons.info,
+                              color:
+                                  Theme.of(context).textTheme.bodyText1!.color,
+                              size: 25,
+                            ),
+                            title: Text(
+                              'Software Info',
+                              style: TextStyle(
+                                color: Theme.of(context)
+                                    .textTheme
+                                    .bodyText1!
+                                    .color,
+                              ),
+                            ),
+                            onTap: () {
+                              context.router.push(const SoftwareInfoRoute());
+                            },
+                          ),
+                        ),
+                        const SizedBox(
+                          height: 1,
+                        ),
+                        ColoredBox(
+                          color: Colors.greenAccent,
+                          child: ListTile(
+                            leading: FaIcon(
+                              FontAwesomeIcons.rightFromBracket,
+                              color:
+                                  Theme.of(context).textTheme.bodyText1!.color,
+                              size: 25,
+                            ),
+                            title: Text(
+                              'Log Out',
+                              style: TextStyle(
+                                color: Theme.of(context)
+                                    .textTheme
+                                    .bodyText1!
+                                    .color,
+                              ),
+                            ),
+                            onTap: () {
+                              context.read<PlusButtonSettingsBloc>().add(
+                                    const PlusButtonSettingsEvent.logout(),
+                                  );
+                            },
+                          ),
+                        ),
+                        const SizedBox(
+                          height: 1,
+                        ),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+            );
+          },
+          loadInProgress: (_) => const Center(
+            child: CircularProgressIndicator(),
+          ),
+          loadSuccess: (_) => const Text('Found hub'),
+          loadFailure: (failure) => const Text('Failure'),
+        );
+      },
+    );
+  }
+}
diff --git a/lib/presentation/routes/app_router.dart b/lib/presentation/routes/app_router.dart
index 48664ef74..0ee3c1a2e 100644
--- a/lib/presentation/routes/app_router.dart
+++ b/lib/presentation/routes/app_router.dart
@@ -19,8 +19,8 @@ import 'package:cybear_jinni/presentation/add_vendors_pages/add_lifx_vendor/add_
 import 'package:cybear_jinni/presentation/add_vendors_pages/add_smart_life_vendor/add_smart_life_vendor_page.dart';
 import 'package:cybear_jinni/presentation/add_vendors_pages/add_tuya_vendor/add_tuya_vendor_page.dart';
 import 'package:cybear_jinni/presentation/change_room_for_devices/change_room_for_devices_page.dart';
-import 'package:cybear_jinni/presentation/connect_to_hub/connect_to_hub_more_page.dart';
 import 'package:cybear_jinni/presentation/connect_to_hub/connect_to_hub_page.dart';
+import 'package:cybear_jinni/presentation/connect_to_hub_more/connect_to_hub_more_page.dart';
 import 'package:cybear_jinni/presentation/create_home/create_home_page.dart';
 import 'package:cybear_jinni/presentation/device_full_screen_page/blinds/rooms_blinds_page.dart';
 import 'package:cybear_jinni/presentation/device_full_screen_page/boilers/rooms_boilers_page.dart';
diff --git a/pubspec.yaml b/pubspec.yaml
index 3f7516db7..1e8eeccdb 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: cybear_jinni
 description: CyBear Jinni app to interact with your CyBear Jinni Smart Devices
-version: 1.3.5+59
+version: 1.3.6+60
 homepage: https://cybearjinni.com
 
 publish_to: 'none'
@@ -39,7 +39,7 @@ dependencies:
   # Utility classes to work with asynchronous computations.
   async: ^2.9.0
   # Declarative routing solution, where everything needed for navigation is automatically generated for you.
-  auto_route: ^4.2.1
+  auto_route: ^5.0.1
   # Automatically resizes text to fit perfectly within its bounds.
   auto_size_text: ^3.0.0
   # Helps implement the BLoC pattern.
@@ -71,7 +71,7 @@ dependencies:
   # HSV(HSB)/HSL/RGB/Material color picker
   flutter_colorpicker: ^1.0.3
   # A cross platform plugin for displaying local notifications.
-  flutter_local_notifications: ^9.7.0
+  flutter_local_notifications: ^11.0.1
   # Getting the local timezone of the os.
   flutter_native_timezone: ^2.0.0
   # An easy to implement custom switch
@@ -109,7 +109,7 @@ dependencies:
   # Dart Build System builders for handling JSON.
   json_serializable: ^6.3.1
   # Port of Kotlin's Kotlin Standard library for Dart/Flutter projects
-  kt_dart: ^0.10.0
+  kt_dart: ^1.0.0
   # Liquid progress indicator for Flutter.
   liquid_progress_indicator: ^0.4.0
   # Handles getting a location on
@@ -149,12 +149,12 @@ dependencies:
   # Get available wifi ssid list, user can connect to wifi with ssid and password, and create hotspot
   wifi_iot: ^0.3.16
   # Scan for nearby visible WiFi access points.
-  wifi_scan: ^0.3.0
+  wifi_scan: ^0.4.0+1
 
 
 dev_dependencies:
   # Generator for auto_route library.
-  auto_route_generator: ^4.2.1
+  auto_route_generator: ^5.0.2
   # A build system for Dart code generation and modular compilation.
   build_runner: