diff --git a/po/ja.po b/po/ja.po
index 47fb751..08a4ba0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Taidan 0.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-30 10:46+0000\n"
+"POT-Creation-Date: 2025-01-02 17:03+0000\n"
 "PO-Revision-Date: 2024-12-31 12:26+0000\n"
 "Last-Translator: madomado <madonuko@outlook.com>\n"
-"Language-Team: Japanese <https://weblate.fyralabs.com/projects/"
-"ultramarine-linux/taidan/ja/>\n"
+"Language-Team: Japanese <https://weblate.fyralabs.com/projects/ultramarine-"
+"linux/taidan/ja/>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,35 +19,40 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.9.2\n"
 
-#: src/backend/steps.rs:98
+#: src/backend/steps.rs:103
 msgid "Creating User…"
 msgstr "ユーザー登録中…"
 
-#: src/backend/steps.rs:99
+#: src/backend/steps.rs:104
 msgid "Setting Timezone…"
 msgstr "タイムゾーン設定中…"
 
-#: src/backend/steps.rs:100
+#: src/backend/steps.rs:105
 msgid "Configuring Themes…"
 msgstr "テーマ設定中…"
 
-#: src/backend/steps.rs:101
+#: src/backend/steps.rs:106
 msgid "Downloading System Update…"
 msgstr "システムアップデートダウンロード中…"
 
-#: src/backend/steps.rs:102
+#: src/backend/steps.rs:107
 msgid "Installing System Update…"
 msgstr "システムアップデートインストール中…"
 
-#: src/backend/steps.rs:103
+#: src/backend/steps.rs:108
 msgid "Downloading User Programs…"
 msgstr "ユーザーアプリダウンロード中…"
 
-#: src/backend/steps.rs:104
+#: src/backend/steps.rs:109
 msgid "Installing User Programs…"
 msgstr "ユーザーアプリインストール中…"
 
-#: src/pages/_00_welcome.rs:17 src/main.rs:71
+#: src/backend/steps.rs:110
+#, fuzzy
+msgid "Installing additional drivers…"
+msgstr "システムアップデートインストール中…"
+
+#: src/pages/_00_welcome.rs:17 src/main.rs:72
 msgid "Welcome to %s"
 msgstr "%s へようこそ"
 
@@ -63,22 +68,40 @@ msgstr "スキップ"
 msgid "Let's Go"
 msgstr "次"
 
-#: src/pages/_01_whoareyou.rs:83
+#: src/pages/_01_keyboard.rs:44
+msgid "Default"
+msgstr ""
+
+#: src/pages/_01_keyboard.rs:75
+msgid "Keyboard Layout"
+msgstr ""
+
+#: src/pages/_01_keyboard.rs:102
+msgid "Search keyboard layout…"
+msgstr ""
+
+#: src/pages/_01_keyboard.rs:131
+msgid "Search keyboard variant…"
+msgstr ""
+
+#: src/pages/_02_whoareyou.rs:83
 msgid "Who are You?"
 msgstr ""
 
-#: src/pages/_01_whoareyou.rs:92
+#: src/pages/_02_whoareyou.rs:92
 msgid "Full Name"
 msgstr "名前"
 
-#: src/pages/_01_whoareyou.rs:100
+#: src/pages/_02_whoareyou.rs:100
 msgid "Username"
 msgstr "ユーザー名"
 
-#: src/pages/_01_whoareyou.rs:110
-msgid "Username\n"
+#: src/pages/_02_whoareyou.rs:110
+msgid ""
+"Username\n"
 "- must start with lowercase letters\n"
-"- must contain only alphanumericals, underscore (<tt>_</tt>) or dash (<tt>-</tt>)\n"
+"- must contain only alphanumericals, underscore (<tt>_</tt>) or dash (<tt>-</"
+"tt>)\n"
 "- may optionally end with a dollar sign (<tt>$</tt>)"
 msgstr ""
 "ユーザー名のフォーマットについて\n"
@@ -86,137 +109,143 @@ msgstr ""
 "- 英文字・数字・<tt>_</tt>・<tt>-</tt>だけで組む\n"
 "- <tt>$</tt>で終わるのが可能"
 
-#: src/pages/_02_password.rs:34
+#: src/pages/_03_password.rs:34
 msgid "Create a Password"
 msgstr "パスワード作成"
 
-#: src/pages/_02_password.rs:44
+#: src/pages/_03_password.rs:44
 msgid "Password"
 msgstr "パスワード"
 
-#: src/pages/_02_password.rs:56
+#: src/pages/_03_password.rs:56
 msgid "Repeat Password"
 msgstr "確認"
 
-#: src/pages/_03_internet.rs:28
+#: src/pages/_04_internet.rs:28
 msgid "Let's Get You Online"
 msgstr "インターネット接続"
 
-#: src/pages/_03_internet.rs:34
+#: src/pages/_04_internet.rs:34
 msgid "Connect to the Internet to get the latest and greatest."
-msgstr "インターネットに接続すると、最新ソフトをダウンロードできることになります。"
+msgstr ""
+"インターネットに接続すると、最新ソフトをダウンロードできることになります。"
 
-#: src/pages/_03_internet.rs:42
+#: src/pages/_04_internet.rs:42
 msgid "I don't have Internet"
 msgstr "スキップ"
 
-#: src/pages/_04_analytics.rs:20
+#: src/pages/_05_analytics.rs:20
 msgid "Analytics and Crash Reporting"
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:24
+#: src/pages/_06_crashreport.rs:24
 msgid "Crash Reporting"
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:30
+#: src/pages/_06_crashreport.rs:30
 msgid "Allow Fyra Labs to collect crash data to find bugs and assist you."
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:34
-msgid "All data collected is anonymous and end-to-end encrypted.\n"
+#: src/pages/_06_crashreport.rs:34
+msgid ""
+"All data collected is anonymous and end-to-end encrypted.\n"
 "You will be given a crash ID to help support find what went wrong."
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:38
+#: src/pages/_06_crashreport.rs:38
 msgid "Send Crash Data"
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:39
+#: src/pages/_06_crashreport.rs:39
 msgid "Press next to keep off"
 msgstr ""
 
-#: src/pages/_06_location.rs:26 src/pages/_06_location.rs:37
+#: src/pages/_07_location.rs:26 src/pages/_07_location.rs:37
 msgid "Location Services"
 msgstr ""
 
-#: src/pages/_06_location.rs:33
-msgid "Allow apps to request your approximate location with [Mozilla Location Services]"
+#: src/pages/_07_location.rs:33
+msgid ""
+"Allow apps to request your approximate location with [Mozilla Location "
+"Services]"
 msgstr ""
 
-#: src/pages/_07_nightlight.rs:19 src/pages/_07_nightlight.rs:40
+#: src/pages/_08_nightlight.rs:19 src/pages/_08_nightlight.rs:40
 msgid "Night Light"
 msgstr "夜間モード"
 
-#: src/pages/_07_nightlight.rs:26
+#: src/pages/_08_nightlight.rs:26
 msgid "Tint the display with a warm tone at night to reduce eyestrain."
-msgstr "画面の色合いを暖かくすることによって、目への負担を軽減することができます。"
+msgstr ""
+"画面の色合いを暖かくすることによって、目への負担を軽減することができます。"
 
-#: src/pages/_07_nightlight.rs:31
+#: src/pages/_08_nightlight.rs:31
 msgid "Night Light is not proven to help with difficulty falling sleep."
 msgstr ""
 
-#: src/pages/_08_theme.rs:71
+#: src/pages/_09_theme.rs:71
 msgid "Choose your theme"
 msgstr ""
 
-#: src/pages/_08_theme.rs:78
-msgid "Make this system your own with a splash of colour.\n"
+#: src/pages/_09_theme.rs:78
+msgid ""
+"Make this system your own with a splash of colour.\n"
 "You can change this option later in settings."
 msgstr ""
 
-#: src/pages/_08_theme.rs:84
+#: src/pages/_09_theme.rs:84
 msgid "Some apps may not respect this preference."
 msgstr ""
 
-#: src/pages/_08_theme.rs:105
+#: src/pages/_09_theme.rs:105
 msgid "Light"
 msgstr ""
 
-#: src/pages/_08_theme.rs:120
+#: src/pages/_09_theme.rs:120
 msgid "Dark"
 msgstr ""
 
-#: src/pages/_09_browser.rs:64
+#: src/pages/_10_browser.rs:64
 msgid "Browser Selection"
 msgstr ""
 
-#: src/pages/_10_categories.rs:59
+#: src/pages/_11_categories.rs:59
 msgid "What Do You Use This Device For?"
 msgstr ""
 
-#: src/pages/_10_categories.rs:78
+#: src/pages/_11_categories.rs:78
 msgid "Confirm and Setup System"
 msgstr ""
 
-#: src/pages/_11_installing.rs:54
+#: src/pages/_12_installing.rs:54
 msgid "Installing your Apps"
 msgstr ""
 
-#: src/pages/_11_installing.rs:60
+#: src/pages/_12_installing.rs:60
 msgid "This won't take long!"
 msgstr ""
 
-#: src/pages/_11_installing.rs:68
+#: src/pages/_12_installing.rs:68
 msgid "Loading…"
 msgstr ""
 
-#: src/pages/_12_finish.rs:17
+#: src/pages/_13_finish.rs:17
 msgid "Your System is Ready"
 msgstr ""
 
-#: src/pages/_12_finish.rs:23
+#: src/pages/_13_finish.rs:23
 msgid "We hope you enjoy your fresh system!"
 msgstr ""
 
-#: src/pages/_12_finish.rs:31 src/pages/_13_error.rs:43
+#: src/pages/_13_finish.rs:31 src/pages/_14_error.rs:43
 msgid "Done"
 msgstr ""
 
-#: src/pages/_13_error.rs:22
+#: src/pages/_14_error.rs:22
 msgid "Error"
 msgstr ""
 
-#: src/pages/_13_error.rs:28
+#: src/pages/_14_error.rs:28
 msgid "We are sorry, but there is an unexpected problem."
 msgstr ""
 
diff --git a/po/taidan.pot b/po/taidan.pot
index 42bc134..88ab991 100644
--- a/po/taidan.pot
+++ b/po/taidan.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Taidan 0.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-30 10:46+0000\n"
+"POT-Creation-Date: 2025-01-02 17:04+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,35 +17,39 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/backend/steps.rs:98
+#: src/backend/steps.rs:103
 msgid "Creating User…"
 msgstr ""
 
-#: src/backend/steps.rs:99
+#: src/backend/steps.rs:104
 msgid "Setting Timezone…"
 msgstr ""
 
-#: src/backend/steps.rs:100
+#: src/backend/steps.rs:105
 msgid "Configuring Themes…"
 msgstr ""
 
-#: src/backend/steps.rs:101
+#: src/backend/steps.rs:106
 msgid "Downloading System Update…"
 msgstr ""
 
-#: src/backend/steps.rs:102
+#: src/backend/steps.rs:107
 msgid "Installing System Update…"
 msgstr ""
 
-#: src/backend/steps.rs:103
+#: src/backend/steps.rs:108
 msgid "Downloading User Programs…"
 msgstr ""
 
-#: src/backend/steps.rs:104
+#: src/backend/steps.rs:109
 msgid "Installing User Programs…"
 msgstr ""
 
-#: src/pages/_00_welcome.rs:17 src/main.rs:71
+#: src/backend/steps.rs:110
+msgid "Installing additional drivers…"
+msgstr ""
+
+#: src/pages/_00_welcome.rs:17 src/main.rs:72
 msgid "Welcome to %s"
 msgstr ""
 
@@ -61,156 +65,172 @@ msgstr ""
 msgid "Let's Go"
 msgstr ""
 
-#: src/pages/_01_whoareyou.rs:83
+#: src/pages/_01_keyboard.rs:44
+msgid "Default"
+msgstr ""
+
+#: src/pages/_01_keyboard.rs:75
+msgid "Keyboard Layout"
+msgstr ""
+
+#: src/pages/_01_keyboard.rs:102
+msgid "Search keyboard layout…"
+msgstr ""
+
+#: src/pages/_01_keyboard.rs:131
+msgid "Search keyboard variant…"
+msgstr ""
+
+#: src/pages/_02_whoareyou.rs:83
 msgid "Who are You?"
 msgstr ""
 
-#: src/pages/_01_whoareyou.rs:92
+#: src/pages/_02_whoareyou.rs:92
 msgid "Full Name"
 msgstr ""
 
-#: src/pages/_01_whoareyou.rs:100
+#: src/pages/_02_whoareyou.rs:100
 msgid "Username"
 msgstr ""
 
-#: src/pages/_01_whoareyou.rs:110
+#: src/pages/_02_whoareyou.rs:110
 msgid "Username\n"
 "- must start with lowercase letters\n"
 "- must contain only alphanumericals, underscore (<tt>_</tt>) or dash (<tt>-</tt>)\n"
 "- may optionally end with a dollar sign (<tt>$</tt>)"
 msgstr ""
 
-#: src/pages/_02_password.rs:34
+#: src/pages/_03_password.rs:34
 msgid "Create a Password"
 msgstr ""
 
-#: src/pages/_02_password.rs:44
+#: src/pages/_03_password.rs:44
 msgid "Password"
 msgstr ""
 
-#: src/pages/_02_password.rs:56
+#: src/pages/_03_password.rs:56
 msgid "Repeat Password"
 msgstr ""
 
-#: src/pages/_03_internet.rs:28
+#: src/pages/_04_internet.rs:28
 msgid "Let's Get You Online"
 msgstr ""
 
-#: src/pages/_03_internet.rs:34
+#: src/pages/_04_internet.rs:34
 msgid "Connect to the Internet to get the latest and greatest."
 msgstr ""
 
-#: src/pages/_03_internet.rs:42
+#: src/pages/_04_internet.rs:42
 msgid "I don't have Internet"
 msgstr ""
 
-#: src/pages/_04_analytics.rs:20
+#: src/pages/_05_analytics.rs:20
 msgid "Analytics and Crash Reporting"
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:24
+#: src/pages/_06_crashreport.rs:24
 msgid "Crash Reporting"
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:30
+#: src/pages/_06_crashreport.rs:30
 msgid "Allow Fyra Labs to collect crash data to find bugs and assist you."
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:34
+#: src/pages/_06_crashreport.rs:34
 msgid "All data collected is anonymous and end-to-end encrypted.\n"
 "You will be given a crash ID to help support find what went wrong."
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:38
+#: src/pages/_06_crashreport.rs:38
 msgid "Send Crash Data"
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:39
+#: src/pages/_06_crashreport.rs:39
 msgid "Press next to keep off"
 msgstr ""
 
-#: src/pages/_06_location.rs:26 src/pages/_06_location.rs:37
+#: src/pages/_07_location.rs:26 src/pages/_07_location.rs:37
 msgid "Location Services"
 msgstr ""
 
-#: src/pages/_06_location.rs:33
+#: src/pages/_07_location.rs:33
 msgid "Allow apps to request your approximate location with [Mozilla Location Services]"
 msgstr ""
 
-#: src/pages/_07_nightlight.rs:19 src/pages/_07_nightlight.rs:40
+#: src/pages/_08_nightlight.rs:19 src/pages/_08_nightlight.rs:40
 msgid "Night Light"
 msgstr ""
 
-#: src/pages/_07_nightlight.rs:26
+#: src/pages/_08_nightlight.rs:26
 msgid "Tint the display with a warm tone at night to reduce eyestrain."
 msgstr ""
 
-#: src/pages/_07_nightlight.rs:31
+#: src/pages/_08_nightlight.rs:31
 msgid "Night Light is not proven to help with difficulty falling sleep."
 msgstr ""
 
-#: src/pages/_08_theme.rs:71
+#: src/pages/_09_theme.rs:71
 msgid "Choose your theme"
 msgstr ""
 
-#: src/pages/_08_theme.rs:78
+#: src/pages/_09_theme.rs:78
 msgid "Make this system your own with a splash of colour.\n"
 "You can change this option later in settings."
 msgstr ""
 
-#: src/pages/_08_theme.rs:84
+#: src/pages/_09_theme.rs:84
 msgid "Some apps may not respect this preference."
 msgstr ""
 
-#: src/pages/_08_theme.rs:105
+#: src/pages/_09_theme.rs:105
 msgid "Light"
 msgstr ""
 
-#: src/pages/_08_theme.rs:120
+#: src/pages/_09_theme.rs:120
 msgid "Dark"
 msgstr ""
 
-#: src/pages/_09_browser.rs:64
+#: src/pages/_10_browser.rs:64
 msgid "Browser Selection"
 msgstr ""
 
-#: src/pages/_10_categories.rs:59
+#: src/pages/_11_categories.rs:59
 msgid "What Do You Use This Device For?"
 msgstr ""
 
-#: src/pages/_10_categories.rs:78
+#: src/pages/_11_categories.rs:78
 msgid "Confirm and Setup System"
 msgstr ""
 
-#: src/pages/_11_installing.rs:54
+#: src/pages/_12_installing.rs:54
 msgid "Installing your Apps"
 msgstr ""
 
-#: src/pages/_11_installing.rs:60
+#: src/pages/_12_installing.rs:60
 msgid "This won't take long!"
 msgstr ""
 
-#: src/pages/_11_installing.rs:68
+#: src/pages/_12_installing.rs:68
 msgid "Loading…"
 msgstr ""
 
-#: src/pages/_12_finish.rs:17
+#: src/pages/_13_finish.rs:17
 msgid "Your System is Ready"
 msgstr ""
 
-#: src/pages/_12_finish.rs:23
+#: src/pages/_13_finish.rs:23
 msgid "We hope you enjoy your fresh system!"
 msgstr ""
 
-#: src/pages/_12_finish.rs:31 src/pages/_13_error.rs:43
+#: src/pages/_13_finish.rs:31 src/pages/_14_error.rs:43
 msgid "Done"
 msgstr ""
 
-#: src/pages/_13_error.rs:22
+#: src/pages/_14_error.rs:22
 msgid "Error"
 msgstr ""
 
-#: src/pages/_13_error.rs:28
+#: src/pages/_14_error.rs:28
 msgid "We are sorry, but there is an unexpected problem."
 msgstr ""
 
diff --git a/po/th.po b/po/th.po
index 620996f..6d8fca1 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Taidan 0.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-30 10:46+0000\n"
+"POT-Creation-Date: 2025-01-02 17:03+0000\n"
 "PO-Revision-Date: 2024-12-31 13:21+0000\n"
 "Last-Translator: Cappy <cappy@cappuchino.xyz>\n"
 "Language-Team: Thai <https://weblate.fyralabs.com/projects/ultramarine-linux/"
@@ -19,35 +19,40 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.9.2\n"
 
-#: src/backend/steps.rs:98
+#: src/backend/steps.rs:103
 msgid "Creating User…"
 msgstr "กำลังสร้างบัญชี…"
 
-#: src/backend/steps.rs:99
+#: src/backend/steps.rs:104
 msgid "Setting Timezone…"
 msgstr "กำลังตั้งเขตเวลา…"
 
-#: src/backend/steps.rs:100
+#: src/backend/steps.rs:105
 msgid "Configuring Themes…"
 msgstr "กำลังตั้งค่าธีม…"
 
-#: src/backend/steps.rs:101
+#: src/backend/steps.rs:106
 msgid "Downloading System Update…"
 msgstr "กำลังดาวน์โหลดอัปเดตระบบ…"
 
-#: src/backend/steps.rs:102
+#: src/backend/steps.rs:107
 msgid "Installing System Update…"
 msgstr "กำลังติดตั้งอัปเดตระบบ…"
 
-#: src/backend/steps.rs:103
+#: src/backend/steps.rs:108
 msgid "Downloading User Programs…"
 msgstr "กำลังดาวน์โหลดโปรแกรม…"
 
-#: src/backend/steps.rs:104
+#: src/backend/steps.rs:109
 msgid "Installing User Programs…"
 msgstr "กำลังติดตั้งโปรแกรม…"
 
-#: src/pages/_00_welcome.rs:17 src/main.rs:71
+#: src/backend/steps.rs:110
+#, fuzzy
+msgid "Installing additional drivers…"
+msgstr "กำลังติดตั้งอัปเดตระบบ…"
+
+#: src/pages/_00_welcome.rs:17 src/main.rs:72
 msgid "Welcome to %s"
 msgstr "ยินดีต้อนรับสู่ %s"
 
@@ -63,22 +68,40 @@ msgstr "ข้ามการตั้งค่า"
 msgid "Let's Go"
 msgstr "ไปกันเถอะ"
 
-#: src/pages/_01_whoareyou.rs:83
+#: src/pages/_01_keyboard.rs:44
+msgid "Default"
+msgstr ""
+
+#: src/pages/_01_keyboard.rs:75
+msgid "Keyboard Layout"
+msgstr ""
+
+#: src/pages/_01_keyboard.rs:102
+msgid "Search keyboard layout…"
+msgstr ""
+
+#: src/pages/_01_keyboard.rs:131
+msgid "Search keyboard variant…"
+msgstr ""
+
+#: src/pages/_02_whoareyou.rs:83
 msgid "Who are You?"
 msgstr "คุณเป็นใคร?"
 
-#: src/pages/_01_whoareyou.rs:92
+#: src/pages/_02_whoareyou.rs:92
 msgid "Full Name"
 msgstr "ชื่อจริง"
 
-#: src/pages/_01_whoareyou.rs:100
+#: src/pages/_02_whoareyou.rs:100
 msgid "Username"
 msgstr "ชื่อผู้ใช้"
 
-#: src/pages/_01_whoareyou.rs:110
-msgid "Username\n"
+#: src/pages/_02_whoareyou.rs:110
+msgid ""
+"Username\n"
 "- must start with lowercase letters\n"
-"- must contain only alphanumericals, underscore (<tt>_</tt>) or dash (<tt>-</tt>)\n"
+"- must contain only alphanumericals, underscore (<tt>_</tt>) or dash (<tt>-</"
+"tt>)\n"
 "- may optionally end with a dollar sign (<tt>$</tt>)"
 msgstr ""
 "ชื่อผู้ใช้\n"
@@ -86,137 +109,141 @@ msgstr ""
 "- ต้องมีแค่เลขหรืออักษรอังกฤษ, อันเดอร์สกอร์ (<tt>_</tt>) หรือยัติภาค(<tt>-</tt>)\n"
 "- อาจจบด้วยเครื่องหมายดอลลาร์ (<tt>$</tt>)"
 
-#: src/pages/_02_password.rs:34
+#: src/pages/_03_password.rs:34
 msgid "Create a Password"
 msgstr "สร้างรหัสผ่าน"
 
-#: src/pages/_02_password.rs:44
+#: src/pages/_03_password.rs:44
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-#: src/pages/_02_password.rs:56
+#: src/pages/_03_password.rs:56
 msgid "Repeat Password"
 msgstr "ใส่รหัสผ่านอีกครั้ง"
 
-#: src/pages/_03_internet.rs:28
+#: src/pages/_04_internet.rs:28
 msgid "Let's Get You Online"
 msgstr "มาต่ออินเตอร์เน็ตกันเถอะ"
 
-#: src/pages/_03_internet.rs:34
+#: src/pages/_04_internet.rs:34
 msgid "Connect to the Internet to get the latest and greatest."
 msgstr ""
 
-#: src/pages/_03_internet.rs:42
+#: src/pages/_04_internet.rs:42
 msgid "I don't have Internet"
 msgstr "ฉันไม่มีอินเตอร์เน็ต"
 
-#: src/pages/_04_analytics.rs:20
+#: src/pages/_05_analytics.rs:20
 msgid "Analytics and Crash Reporting"
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:24
+#: src/pages/_06_crashreport.rs:24
 msgid "Crash Reporting"
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:30
+#: src/pages/_06_crashreport.rs:30
 msgid "Allow Fyra Labs to collect crash data to find bugs and assist you."
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:34
-msgid "All data collected is anonymous and end-to-end encrypted.\n"
+#: src/pages/_06_crashreport.rs:34
+msgid ""
+"All data collected is anonymous and end-to-end encrypted.\n"
 "You will be given a crash ID to help support find what went wrong."
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:38
+#: src/pages/_06_crashreport.rs:38
 msgid "Send Crash Data"
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:39
+#: src/pages/_06_crashreport.rs:39
 msgid "Press next to keep off"
 msgstr ""
 
-#: src/pages/_06_location.rs:26 src/pages/_06_location.rs:37
+#: src/pages/_07_location.rs:26 src/pages/_07_location.rs:37
 msgid "Location Services"
 msgstr ""
 
-#: src/pages/_06_location.rs:33
-msgid "Allow apps to request your approximate location with [Mozilla Location Services]"
+#: src/pages/_07_location.rs:33
+msgid ""
+"Allow apps to request your approximate location with [Mozilla Location "
+"Services]"
 msgstr ""
 
-#: src/pages/_07_nightlight.rs:19 src/pages/_07_nightlight.rs:40
+#: src/pages/_08_nightlight.rs:19 src/pages/_08_nightlight.rs:40
 msgid "Night Light"
 msgstr ""
 
-#: src/pages/_07_nightlight.rs:26
+#: src/pages/_08_nightlight.rs:26
 msgid "Tint the display with a warm tone at night to reduce eyestrain."
 msgstr "ปรับสีจอภาพด้วยโทนสีอุ่นในเวลากลางคืนเพื่อลดอาการปวดตา"
 
-#: src/pages/_07_nightlight.rs:31
+#: src/pages/_08_nightlight.rs:31
 msgid "Night Light is not proven to help with difficulty falling sleep."
 msgstr ""
 
-#: src/pages/_08_theme.rs:71
+#: src/pages/_09_theme.rs:71
 msgid "Choose your theme"
 msgstr ""
 
-#: src/pages/_08_theme.rs:78
-msgid "Make this system your own with a splash of colour.\n"
+#: src/pages/_09_theme.rs:78
+msgid ""
+"Make this system your own with a splash of colour.\n"
 "You can change this option later in settings."
 msgstr ""
 
-#: src/pages/_08_theme.rs:84
+#: src/pages/_09_theme.rs:84
 msgid "Some apps may not respect this preference."
 msgstr ""
 
-#: src/pages/_08_theme.rs:105
+#: src/pages/_09_theme.rs:105
 msgid "Light"
 msgstr "สว่าง"
 
-#: src/pages/_08_theme.rs:120
+#: src/pages/_09_theme.rs:120
 msgid "Dark"
 msgstr "มืด"
 
-#: src/pages/_09_browser.rs:64
+#: src/pages/_10_browser.rs:64
 msgid "Browser Selection"
 msgstr ""
 
-#: src/pages/_10_categories.rs:59
+#: src/pages/_11_categories.rs:59
 msgid "What Do You Use This Device For?"
 msgstr "คุณใช้เครื่องนี้ทำอะไร?"
 
-#: src/pages/_10_categories.rs:78
+#: src/pages/_11_categories.rs:78
 msgid "Confirm and Setup System"
 msgstr ""
 
-#: src/pages/_11_installing.rs:54
+#: src/pages/_12_installing.rs:54
 msgid "Installing your Apps"
 msgstr ""
 
-#: src/pages/_11_installing.rs:60
+#: src/pages/_12_installing.rs:60
 msgid "This won't take long!"
 msgstr ""
 
-#: src/pages/_11_installing.rs:68
+#: src/pages/_12_installing.rs:68
 msgid "Loading…"
 msgstr ""
 
-#: src/pages/_12_finish.rs:17
+#: src/pages/_13_finish.rs:17
 msgid "Your System is Ready"
 msgstr ""
 
-#: src/pages/_12_finish.rs:23
+#: src/pages/_13_finish.rs:23
 msgid "We hope you enjoy your fresh system!"
 msgstr ""
 
-#: src/pages/_12_finish.rs:31 src/pages/_13_error.rs:43
+#: src/pages/_13_finish.rs:31 src/pages/_14_error.rs:43
 msgid "Done"
 msgstr ""
 
-#: src/pages/_13_error.rs:22
+#: src/pages/_14_error.rs:22
 msgid "Error"
 msgstr ""
 
-#: src/pages/_13_error.rs:28
+#: src/pages/_14_error.rs:28
 msgid "We are sorry, but there is an unexpected problem."
 msgstr ""
 
diff --git a/po/vi.po b/po/vi.po
index 9bab439..04f39e0 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Taidan 0.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-30 10:46+0000\n"
+"POT-Creation-Date: 2025-01-02 17:03+0000\n"
 "PO-Revision-Date: 2024-12-31 12:26+0000\n"
 "Last-Translator: huuquockiet <huuquockietn@gmail.com>\n"
-"Language-Team: Vietnamese <https://weblate.fyralabs.com/projects/"
-"ultramarine-linux/taidan/vi/>\n"
+"Language-Team: Vietnamese <https://weblate.fyralabs.com/projects/ultramarine-"
+"linux/taidan/vi/>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,35 +19,40 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.9.2\n"
 
-#: src/backend/steps.rs:98
+#: src/backend/steps.rs:103
 msgid "Creating User…"
 msgstr "Đang tạo người dùng…"
 
-#: src/backend/steps.rs:99
+#: src/backend/steps.rs:104
 msgid "Setting Timezone…"
 msgstr "Đặt múi giờ…"
 
-#: src/backend/steps.rs:100
+#: src/backend/steps.rs:105
 msgid "Configuring Themes…"
 msgstr "Cấu hình chủ đề…"
 
-#: src/backend/steps.rs:101
+#: src/backend/steps.rs:106
 msgid "Downloading System Update…"
 msgstr "Đang tải xuống các cập nhật hệ thống…"
 
-#: src/backend/steps.rs:102
+#: src/backend/steps.rs:107
 msgid "Installing System Update…"
 msgstr "Đang cài đặt các cập nhật hệ thống…"
 
-#: src/backend/steps.rs:103
+#: src/backend/steps.rs:108
 msgid "Downloading User Programs…"
 msgstr "Đang tải xuống các ứng dụng…"
 
-#: src/backend/steps.rs:104
+#: src/backend/steps.rs:109
 msgid "Installing User Programs…"
 msgstr "Đang cài đặt các ứng dụng…"
 
-#: src/pages/_00_welcome.rs:17 src/main.rs:71
+#: src/backend/steps.rs:110
+#, fuzzy
+msgid "Installing additional drivers…"
+msgstr "Đang cài đặt các cập nhật hệ thống…"
+
+#: src/pages/_00_welcome.rs:17 src/main.rs:72
 msgid "Welcome to %s"
 msgstr "Chào mừng đến với %s"
 
@@ -63,22 +68,40 @@ msgstr "Bỏ qua bước cấu hình"
 msgid "Let's Go"
 msgstr "Bắt đầu nào"
 
-#: src/pages/_01_whoareyou.rs:83
+#: src/pages/_01_keyboard.rs:44
+msgid "Default"
+msgstr ""
+
+#: src/pages/_01_keyboard.rs:75
+msgid "Keyboard Layout"
+msgstr ""
+
+#: src/pages/_01_keyboard.rs:102
+msgid "Search keyboard layout…"
+msgstr ""
+
+#: src/pages/_01_keyboard.rs:131
+msgid "Search keyboard variant…"
+msgstr ""
+
+#: src/pages/_02_whoareyou.rs:83
 msgid "Who are You?"
 msgstr "Giới thiệu bạn là ai?"
 
-#: src/pages/_01_whoareyou.rs:92
+#: src/pages/_02_whoareyou.rs:92
 msgid "Full Name"
 msgstr "Tên đầy đủ"
 
-#: src/pages/_01_whoareyou.rs:100
+#: src/pages/_02_whoareyou.rs:100
 msgid "Username"
 msgstr "Tên người dùng"
 
-#: src/pages/_01_whoareyou.rs:110
-msgid "Username\n"
+#: src/pages/_02_whoareyou.rs:110
+msgid ""
+"Username\n"
 "- must start with lowercase letters\n"
-"- must contain only alphanumericals, underscore (<tt>_</tt>) or dash (<tt>-</tt>)\n"
+"- must contain only alphanumericals, underscore (<tt>_</tt>) or dash (<tt>-</"
+"tt>)\n"
 "- may optionally end with a dollar sign (<tt>$</tt>)"
 msgstr ""
 "Tên người dùng\n"
@@ -87,139 +110,143 @@ msgstr ""
 "ngang (<tt>-</tt>)\n"
 "- có thể kết thúc bằng dấu đô la (<tt>$</tt>)"
 
-#: src/pages/_02_password.rs:34
+#: src/pages/_03_password.rs:34
 msgid "Create a Password"
 msgstr "Hãy đặt mật khẩu"
 
-#: src/pages/_02_password.rs:44
+#: src/pages/_03_password.rs:44
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: src/pages/_02_password.rs:56
+#: src/pages/_03_password.rs:56
 msgid "Repeat Password"
 msgstr "Nhập lại mật khẩu"
 
-#: src/pages/_03_internet.rs:28
+#: src/pages/_04_internet.rs:28
 msgid "Let's Get You Online"
 msgstr "Hãy đưa bạn lên mạng"
 
-#: src/pages/_03_internet.rs:34
+#: src/pages/_04_internet.rs:34
 msgid "Connect to the Internet to get the latest and greatest."
 msgstr "Kết nối mạng để có được điều tuyệt nhất và mới nhất."
 
-#: src/pages/_03_internet.rs:42
+#: src/pages/_04_internet.rs:42
 msgid "I don't have Internet"
 msgstr "Tôi không có mạng"
 
-#: src/pages/_04_analytics.rs:20
+#: src/pages/_05_analytics.rs:20
 msgid "Analytics and Crash Reporting"
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:24
+#: src/pages/_06_crashreport.rs:24
 msgid "Crash Reporting"
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:30
+#: src/pages/_06_crashreport.rs:30
 msgid "Allow Fyra Labs to collect crash data to find bugs and assist you."
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:34
-msgid "All data collected is anonymous and end-to-end encrypted.\n"
+#: src/pages/_06_crashreport.rs:34
+msgid ""
+"All data collected is anonymous and end-to-end encrypted.\n"
 "You will be given a crash ID to help support find what went wrong."
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:38
+#: src/pages/_06_crashreport.rs:38
 msgid "Send Crash Data"
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:39
+#: src/pages/_06_crashreport.rs:39
 msgid "Press next to keep off"
 msgstr ""
 
-#: src/pages/_06_location.rs:26 src/pages/_06_location.rs:37
+#: src/pages/_07_location.rs:26 src/pages/_07_location.rs:37
 msgid "Location Services"
 msgstr ""
 
-#: src/pages/_06_location.rs:33
-msgid "Allow apps to request your approximate location with [Mozilla Location Services]"
+#: src/pages/_07_location.rs:33
+msgid ""
+"Allow apps to request your approximate location with [Mozilla Location "
+"Services]"
 msgstr ""
 
-#: src/pages/_07_nightlight.rs:19 src/pages/_07_nightlight.rs:40
+#: src/pages/_08_nightlight.rs:19 src/pages/_08_nightlight.rs:40
 msgid "Night Light"
 msgstr "Ánh sáng đêm"
 
-#: src/pages/_07_nightlight.rs:26
+#: src/pages/_08_nightlight.rs:26
 msgid "Tint the display with a warm tone at night to reduce eyestrain."
 msgstr "Phủ màn hình bằng tông màu ấm vào ban đêm để giảm mỏi mắt."
 
-#: src/pages/_07_nightlight.rs:31
+#: src/pages/_08_nightlight.rs:31
 msgid "Night Light is not proven to help with difficulty falling sleep."
 msgstr "Ánh sáng đêm không được chứng minh là hỗ trợ việc mất ngủ."
 
-#: src/pages/_08_theme.rs:71
+#: src/pages/_09_theme.rs:71
 msgid "Choose your theme"
 msgstr "Chọn chủ đề bạn muốn"
 
-#: src/pages/_08_theme.rs:78
-msgid "Make this system your own with a splash of colour.\n"
+#: src/pages/_09_theme.rs:78
+msgid ""
+"Make this system your own with a splash of colour.\n"
 "You can change this option later in settings."
 msgstr ""
 "Biến hệ thống này thành của riêng bạn với một chút màu sắc.\n"
 "Bạn có thể thay đổi tùy chọn này sau trong phần cài đặt."
 
-#: src/pages/_08_theme.rs:84
+#: src/pages/_09_theme.rs:84
 msgid "Some apps may not respect this preference."
 msgstr "Một số ứng dụng sẽ không tuân theo tùy chọn này."
 
-#: src/pages/_08_theme.rs:105
+#: src/pages/_09_theme.rs:105
 msgid "Light"
 msgstr "Sáng"
 
-#: src/pages/_08_theme.rs:120
+#: src/pages/_09_theme.rs:120
 msgid "Dark"
 msgstr "Tối"
 
-#: src/pages/_09_browser.rs:64
+#: src/pages/_10_browser.rs:64
 msgid "Browser Selection"
 msgstr "Chọn trình duyệt"
 
-#: src/pages/_10_categories.rs:59
+#: src/pages/_11_categories.rs:59
 msgid "What Do You Use This Device For?"
 msgstr "Bạn sẽ dùng thiết bị này như thế nào?"
 
-#: src/pages/_10_categories.rs:78
+#: src/pages/_11_categories.rs:78
 msgid "Confirm and Setup System"
 msgstr "Xác nhận và cài đặt hệ thống"
 
-#: src/pages/_11_installing.rs:54
+#: src/pages/_12_installing.rs:54
 msgid "Installing your Apps"
 msgstr "Dang cài đặt các ứng dụng"
 
-#: src/pages/_11_installing.rs:60
+#: src/pages/_12_installing.rs:60
 msgid "This won't take long!"
 msgstr "Sẽ không lâu lắm đâu!"
 
-#: src/pages/_11_installing.rs:68
+#: src/pages/_12_installing.rs:68
 msgid "Loading…"
 msgstr "Đang tải…"
 
-#: src/pages/_12_finish.rs:17
+#: src/pages/_13_finish.rs:17
 msgid "Your System is Ready"
 msgstr "Hệ thống của bạn đã sẵn sàng"
 
-#: src/pages/_12_finish.rs:23
+#: src/pages/_13_finish.rs:23
 msgid "We hope you enjoy your fresh system!"
 msgstr "Tận hưởng hệ thống mới của bạn!"
 
-#: src/pages/_12_finish.rs:31 src/pages/_13_error.rs:43
+#: src/pages/_13_finish.rs:31 src/pages/_14_error.rs:43
 msgid "Done"
 msgstr "Xong"
 
-#: src/pages/_13_error.rs:22
+#: src/pages/_14_error.rs:22
 msgid "Error"
 msgstr "Lỗi"
 
-#: src/pages/_13_error.rs:28
+#: src/pages/_14_error.rs:28
 msgid "We are sorry, but there is an unexpected problem."
 msgstr "Rất tiếc, đã có lỗi xảy ra."
 
diff --git a/po/zh_Hans.po b/po/zh_Hans.po
index 71ed368..6dfd350 100644
--- a/po/zh_Hans.po
+++ b/po/zh_Hans.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Taidan 0.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-30 10:46+0000\n"
+"POT-Creation-Date: 2025-01-02 17:03+0000\n"
 "PO-Revision-Date: 2024-12-31 12:26+0000\n"
 "Last-Translator: sadlerm4 <sad_lerm@hotmail.com>\n"
 "Language-Team: Chinese (Simplified Han script) <https://weblate.fyralabs.com/"
@@ -19,35 +19,40 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.9.2\n"
 
-#: src/backend/steps.rs:98
+#: src/backend/steps.rs:103
 msgid "Creating User…"
 msgstr "创建用户中…"
 
-#: src/backend/steps.rs:99
+#: src/backend/steps.rs:104
 msgid "Setting Timezone…"
 msgstr "设定时区中…"
 
-#: src/backend/steps.rs:100
+#: src/backend/steps.rs:105
 msgid "Configuring Themes…"
 msgstr "设定主题中…"
 
-#: src/backend/steps.rs:101
+#: src/backend/steps.rs:106
 msgid "Downloading System Update…"
 msgstr "下载系统更新中…"
 
-#: src/backend/steps.rs:102
+#: src/backend/steps.rs:107
 msgid "Installing System Update…"
 msgstr "安装系统更新中…"
 
-#: src/backend/steps.rs:103
+#: src/backend/steps.rs:108
 msgid "Downloading User Programs…"
 msgstr "下载用户应用中…"
 
-#: src/backend/steps.rs:104
+#: src/backend/steps.rs:109
 msgid "Installing User Programs…"
 msgstr "安装用户应用中…"
 
-#: src/pages/_00_welcome.rs:17 src/main.rs:71
+#: src/backend/steps.rs:110
+#, fuzzy
+msgid "Installing additional drivers…"
+msgstr "安装系统更新中…"
+
+#: src/pages/_00_welcome.rs:17 src/main.rs:72
 msgid "Welcome to %s"
 msgstr "欢迎使用 %s"
 
@@ -63,22 +68,40 @@ msgstr "跳过系统配置"
 msgid "Let's Go"
 msgstr "开始"
 
-#: src/pages/_01_whoareyou.rs:83
+#: src/pages/_01_keyboard.rs:44
+msgid "Default"
+msgstr ""
+
+#: src/pages/_01_keyboard.rs:75
+msgid "Keyboard Layout"
+msgstr ""
+
+#: src/pages/_01_keyboard.rs:102
+msgid "Search keyboard layout…"
+msgstr ""
+
+#: src/pages/_01_keyboard.rs:131
+msgid "Search keyboard variant…"
+msgstr ""
+
+#: src/pages/_02_whoareyou.rs:83
 msgid "Who are You?"
 msgstr "创建新用户帐号"
 
-#: src/pages/_01_whoareyou.rs:92
+#: src/pages/_02_whoareyou.rs:92
 msgid "Full Name"
 msgstr "名字"
 
-#: src/pages/_01_whoareyou.rs:100
+#: src/pages/_02_whoareyou.rs:100
 msgid "Username"
 msgstr "用户名称"
 
-#: src/pages/_01_whoareyou.rs:110
-msgid "Username\n"
+#: src/pages/_02_whoareyou.rs:110
+msgid ""
+"Username\n"
 "- must start with lowercase letters\n"
-"- must contain only alphanumericals, underscore (<tt>_</tt>) or dash (<tt>-</tt>)\n"
+"- must contain only alphanumericals, underscore (<tt>_</tt>) or dash (<tt>-</"
+"tt>)\n"
 "- may optionally end with a dollar sign (<tt>$</tt>)"
 msgstr ""
 "用戶名称\n"
@@ -86,139 +109,143 @@ msgstr ""
 "- 必须只包含数字、英文字母、底线(<tt>_</tt>)或连接号(<tt>-</tt>)\n"
 "- 最尾可以为<tt>$</tt>"
 
-#: src/pages/_02_password.rs:34
+#: src/pages/_03_password.rs:34
 msgid "Create a Password"
 msgstr "创建密码"
 
-#: src/pages/_02_password.rs:44
+#: src/pages/_03_password.rs:44
 msgid "Password"
 msgstr "密码"
 
-#: src/pages/_02_password.rs:56
+#: src/pages/_03_password.rs:56
 msgid "Repeat Password"
 msgstr "重复密码"
 
-#: src/pages/_03_internet.rs:28
+#: src/pages/_04_internet.rs:28
 msgid "Let's Get You Online"
 msgstr ""
 
-#: src/pages/_03_internet.rs:34
+#: src/pages/_04_internet.rs:34
 msgid "Connect to the Internet to get the latest and greatest."
 msgstr ""
 
-#: src/pages/_03_internet.rs:42
+#: src/pages/_04_internet.rs:42
 msgid "I don't have Internet"
 msgstr ""
 
-#: src/pages/_04_analytics.rs:20
+#: src/pages/_05_analytics.rs:20
 msgid "Analytics and Crash Reporting"
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:24
+#: src/pages/_06_crashreport.rs:24
 msgid "Crash Reporting"
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:30
+#: src/pages/_06_crashreport.rs:30
 msgid "Allow Fyra Labs to collect crash data to find bugs and assist you."
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:34
-msgid "All data collected is anonymous and end-to-end encrypted.\n"
+#: src/pages/_06_crashreport.rs:34
+msgid ""
+"All data collected is anonymous and end-to-end encrypted.\n"
 "You will be given a crash ID to help support find what went wrong."
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:38
+#: src/pages/_06_crashreport.rs:38
 msgid "Send Crash Data"
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:39
+#: src/pages/_06_crashreport.rs:39
 msgid "Press next to keep off"
 msgstr ""
 
-#: src/pages/_06_location.rs:26 src/pages/_06_location.rs:37
+#: src/pages/_07_location.rs:26 src/pages/_07_location.rs:37
 msgid "Location Services"
 msgstr ""
 
-#: src/pages/_06_location.rs:33
-msgid "Allow apps to request your approximate location with [Mozilla Location Services]"
+#: src/pages/_07_location.rs:33
+msgid ""
+"Allow apps to request your approximate location with [Mozilla Location "
+"Services]"
 msgstr ""
 
-#: src/pages/_07_nightlight.rs:19 src/pages/_07_nightlight.rs:40
+#: src/pages/_08_nightlight.rs:19 src/pages/_08_nightlight.rs:40
 msgid "Night Light"
 msgstr "护眼模式"
 
-#: src/pages/_07_nightlight.rs:26
+#: src/pages/_08_nightlight.rs:26
 msgid "Tint the display with a warm tone at night to reduce eyestrain."
 msgstr ""
 
-#: src/pages/_07_nightlight.rs:31
+#: src/pages/_08_nightlight.rs:31
 msgid "Night Light is not proven to help with difficulty falling sleep."
 msgstr "护眼模式並未证实能改善睡眠。"
 
-#: src/pages/_08_theme.rs:71
+#: src/pages/_09_theme.rs:71
 msgid "Choose your theme"
 msgstr "选择主题"
 
-#: src/pages/_08_theme.rs:78
-msgid "Make this system your own with a splash of colour.\n"
+#: src/pages/_09_theme.rs:78
+msgid ""
+"Make this system your own with a splash of colour.\n"
 "You can change this option later in settings."
 msgstr ""
 "选择主题色彩。\n"
 "您可以随时在设定更改此选项。"
 
-#: src/pages/_08_theme.rs:84
+#: src/pages/_09_theme.rs:84
 msgid "Some apps may not respect this preference."
 msgstr "部分应用并不会对此设定有所反应。"
 
-#: src/pages/_08_theme.rs:105
+#: src/pages/_09_theme.rs:105
 msgid "Light"
 msgstr "浅色"
 
-#: src/pages/_08_theme.rs:120
+#: src/pages/_09_theme.rs:120
 msgid "Dark"
 msgstr "深色"
 
-#: src/pages/_09_browser.rs:64
+#: src/pages/_10_browser.rs:64
 msgid "Browser Selection"
 msgstr "选择浏览器"
 
-#: src/pages/_10_categories.rs:59
+#: src/pages/_11_categories.rs:59
 msgid "What Do You Use This Device For?"
 msgstr "您会如何使用此设备？"
 
-#: src/pages/_10_categories.rs:78
+#: src/pages/_11_categories.rs:78
 msgid "Confirm and Setup System"
 msgstr "确定并装配系统"
 
-#: src/pages/_11_installing.rs:54
+#: src/pages/_12_installing.rs:54
 msgid "Installing your Apps"
 msgstr "正在安装您的应用"
 
-#: src/pages/_11_installing.rs:60
+#: src/pages/_12_installing.rs:60
 msgid "This won't take long!"
 msgstr "请稍等一下"
 
-#: src/pages/_11_installing.rs:68
+#: src/pages/_12_installing.rs:68
 msgid "Loading…"
 msgstr "加载中…"
 
-#: src/pages/_12_finish.rs:17
+#: src/pages/_13_finish.rs:17
 msgid "Your System is Ready"
 msgstr ""
 
-#: src/pages/_12_finish.rs:23
+#: src/pages/_13_finish.rs:23
 msgid "We hope you enjoy your fresh system!"
 msgstr ""
 
-#: src/pages/_12_finish.rs:31 src/pages/_13_error.rs:43
+#: src/pages/_13_finish.rs:31 src/pages/_14_error.rs:43
 msgid "Done"
 msgstr ""
 
-#: src/pages/_13_error.rs:22
+#: src/pages/_14_error.rs:22
 msgid "Error"
 msgstr ""
 
-#: src/pages/_13_error.rs:28
+#: src/pages/_14_error.rs:28
 msgid "We are sorry, but there is an unexpected problem."
 msgstr ""
 
diff --git a/po/zh_Hant.po b/po/zh_Hant.po
index cadfb9a..b8c9a88 100644
--- a/po/zh_Hant.po
+++ b/po/zh_Hant.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Taidan 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-30 10:46+0000\n"
+"POT-Creation-Date: 2025-01-02 17:03+0000\n"
 "PO-Revision-Date: 2024-12-31 12:26+0000\n"
 "Last-Translator: sadlerm4 <sad_lerm@hotmail.com>\n"
-"Language-Team: Chinese (Traditional Han script) <https://"
-"weblate.fyralabs.com/projects/ultramarine-linux/taidan/zh_Hant/>\n"
+"Language-Team: Chinese (Traditional Han script) <https://weblate.fyralabs."
+"com/projects/ultramarine-linux/taidan/zh_Hant/>\n"
 "Language: zh_Hant\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,35 +19,40 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 5.9.2\n"
 
-#: src/backend/steps.rs:98
+#: src/backend/steps.rs:103
 msgid "Creating User…"
 msgstr "製作用戶中…"
 
-#: src/backend/steps.rs:99
+#: src/backend/steps.rs:104
 msgid "Setting Timezone…"
 msgstr "設定時區中…"
 
-#: src/backend/steps.rs:100
+#: src/backend/steps.rs:105
 msgid "Configuring Themes…"
 msgstr "設定主題中…"
 
-#: src/backend/steps.rs:101
+#: src/backend/steps.rs:106
 msgid "Downloading System Update…"
 msgstr "下載系統更新中…"
 
-#: src/backend/steps.rs:102
+#: src/backend/steps.rs:107
 msgid "Installing System Update…"
 msgstr "安裝系統更新中…"
 
-#: src/backend/steps.rs:103
+#: src/backend/steps.rs:108
 msgid "Downloading User Programs…"
 msgstr "下載用户應用程式中…"
 
-#: src/backend/steps.rs:104
+#: src/backend/steps.rs:109
 msgid "Installing User Programs…"
 msgstr "安裝用户應用程式中…"
 
-#: src/pages/_00_welcome.rs:17 src/main.rs:71
+#: src/backend/steps.rs:110
+#, fuzzy
+msgid "Installing additional drivers…"
+msgstr "安裝系統更新中…"
+
+#: src/pages/_00_welcome.rs:17 src/main.rs:72
 msgid "Welcome to %s"
 msgstr "歡迎使用 %s"
 
@@ -63,19 +68,35 @@ msgstr "略過系統配置"
 msgid "Let's Go"
 msgstr "開始"
 
-#: src/pages/_01_whoareyou.rs:83
+#: src/pages/_01_keyboard.rs:44
+msgid "Default"
+msgstr ""
+
+#: src/pages/_01_keyboard.rs:75
+msgid "Keyboard Layout"
+msgstr ""
+
+#: src/pages/_01_keyboard.rs:102
+msgid "Search keyboard layout…"
+msgstr ""
+
+#: src/pages/_01_keyboard.rs:131
+msgid "Search keyboard variant…"
+msgstr ""
+
+#: src/pages/_02_whoareyou.rs:83
 msgid "Who are You?"
 msgstr "創建新用戶帳號"
 
-#: src/pages/_01_whoareyou.rs:92
+#: src/pages/_02_whoareyou.rs:92
 msgid "Full Name"
 msgstr "名字"
 
-#: src/pages/_01_whoareyou.rs:100
+#: src/pages/_02_whoareyou.rs:100
 msgid "Username"
 msgstr "用戶名稱"
 
-#: src/pages/_01_whoareyou.rs:110
+#: src/pages/_02_whoareyou.rs:110
 msgid ""
 "Username\n"
 "- must start with lowercase letters\n"
@@ -88,83 +109,83 @@ msgstr ""
 "- 必須只以數字、英文字母、底線(<tt>_</tt>)或連接號(<tt>-</tt>)組成\n"
 "- 最尾可以為<tt>$</tt>"
 
-#: src/pages/_02_password.rs:34
+#: src/pages/_03_password.rs:34
 msgid "Create a Password"
 msgstr "創建密碼"
 
-#: src/pages/_02_password.rs:44
+#: src/pages/_03_password.rs:44
 msgid "Password"
 msgstr "密碼"
 
-#: src/pages/_02_password.rs:56
+#: src/pages/_03_password.rs:56
 msgid "Repeat Password"
 msgstr "重覆密碼"
 
-#: src/pages/_03_internet.rs:28
+#: src/pages/_04_internet.rs:28
 msgid "Let's Get You Online"
 msgstr ""
 
-#: src/pages/_03_internet.rs:34
+#: src/pages/_04_internet.rs:34
 msgid "Connect to the Internet to get the latest and greatest."
 msgstr "連接互聯網，取得最新、最好的。"
 
-#: src/pages/_03_internet.rs:42
+#: src/pages/_04_internet.rs:42
 msgid "I don't have Internet"
 msgstr "我不能連上網"
 
-#: src/pages/_04_analytics.rs:20
+#: src/pages/_05_analytics.rs:20
 msgid "Analytics and Crash Reporting"
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:24
+#: src/pages/_06_crashreport.rs:24
 msgid "Crash Reporting"
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:30
+#: src/pages/_06_crashreport.rs:30
 msgid "Allow Fyra Labs to collect crash data to find bugs and assist you."
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:34
+#: src/pages/_06_crashreport.rs:34
 msgid ""
 "All data collected is anonymous and end-to-end encrypted.\n"
 "You will be given a crash ID to help support find what went wrong."
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:38
+#: src/pages/_06_crashreport.rs:38
 msgid "Send Crash Data"
 msgstr ""
 
-#: src/pages/_05_crashreport.rs:39
+#: src/pages/_06_crashreport.rs:39
 msgid "Press next to keep off"
 msgstr ""
 
-#: src/pages/_06_location.rs:26 src/pages/_06_location.rs:37
+#: src/pages/_07_location.rs:26 src/pages/_07_location.rs:37
 msgid "Location Services"
 msgstr ""
 
-#: src/pages/_06_location.rs:33
+#: src/pages/_07_location.rs:33
 msgid ""
 "Allow apps to request your approximate location with [Mozilla Location "
 "Services]"
 msgstr ""
 
-#: src/pages/_07_nightlight.rs:19 src/pages/_07_nightlight.rs:40
+#: src/pages/_08_nightlight.rs:19 src/pages/_08_nightlight.rs:40
 msgid "Night Light"
 msgstr "護眼模式"
 
-#: src/pages/_07_nightlight.rs:26
+#: src/pages/_08_nightlight.rs:26
 msgid "Tint the display with a warm tone at night to reduce eyestrain."
 msgstr "夜間時調教至較暖和的色溫有助減少對雙眼的傷害。"
 
-#: src/pages/_07_nightlight.rs:31
+#: src/pages/_08_nightlight.rs:31
 msgid "Night Light is not proven to help with difficulty falling sleep."
 msgstr "護眼模式並未證實能改善睡眠。"
 
-#: src/pages/_08_theme.rs:71
+#: src/pages/_09_theme.rs:71
 msgid "Choose your theme"
 msgstr "選擇主題"
 
-#: src/pages/_08_theme.rs:78
+#: src/pages/_09_theme.rs:78
 msgid ""
 "Make this system your own with a splash of colour.\n"
 "You can change this option later in settings."
@@ -172,59 +193,59 @@ msgstr ""
 "選擇主題色彩。\n"
 "您可以隨時在設定更改此選項。"
 
-#: src/pages/_08_theme.rs:84
+#: src/pages/_09_theme.rs:84
 msgid "Some apps may not respect this preference."
 msgstr "部分程式並不會對此設定有所反應。"
 
-#: src/pages/_08_theme.rs:105
+#: src/pages/_09_theme.rs:105
 msgid "Light"
 msgstr "淺色"
 
-#: src/pages/_08_theme.rs:120
+#: src/pages/_09_theme.rs:120
 msgid "Dark"
 msgstr "深色"
 
-#: src/pages/_09_browser.rs:64
+#: src/pages/_10_browser.rs:64
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
-#: src/pages/_10_categories.rs:59
+#: src/pages/_11_categories.rs:59
 msgid "What Do You Use This Device For?"
 msgstr "您會如何使用此設備？"
 
-#: src/pages/_10_categories.rs:78
+#: src/pages/_11_categories.rs:78
 msgid "Confirm and Setup System"
 msgstr "確定並裝配系統"
 
-#: src/pages/_11_installing.rs:54
+#: src/pages/_12_installing.rs:54
 msgid "Installing your Apps"
 msgstr "正在安裝您的應用程式"
 
-#: src/pages/_11_installing.rs:60
+#: src/pages/_12_installing.rs:60
 msgid "This won't take long!"
 msgstr ""
 
-#: src/pages/_11_installing.rs:68
+#: src/pages/_12_installing.rs:68
 msgid "Loading…"
 msgstr ""
 
-#: src/pages/_12_finish.rs:17
+#: src/pages/_13_finish.rs:17
 msgid "Your System is Ready"
 msgstr ""
 
-#: src/pages/_12_finish.rs:23
+#: src/pages/_13_finish.rs:23
 msgid "We hope you enjoy your fresh system!"
 msgstr ""
 
-#: src/pages/_12_finish.rs:31 src/pages/_13_error.rs:43
+#: src/pages/_13_finish.rs:31 src/pages/_14_error.rs:43
 msgid "Done"
 msgstr ""
 
-#: src/pages/_13_error.rs:22
+#: src/pages/_14_error.rs:22
 msgid "Error"
 msgstr ""
 
-#: src/pages/_13_error.rs:28
+#: src/pages/_14_error.rs:28
 msgid "We are sorry, but there is an unexpected problem."
 msgstr ""
 
diff --git a/scripts/updpo.sh b/scripts/updpo.sh
new file mode 100755
index 0000000..e1c4702
--- /dev/null
+++ b/scripts/updpo.sh
@@ -0,0 +1,7 @@
+xtr src/main.rs -o po/taidan.pot --package-name Taidan --package-version `sed -nE 's@^version = "(.+)"@\1@ p' Cargo.toml`
+for file in po/*.po; do
+    echo " ==> Merging $file"
+    msgmerge -vU $file po/taidan.pot
+    echo
+done
+rm po/*.po~