update panel config to current default

remove accidentially added desktop switch
update panel for the current default config
2025-03-23 01:19:06 +00:00 · 2025-03-07 18:32:18 +00:00 · 2025-03-06 01:02:30 +00:00 · 2025-03-05 00:13:08 -06:00 · 2025-03-04 23:57:24 -06:00 · 2024-10-14 13:06:21 -05:00
89 changed files with 6091 additions and 5083 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.16)

-project(lubuntu-installer-prompt VERSION 1.1.2 LANGUAGES CXX)
+project(lubuntu-installer-prompt VERSION 2.0.0 LANGUAGES CXX)

 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTOMOC ON)
@ -12,9 +12,8 @@ set(CMAKE_INSTALL_PREFIX "/usr")

 find_package(ECM REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
-find_package(QT NAMES Qt5 REQUIRED COMPONENTS Core Widgets Network LinguistTools)
-find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Widgets Network LinguistTools)
-find_package(KF5 REQUIRED COMPONENTS NetworkManagerQt WidgetsAddons)
+find_package(Qt6 REQUIRED COMPONENTS Core Widgets Network LinguistTools)
+find_package(KF6 REQUIRED COMPONENTS NetworkManagerQt)

 file(GLOB TS_FILES "src/translations/lubuntu-installer-prompt_*.ts")

@ -26,13 +25,25 @@ set(PROJECT_SOURCES
    src/backgroundscreen.h
    src/backgroundscreen.cpp
    src/resource.qrc
+    src/wifipassworddialog.h
+    src/wifipassworddialog.cpp
+    src/wifipassworddialog.ui
+    src/languagechangedialog.h
+    src/languagechangedialog.cpp
+    src/languagechangedialog.ui
+    src/warningdialog.h
+    src/warningdialog.cpp
+    src/warningdialog.ui
+    src/connectionprogressdialog.h
+    src/connectionprogressdialog.cpp
+    src/connectionprogressdialog.ui
 )

 set(TRANSLATION_RESOURCES "src/translations.qrc")

 configure_file(${TRANSLATION_RESOURCES} translations.qrc COPYONLY)
-qt5_add_translation(QM_FILES ${TS_FILES})
-qt5_add_resources(QM_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc)
+qt_add_translation(QM_FILES ${TS_FILES})
+qt_add_resources(QM_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc)

 add_custom_target(translations ALL DEPENDS ${QM_FILES})

@ -43,7 +54,7 @@ add_executable(lubuntu-installer-prompt

 add_dependencies(lubuntu-installer-prompt translations)

-target_link_libraries(lubuntu-installer-prompt PRIVATE Qt${QT_VERSION_MAJOR}::Widgets Qt5::Network KF5::NetworkManagerQt KF5::WidgetsAddons)
+target_link_libraries(lubuntu-installer-prompt PRIVATE Qt6::Widgets Qt6::Network KF6::NetworkManagerQt)

 install(TARGETS lubuntu-installer-prompt
    BUNDLE DESTINATION .
@ -51,9 +62,10 @@ install(TARGETS lubuntu-installer-prompt
    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
 install(PROGRAMS "scripts/change-system-language" DESTINATION libexec)
-install(PROGRAMS "scripts/lubuntu-installer" DESTINATION libexec)
 install(PROGRAMS "scripts/start-lubuntu-live-env" DESTINATION libexec)
 install(FILES "lubuntu-live-environment.desktop" DESTINATION share/xsessions)
+install(FILES "rc.xml" DESTINATION /etc/xdg/xdg-lubuntu-live-environment/openbox)
+install(FILES "panel.conf" DESTINATION /etc/xdg/xdg-lubuntu-live-environment/lxqt)

 if(QT_VERSION_MAJOR EQUAL 6)
    qt_finalize_executable(lubuntu-installer-prompt)
--- a/README.md
+++ b/README.md
@ -2,9 +2,13 @@

 This project is in beta. It presents a "Try or Install Lubuntu" screen. Eventually we want to extend this to support multiple flavors.

-Releases are signed with Simon Quigley's GPG key: 5C7ABEA20F8630459CC8C8B5E27F2CF8458C2FA4
+Art assets are copyrighted as follows:

-All art assets are (C) 2010-2018 Rafael Laguna <rafaellaguna@gmail.com> (GPL-2.0+). Otherwise, the source is (C) 2022-2023 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>.
+* img/arrow-down.svg: Copyright (C) 2014 Uri Herrera <uri_herrera@nitrux.in> and others. LGPL-3+ license. Taken from the Breeze icon theme.
+* img/background.png: Copyright (C) 2024 Aaron Rainbolt <arraybolt3@ubuntu.com> and MediaMom Ministries. CC-BY-SA-4.0 license.
+* img/lubuntu-logo.png, img/installer.png, img/emblem.png: Copyright (C) 2024 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>. Unknown license. Adapted from the official Lubuntu artwork.
+
+All other files are licensed under the GNU General Public License version 3. Copyright (C) 2022-2024 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>.

 ## Architecture

@ -17,10 +21,10 @@ This section serves to explain how lubuntu-installer-prompt's various components
 5. start-lubuntu-live-env starts /bin/lubuntu-installer-prompt but does not background it.
 6. The installer prompt appears.
 7. The user clicks "Install Lubuntu" or "Try Lubuntu".
-8. If "Install Lubuntu" is clicked, the installer prompt executes /usr/libexec/lubuntu-installer.sh, which then executes Calamares. The installer prompt then removes the buttons from the screen.
+8. If "Install Lubuntu" is clicked, the installer prompt executes `sudo -E calamares -D8`. The installer prompt then deactivates the buttons.
 9. The installer window appears on the user's screen.
 10. If Calamares closes, the installer prompt detects this and exits.
-11. When the installer prompt exits, start-lubuntu-live-env kills Openbox, then runs startlxqt.
+11. When the installer prompt exits, start-lubuntu-live-env kills Openbox and runs startlxqt.
 12. If "Try Lubuntu" is clicked, steps 10 and 11 are executed immediately.

 ## Translations
@ -31,7 +35,7 @@ To add a new language to be translated:

 * Open the `gen_ts.sh` script and add the locale code for the new language to the `langList` array.
 * Run the script after doing this - a new template .ts file will be generated under `src/translations/`.
-* Next, add the new template file to the `TS_FILES` list in `CMakeLists.txt` - it will be named `src/translations/lubuntu-installer-prompt-locale_CODE.ts`, where `locale_CODE` is the locale code of the added language.
+* Next, add the new template file to the `TS_FILES` list in `CMakeLists.txt` - it will be named `src/translations/lubuntu-installer-prompt_locale_CODE.ts`, where `locale_CODE` is the locale code of the added language.
 * Finally, add a line in the src/translations.qrc resource file to include the new translation file. The line should look like `<file alias="locale_CODE">lubuntu-installer-prompt_locale_CODE.qm</file>`, where `locale_CODE` is the locale code of the added language. This line should go inside the `<qresource>` tag.

 For instance, if I were to add Chinese to the list of languages that could be translated into, I would do this:
--- a/debian/changelog
+++ b/debian/changelog
@ -0,0 +1,114 @@
+lubuntu-installer-prompt (25.04.4) plucky; urgency=medium
+
+  * Update panel for the current default configuration. 
+
+ -- Walter Lapchynski <wxl@ubuntu.com>  Sun, 23 Mar 2025 01:18:05 +0000
+
+lubuntu-installer-prompt (25.04.3) plucky; urgency=medium
+
+  * Removing desktop switch accidentially added to panel.
+
+ -- Walter Lapchynski <wxl@ubuntu.com>  Fri, 07 Mar 2025 18:29:48 +0000
+
+lubuntu-installer-prompt (25.04.2) plucky; urgency=medium
+
+  * Update panel for the current default configuration. 
+
+ -- Walter Lapchynski <wxl@ubuntu.com>  Thu, 06 Mar 2025 01:01:59 +0000
+
+lubuntu-installer-prompt (25.04.1) plucky; urgency=medium
+
+  * Update background image.
+  * Install main executable to /usr/bin rather than /bin.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Tue, 04 Mar 2025 23:57:40 -0600
+
+lubuntu-installer-prompt (24.10.1) oracular; urgency=medium
+
+  * Update to use Qt 6.
+  * Fix the weird horizontal line at the bottom of the screen. (LP: #2081229)
+  * Update background image. (LP: #2081230)
+  * Use Kvantum theme by default to match the OS default. (LP: #2081233)
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Tue, 01 Oct 2024 09:30:57 -0500
+
+lubuntu-installer-prompt (24.04.6) noble; urgency=medium
+
+  * Launch Calamares in OEM mode when "oem-config/enable=true" is passed as a
+    boot parameter (LP: #2063291).
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 24 Apr 2024 00:20:14 -0500
+
+lubuntu-installer-prompt (24.04.5) noble; urgency=medium
+
+  * Reduce desktops to 1 to prevent accidental switching. (LP: #1469362) 
+  * Remove desktop switcher from panel for a cleaner look.
+
+ -- Walter Lapchynski <wxl@ubuntu.com>  Wed, 10 Apr 2024 23:08:27 +0000
+
+lubuntu-installer-prompt (24.04.4) noble; urgency=medium
+
+  * Fix a race condition where a wired network connection could hang the
+    installer prompt during startup.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Sun, 24 Mar 2024 20:40:48 -0500
+
+lubuntu-installer-prompt (24.04.3) noble; urgency=medium
+
+  * Don't let people close modal windows so they don't accidentally confuse
+    the prompt and mess up their system.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Mon, 11 Mar 2024 18:14:21 -0500
+
+lubuntu-installer-prompt (24.04.2) noble; urgency=medium
+
+  * Remove a spurious d/source/options file resulting in the whole Git repo
+    being uploaded with the source package.
+  * Don't start the prompt using sudo, it's unnecessary and results in odd
+    permissions issues.
+  * Add support for open WiFi networks. (LP: #2056603)
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Fri, 08 Mar 2024 23:49:22 +0000
+
+lubuntu-installer-prompt (24.04.1) noble; urgency=medium
+
+  * Switch to native packaging.
+  * Fix several networking-related bugs.
+  * Significant design improvements.
+  * Use Picom for X compositing so that transparency and rounded corners work. 
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Tue, 27 Feb 2024 14:45:23 -0600
+
+lubuntu-installer-prompt (1.1.2-0ubuntu1) noble; urgency=medium
+
+  * New upstream release (LP: #2047379).
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 01 Jan 2024 13:56:49 -0600
+
+lubuntu-installer-prompt (1.1.1-0ubuntu2) noble; urgency=medium
+
+  * Ensure C is not the default locale, to the user.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 23 Dec 2023 18:03:34 -0600
+
+lubuntu-installer-prompt (1.1.1-0ubuntu1) noble; urgency=medium
+
+  * New upstream release (LP: #2046099).
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 23 Dec 2023 17:06:34 -0600
+
+lubuntu-installer-prompt (1.0.1-0ubuntu1) noble; urgency=medium
+
+  * New upstream release.
+  * Update Standards-version to 4.6.2, no changes needed.
+  * Update Vcs-*.
+  * Update build dependencies.
+  * Update Lintian overrides.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 09 Dec 2023 15:07:07 -0600
+
+lubuntu-installer-prompt (0.2.0-0ubuntu1) kinetic; urgency=medium
+
+  * Initial release.
+
+ -- Aaron Rainbolt <arraybolt3@gmail.com>  Thu, 30 Jun 2022 18:04:08 -0500
--- a/debian/control
+++ b/debian/control
@ -0,0 +1,27 @@
+Source: lubuntu-installer-prompt
+Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Uploaders: Simon Quigley <tsimonq2@ubuntu.com>,
+           Aaron Rainbolt <arraybolt3@gmail.com>
+Section: misc
+Priority: optional
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               extra-cmake-modules,
+               libkf6networkmanagerqt-dev,
+               qt6-base-dev,
+               qt6-tools-dev
+Standards-Version: 4.6.2
+Vcs-Browser: https://git.lubuntu.me/Lubuntu/installer-prompt-packaging
+Vcs-Git: https://git.lubuntu.me/Lubuntu/installer-prompt-packaging.git
+Homepage: https://lubuntu.me
+Rules-Requires-Root: no
+
+Package: lubuntu-installer-prompt
+Architecture: any
+Depends: calamares-settings-lubuntu, ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Description: Live ISO prompt for trying or installing Lubuntu
+ This application displays a screen allowing the user to either try or
+ install Lubuntu after booting the Lubuntu ISO file. It auto-launches
+ when the ISO is first booted, and will either launch Calamares or LXQt,
+ depending on the user's choice.
--- a/debian/copyright
+++ b/debian/copyright
@ -0,0 +1,412 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: installer-prompt
+Source: https://github.com/lubuntu-team/installer-prompt
+
+Files: *
+Copyright: 2022 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+License: GPL-3.0
+
+Files: img/background.png
+Copyright: 2022 Aaron Rainbolt <arraybolt3@gmail.com>
+License: CC-BY-4.0
+
+License: GPL-3.0
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 3 as
+ published by the Free Software Foundation.
+ .
+ On Debian systems, the full text of the GNU General Public License version
+ 3 can be found in the file `/usr/share/common-licenses/GPL-3'.
+
+License: CC-BY-4.0
+ Creative Commons Corporation ("Creative Commons") is not a law firm and
+ does not provide legal services or legal advice. Distribution of
+ Creative Commons public licenses does not create a lawyer-client or
+ other relationship. Creative Commons makes its licenses and related
+ information available on an "as-is" basis. Creative Commons gives no
+ warranties regarding its licenses, any material licensed under their
+ terms and conditions, or any related information. Creative Commons
+ disclaims all liability for damages resulting from their use to the
+ fullest extent possible.
+ .
+ Using Creative Commons Public Licenses
+ .
+ Creative Commons public licenses provide a standard set of terms and
+ conditions that creators and other rights holders may use to share
+ original works of authorship and other material subject to copyright
+ and certain other rights specified in the public license below. The
+ following considerations are for informational purposes only, are not
+ exhaustive, and do not form part of our licenses.
+ .
+      Considerations for licensors: Our public licenses are
+      intended for use by those authorized to give the public
+      permission to use material in ways otherwise restricted by
+      copyright and certain other rights. Our licenses are
+      irrevocable. Licensors should read and understand the terms
+      and conditions of the license they choose before applying it.
+      Licensors should also secure all rights necessary before
+      applying our licenses so that the public can reuse the
+      material as expected. Licensors should clearly mark any
+      material not subject to the license. This includes other CC-
+      licensed material, or material used under an exception or
+      limitation to copyright. More considerations for licensors:
+     wiki.creativecommons.org/Considerations_for_licensors
+ .
+      Considerations for the public: By using one of our public
+      licenses, a licensor grants the public permission to use the
+      licensed material under specified terms and conditions. If
+      the licensor's permission is not necessary for any reason--for
+      example, because of any applicable exception or limitation to
+      copyright--then that use is not regulated by the license. Our
+      licenses grant only permissions under copyright and certain
+      other rights that a licensor has authority to grant. Use of
+      the licensed material may still be restricted for other
+      reasons, including because others have copyright or other
+      rights in the material. A licensor may make special requests,
+      such as asking that all changes be marked or described.
+      Although not required by our licenses, you are encouraged to
+      respect those requests where reasonable. More considerations
+      for the public:
+     wiki.creativecommons.org/Considerations_for_licensees
+ .
+ =======================================================================
+ .
+ Creative Commons Attribution 4.0 International Public License
+ .
+ By exercising the Licensed Rights (defined below), You accept and agree
+ to be bound by the terms and conditions of this Creative Commons
+ Attribution 4.0 International Public License ("Public License"). To the
+ extent this Public License may be interpreted as a contract, You are
+ granted the Licensed Rights in consideration of Your acceptance of
+ these terms and conditions, and the Licensor grants You such rights in
+ consideration of benefits the Licensor receives from making the
+ Licensed Material available under these terms and conditions.
+ .
+ .
+ Section 1 -- Definitions.
+ .
+   a. Adapted Material means material subject to Copyright and Similar
+      Rights that is derived from or based upon the Licensed Material
+      and in which the Licensed Material is translated, altered,
+      arranged, transformed, or otherwise modified in a manner requiring
+      permission under the Copyright and Similar Rights held by the
+      Licensor. For purposes of this Public License, where the Licensed
+      Material is a musical work, performance, or sound recording,
+      Adapted Material is always produced where the Licensed Material is
+      synched in timed relation with a moving image.
+ .
+   b. Adapter's License means the license You apply to Your Copyright
+      and Similar Rights in Your contributions to Adapted Material in
+      accordance with the terms and conditions of this Public License.
+ .
+   c. Copyright and Similar Rights means copyright and/or similar rights
+      closely related to copyright including, without limitation,
+      performance, broadcast, sound recording, and Sui Generis Database
+      Rights, without regard to how the rights are labeled or
+      categorized. For purposes of this Public License, the rights
+      specified in Section 2(b)(1)-(2) are not Copyright and Similar
+      Rights.
+ .
+   d. Effective Technological Measures means those measures that, in the
+      absence of proper authority, may not be circumvented under laws
+      fulfilling obligations under Article 11 of the WIPO Copyright
+      Treaty adopted on December 20, 1996, and/or similar international
+      agreements.
+ .
+   e. Exceptions and Limitations means fair use, fair dealing, and/or
+      any other exception or limitation to Copyright and Similar Rights
+      that applies to Your use of the Licensed Material.
+ .
+   f. Licensed Material means the artistic or literary work, database,
+      or other material to which the Licensor applied this Public
+      License.
+ .
+   g. Licensed Rights means the rights granted to You subject to the
+      terms and conditions of this Public License, which are limited to
+      all Copyright and Similar Rights that apply to Your use of the
+      Licensed Material and that the Licensor has authority to license.
+ .
+   h. Licensor means the individual(s) or entity(ies) granting rights
+      under this Public License.
+ .
+   i. Share means to provide material to the public by any means or
+      process that requires permission under the Licensed Rights, such
+      as reproduction, public display, public performance, distribution,
+      dissemination, communication, or importation, and to make material
+      available to the public including in ways that members of the
+      public may access the material from a place and at a time
+      individually chosen by them.
+ .
+   j. Sui Generis Database Rights means rights other than copyright
+      resulting from Directive 96/9/EC of the European Parliament and of
+      the Council of 11 March 1996 on the legal protection of databases,
+      as amended and/or succeeded, as well as other essentially
+      equivalent rights anywhere in the world.
+ .
+   k. You means the individual or entity exercising the Licensed Rights
+      under this Public License. Your has a corresponding meaning.
+ .
+ .
+ Section 2 -- Scope.
+ .
+   a. License grant.
+ .
+        1. Subject to the terms and conditions of this Public License,
+           the Licensor hereby grants You a worldwide, royalty-free,
+           non-sublicensable, non-exclusive, irrevocable license to
+           exercise the Licensed Rights in the Licensed Material to:
+ .
+             a. reproduce and Share the Licensed Material, in whole or
+                in part; and
+ .
+             b. produce, reproduce, and Share Adapted Material.
+ .
+        2. Exceptions and Limitations. For the avoidance of doubt, where
+           Exceptions and Limitations apply to Your use, this Public
+           License does not apply, and You do not need to comply with
+           its terms and conditions.
+ .
+        3. Term. The term of this Public License is specified in Section
+           6(a).
+ .
+        4. Media and formats; technical modifications allowed. The
+           Licensor authorizes You to exercise the Licensed Rights in
+           all media and formats whether now known or hereafter created,
+           and to make technical modifications necessary to do so. The
+           Licensor waives and/or agrees not to assert any right or
+           authority to forbid You from making technical modifications
+           necessary to exercise the Licensed Rights, including
+           technical modifications necessary to circumvent Effective
+           Technological Measures. For purposes of this Public License,
+           simply making modifications authorized by this Section 2(a)
+           (4) never produces Adapted Material.
+ .
+        5. Downstream recipients.
+ .
+             a. Offer from the Licensor -- Licensed Material. Every
+                recipient of the Licensed Material automatically
+                receives an offer from the Licensor to exercise the
+                Licensed Rights under the terms and conditions of this
+                Public License.
+ .
+             b. No downstream restrictions. You may not offer or impose
+                any additional or different terms or conditions on, or
+                apply any Effective Technological Measures to, the
+                Licensed Material if doing so restricts exercise of the
+                Licensed Rights by any recipient of the Licensed
+                Material.
+ .
+        6. No endorsement. Nothing in this Public License constitutes or
+           may be construed as permission to assert or imply that You
+           are, or that Your use of the Licensed Material is, connected
+           with, or sponsored, endorsed, or granted official status by,
+           the Licensor or others designated to receive attribution as
+           provided in Section 3(a)(1)(A)(i).
+ .
+   b. Other rights.
+ .
+        1. Moral rights, such as the right of integrity, are not
+           licensed under this Public License, nor are publicity,
+           privacy, and/or other similar personality rights; however, to
+           the extent possible, the Licensor waives and/or agrees not to
+           assert any such rights held by the Licensor to the limited
+           extent necessary to allow You to exercise the Licensed
+           Rights, but not otherwise.
+ .
+        2. Patent and trademark rights are not licensed under this
+           Public License.
+ .
+        3. To the extent possible, the Licensor waives any right to
+           collect royalties from You for the exercise of the Licensed
+           Rights, whether directly or through a collecting society
+           under any voluntary or waivable statutory or compulsory
+           licensing scheme. In all other cases the Licensor expressly
+           reserves any right to collect such royalties.
+ .
+ .
+ Section 3 -- License Conditions.
+ .
+ Your exercise of the Licensed Rights is expressly made subject to the
+ following conditions.
+ .
+   a. Attribution.
+ .
+        1. If You Share the Licensed Material (including in modified
+           form), You must:
+ .
+             a. retain the following if it is supplied by the Licensor
+                with the Licensed Material:
+ .
+                  i. identification of the creator(s) of the Licensed
+                     Material and any others designated to receive
+                     attribution, in any reasonable manner requested by
+                     the Licensor (including by pseudonym if
+                     designated);
+ .
+                 ii. a copyright notice;
+ .
+                iii. a notice that refers to this Public License;
+ .
+                 iv. a notice that refers to the disclaimer of
+                     warranties;
+ .
+                  v. a URI or hyperlink to the Licensed Material to the
+                     extent reasonably practicable;
+ .
+             b. indicate if You modified the Licensed Material and
+                retain an indication of any previous modifications; and
+ .
+             c. indicate the Licensed Material is licensed under this
+                Public License, and include the text of, or the URI or
+                hyperlink to, this Public License.
+ .
+        2. You may satisfy the conditions in Section 3(a)(1) in any
+           reasonable manner based on the medium, means, and context in
+           which You Share the Licensed Material. For example, it may be
+           reasonable to satisfy the conditions by providing a URI or
+           hyperlink to a resource that includes the required
+           information.
+ .
+        3. If requested by the Licensor, You must remove any of the
+           information required by Section 3(a)(1)(A) to the extent
+           reasonably practicable.
+ .
+        4. If You Share Adapted Material You produce, the Adapter's
+           License You apply must not prevent recipients of the Adapted
+           Material from complying with this Public License.
+ .
+ .
+ Section 4 -- Sui Generis Database Rights.
+ .
+ Where the Licensed Rights include Sui Generis Database Rights that
+ apply to Your use of the Licensed Material:
+ .
+   a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+      to extract, reuse, reproduce, and Share all or a substantial
+      portion of the contents of the database;
+ .
+   b. if You include all or a substantial portion of the database
+      contents in a database in which You have Sui Generis Database
+      Rights, then the database in which You have Sui Generis Database
+      Rights (but not its individual contents) is Adapted Material; and
+ .
+   c. You must comply with the conditions in Section 3(a) if You Share
+      all or a substantial portion of the contents of the database.
+ .
+ For the avoidance of doubt, this Section 4 supplements and does not
+ replace Your obligations under this Public License where the Licensed
+ Rights include other Copyright and Similar Rights.
+ .
+ .
+ Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+ .
+   a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+      EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+      AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+      ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+      IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+      WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+      PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+      ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+      KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+      ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+ .
+   b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+      TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+      NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+      INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+      COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+      USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+      ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+      DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+      IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+ .
+   c. The disclaimer of warranties and limitation of liability provided
+      above shall be interpreted in a manner that, to the extent
+      possible, most closely approximates an absolute disclaimer and
+      waiver of all liability.
+ .
+ .
+ Section 6 -- Term and Termination.
+ .
+   a. This Public License applies for the term of the Copyright and
+      Similar Rights licensed here. However, if You fail to comply with
+      this Public License, then Your rights under this Public License
+      terminate automatically.
+ .
+   b. Where Your right to use the Licensed Material has terminated under
+     Section 6(a), it reinstates:
+ .
+        1. automatically as of the date the violation is cured, provided
+          it is cured within 30 days of Your discovery of the
+          violation; or
+ .
+        2. upon express reinstatement by the Licensor.
+ .
+      For the avoidance of doubt, this Section 6(b) does not affect any
+      right the Licensor may have to seek remedies for Your violations
+      of this Public License.
+ .
+   c. For the avoidance of doubt, the Licensor may also offer the
+      Licensed Material under separate terms or conditions or stop
+      distributing the Licensed Material at any time; however, doing so
+      will not terminate this Public License.
+ .
+   d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+      License.
+ .
+ .
+ Section 7 -- Other Terms and Conditions.
+ .
+   a. The Licensor shall not be bound by any additional or different
+      terms or conditions communicated by You unless expressly agreed.
+ .
+   b. Any arrangements, understandings, or agreements regarding the
+      Licensed Material not stated herein are separate from and
+      independent of the terms and conditions of this Public License.
+ .
+ .
+ Section 8 -- Interpretation.
+ .
+   a. For the avoidance of doubt, this Public License does not, and
+      shall not be interpreted to, reduce, limit, restrict, or impose
+      conditions on any use of the Licensed Material that could lawfully
+      be made without permission under this Public License.
+ .
+   b. To the extent possible, if any provision of this Public License is
+      deemed unenforceable, it shall be automatically reformed to the
+      minimum extent necessary to make it enforceable. If the provision
+      cannot be reformed, it shall be severed from this Public License
+      without affecting the enforceability of the remaining terms and
+      conditions.
+ .
+   c. No term or condition of this Public License will be waived and no
+      failure to comply consented to unless expressly agreed to by the
+      Licensor.
+  .
+   d. Nothing in this Public License constitutes or may be interpreted
+     as a limitation upon, or waiver of, any privileges and immunities
+      that apply to the Licensor or You, including from the legal
+      processes of any jurisdiction or authority.
+  .
+ .
+ =======================================================================
+ .
+ Creative Commons is not a party to its public
+ licenses. Notwithstanding, Creative Commons may elect to apply one of
+ its public licenses to material it publishes and in those instances
+ will be considered the “Licensor.” The text of the Creative Commons
+ public licenses is dedicated to the public domain under the CC0 Public
+ Domain Dedication. Except for the limited purpose of indicating that
+ material is shared under a Creative Commons public license or as
+ otherwise permitted by the Creative Commons policies published at
+ creativecommons.org/policies, Creative Commons does not authorize the
+ use of the trademark "Creative Commons" or any other trademark or logo
+ of Creative Commons without its prior written consent including,
+ without limitation, in connection with any unauthorized modifications
+ to any of its public licenses or any other arrangements,
+ understandings, or agreements concerning use of licensed material. For
+ the avoidance of doubt, this paragraph does not form part of the
+ public licenses.
+ .
+ Creative Commons may be contacted at creativecommons.org.
--- a/debian/docs
+++ b/debian/docs
@ -0,0 +1 @@
+README.md
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@ -0,0 +1,3 @@
+lubuntu-installer-prompt: no-manual-page [usr/bin/lubuntu-installer-prompt]
+lubuntu-installer-prompt: desktop-entry-lacks-icon-entry [usr/share/xsessions/lubuntu-live-environment.desktop]
+lubuntu-installer-prompt: desktop-entry-lacks-keywords-entry [usr/share/xsessions/lubuntu-live-environment.desktop]
--- a/debian/rules
+++ b/debian/rules
@ -0,0 +1,9 @@
+#!/usr/bin/make -f
+
+export LC_ALL=C.UTF-8
+
+%:
+	dh ${@} --buildsystem cmake
+
+override_dh_missing:
+	dh_missing --fail-missing
--- a/debian/source/format
+++ b/debian/source/format
@ -0,0 +1 @@
+3.0 (native)
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@ -0,0 +1,2 @@
+# We intentionally switched from quilt packaging to native.
+lubuntu-installer-prompt source: odd-historical-debian-changelog-version *
--- a/img/arrow-down.svg
+++ b/img/arrow-down.svg
@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 32 32"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="arrow-down.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="23.21875"
+     inkscape:cx="16.086137"
+     inkscape:cy="16.086137"
+     inkscape:window-width="1920"
+     inkscape:window-height="1008"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg5" />
+  <style
+     type="text/css"
+     id="current-color-scheme">
+        .ColorScheme-Text {
+            color:#232629;
+        }
+    </style>
+  <path
+     id="path3"
+     style="fill:#ffffff;stroke-width:0.81806"
+     d="M 3.9687633,8.8275937 C 3.3903692,9.4059877 2.8119751,9.9843817 2.2335809,10.562776 6.8223872,15.151582 11.411193,19.740389 16,24.329195 20.588806,19.740389 25.177613,15.151582 29.766419,10.562776 28.802429,9.5987857 27.838438,8.6347957 26.874449,7.6708052 23.249632,11.295622 19.624816,14.920438 16,18.545254 12.375183,14.920438 8.7503672,11.295622 5.1255515,7.6708052 4.7399555,8.0564017 4.3543594,8.4419977 3.9687633,8.8275937 Z" />
+</svg>
--- a/img/background.png
+++ b/img/background.png
--- a/img/dialog-warning.svg
+++ b/img/dialog-warning.svg
@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" version="1">
+ <rect fill="#ffd453" width="40" height="40" x="-44" y="-44" rx="20" ry="20" transform="matrix(0,-1,-1,0,0,0)"/>
+ <g opacity=".2" transform="matrix(2,0,0,2,-1068,722.01)">
+  <path class="error" d="m545-355h2v9.0039h-2zm0 11.004h2v1.9961h-2z"/>
+ </g>
+ <g fill="#3f3f3f" transform="matrix(2,0,0,2,-1068,721.01)">
+  <path class="error" d="m545-355h2v9.0039h-2zm0 11.004h2v1.9961h-2z"/>
+ </g>
+ <path fill="#fff" opacity=".2" d="m24 4c-11.08 0-20 8.92-20 20 0 0.168 0.008 0.333 0.0117 0.5 0.2647-10.846 9.0763-19.5 19.988-19.5s19.724 8.6539 19.988 19.5c0.004-0.16686 0.0117-0.33213 0.0117-0.5 0-11.08-8.92-20-20-20z"/>
+ <path opacity=".2" d="m4.0117 24.5c-0.0041 0.167-0.0117 0.332-0.0117 0.5 0 11.08 8.92 20 20 20s20-8.92 20-20c0-0.168-0.008-0.333-0.012-0.5-0.264 10.846-9.076 19.5-19.988 19.5s-19.724-8.654-19.988-19.5z"/>
+</svg>
--- a/img/installer.png
+++ b/img/installer.png
--- a/img/symbol.png
+++ b/img/symbol.png
--- a/panel.conf
+++ b/panel.conf
@ -0,0 +1,50 @@
+panels=panel1
+
+[panel1]
+plugins=fancymenu, quicklaunch, showdesktop, taskbar, mount, volume, tray, statusnotifier, worldclock
+position=Bottom
+desktop=0
+
+[fancymenu]
+buttonsAtTop=false
+categoriesAtRight=false
+favorites\1\desktopFile=/usr/share/applications/featherpad.desktop
+favorites\2\desktopFile=/usr/share/applications/lubuntu-update.desktop
+favorites\3\desktopFile=/usr/share/applications/pcmanfm-qt.desktop
+favorites\4\desktopFile=/usr/share/applications/qterminal.desktop
+favorites\size=4
+filterClear=true
+menu_file=/etc/xdg/menus/lxqt-applications-compact.menu
+showText=false
+type=fancymenu
+
+[quicklaunch]
+type=quicklaunch
+apps\1\desktop=/usr/share/applications/pcmanfm-qt.desktop
+apps\size=1
+alignment=Left
+
+[taskbar]
+type=taskbar
+buttonWidth=200
+
+[tray]
+type=tray
+
+[mount]
+type=mount
+
+[worldclock]
+type=worldclock
+
+[volume]
+device=0
+type=volume
+
+[showdesktop]
+alignment=Right
+type=showdesktop
+
+[statusnotifier]
+alignment=Right
+type=statusnotifier
--- a/rc.xml
+++ b/rc.xml
@ -0,0 +1,750 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Do not edit this file, it will be overwritten on install.
+        Copy the file to $HOME/.config/openbox/ instead. -->
+
+<openbox_config xmlns="http://openbox.org/3.4/rc"
+		xmlns:xi="http://www.w3.org/2001/XInclude">
+
+<resistance>
+  <strength>10</strength>
+  <screen_edge_strength>20</screen_edge_strength>
+</resistance>
+
+<focus>
+  <focusNew>yes</focusNew>
+  <!-- always try to focus new windows when they appear. other rules do
+       apply -->
+  <followMouse>no</followMouse>
+  <!-- move focus to a window when you move the mouse into it -->
+  <focusLast>yes</focusLast>
+  <!-- focus the last used window when changing desktops, instead of the one
+       under the mouse pointer. when followMouse is enabled -->
+  <underMouse>no</underMouse>
+  <!-- move focus under the mouse, even when the mouse is not moving -->
+  <focusDelay>200</focusDelay>
+  <!-- when followMouse is enabled, the mouse must be inside the window for
+       this many milliseconds (1000 = 1 sec) before moving focus to it -->
+  <raiseOnFocus>no</raiseOnFocus>
+  <!-- when followMouse is enabled, and a window is given focus by moving the
+       mouse into it, also raise the window -->
+</focus>
+
+<placement>
+  <!--  Lubuntu specific : Place new windows where the mouse is
+        <monitor>Mouse</monitor>
+        <primaryMonitor>Mouse</primaryMonitor>
+  -->
+  <policy>Smart</policy>
+  <!-- 'Smart' or 'UnderMouse' -->
+  <center>yes</center>
+  <!-- whether to place windows in the center of the free area found or
+       the top left corner -->
+  <monitor>Mouse</monitor>
+  <!-- with Smart placement on a multi-monitor system, try to place new windows
+       on: 'Any' - any monitor, 'Mouse' - where the mouse is, 'Active' - where
+       the active window is, 'Primary' - only on the primary monitor -->
+  <primaryMonitor>Mouse</primaryMonitor>
+  <!-- The monitor where Openbox should place popup dialogs such as the
+       focus cycling popup, or the desktop switch popup.  It can be an index
+       from 1, specifying a particular monitor.  Or it can be one of the
+       following: 'Mouse' - where the mouse is, or
+                  'Active' - where the active window is -->
+</placement>
+
+<theme>
+  <!--  Lubuntu specific : Theme = Lubuntu and font = Ubuntu
+  -->
+  <name>Lubuntu Arc</name>
+  <titleLayout>NLIMC</titleLayout>
+  <!--
+    available characters are NDSLIMC, each can occur at most once.
+    N: window icon
+    L: window label (AKA title).
+    I: iconify
+    M: maximize
+    C: close
+    S: shade (roll up/down)
+    D: omnipresent (on all desktops).
+-->
+  <keepBorder>yes</keepBorder>
+  <animateIconify>yes</animateIconify>
+  <font place="ActiveWindow">
+    <name>Ubuntu Medium</name>
+    <size>11</size>
+    <!-- font size in points -->
+    <weight>bold</weight>
+    <!-- 'bold' or 'normal' -->
+    <slant>normal</slant>
+    <!-- 'italic' or 'normal' -->
+  </font>
+  <font place="InactiveWindow">
+    <name>Ubuntu Medium</name>
+    <size>11</size>
+    <!-- font size in points -->
+    <weight>bold</weight>
+    <!-- 'bold' or 'normal' -->
+    <slant>normal</slant>
+    <!-- 'italic' or 'normal' -->
+  </font>
+  <font place="MenuHeader">
+    <name>Ubuntu</name>
+    <size>11</size>
+    <!-- font size in points -->
+    <weight>normal</weight>
+    <!-- 'bold' or 'normal' -->
+    <slant>normal</slant>
+    <!-- 'italic' or 'normal' -->
+  </font>
+  <font place="MenuItem">
+    <name>Ubuntu</name>
+    <size>11</size>
+    <!-- font size in points -->
+    <weight>normal</weight>
+    <!-- 'bold' or 'normal' -->
+    <slant>normal</slant>
+    <!-- 'italic' or 'normal' -->
+  </font>
+  <font place="ActiveOnScreenDisplay">
+    <name>Ubuntu Medium</name>
+    <size>11</size>
+    <!-- font size in points -->
+    <weight>bold</weight>
+    <!-- 'bold' or 'normal' -->
+    <slant>normal</slant>
+    <!-- 'italic' or 'normal' -->
+  </font>
+  <font place="InactiveOnScreenDisplay">
+    <name>Ubuntu Medium</name>
+    <size>11</size>
+    <!-- font size in points -->
+    <weight>bold</weight>
+    <!-- 'bold' or 'normal' -->
+    <slant>normal</slant>
+    <!-- 'italic' or 'normal' -->
+  </font>
+</theme>
+
+<desktops>
+  <!-- this stuff is only used at startup, pagers allow you to change them
+       during a session
+
+       these are default values to use when other ones are not already set
+       by other applications, or saved in your session
+
+       use obconf if you want to change these without having to log out
+       and back in -->
+  <!-- NOTE: desktops set to 1 to keep folks from accidentially switching
+       away from the installer -->
+  <number>1</number>
+  <firstdesk>1</firstdesk>
+  <names>
+    <!-- set names up here if you want to, like this:
+    <name>desktop 1</name>
+    <name>desktop 2</name>
+    -->
+  </names>
+  <popupTime>875</popupTime>
+  <!-- The number of milliseconds to show the popup for when switching
+       desktops.  Set this to 0 to disable the popup. -->
+</desktops>
+
+<resize>
+  <!--  Lubuntu specific : Don't draw content on resize (too heavy).
+        <drawContents>no</drawContents>
+  -->
+  <drawContents>no</drawContents>
+  <popupShow>Nonpixel</popupShow>
+  <!-- 'Always', 'Never', or 'Nonpixel' (xterms and such) -->
+  <popupPosition>Center</popupPosition>
+  <!-- 'Center', 'Top', or 'Fixed' -->
+  <popupFixedPosition>
+    <!-- these are used if popupPosition is set to 'Fixed' -->
+
+    <x>10</x>
+    <!-- positive number for distance from left edge, negative number for
+         distance from right edge, or 'Center' -->
+    <y>10</y>
+    <!-- positive number for distance from top edge, negative number for
+         distance from bottom edge, or 'Center' -->
+  </popupFixedPosition>
+</resize>
+
+<!-- You can reserve a portion of your screen where windows will not cover when
+     they are maximized, or when they are initially placed.
+     Many programs reserve space automatically, but you can use this in other
+     cases. -->
+<margins>
+  <top>0</top>
+  <bottom>0</bottom>
+  <left>0</left>
+  <right>0</right>
+</margins>
+
+<dock>
+  <position>TopLeft</position>
+  <!-- (Top|Bottom)(Left|Right|)|Top|Bottom|Left|Right|Floating -->
+  <floatingX>0</floatingX>
+  <floatingY>0</floatingY>
+  <noStrut>no</noStrut>
+  <stacking>Above</stacking>
+  <!-- 'Above', 'Normal', or 'Below' -->
+  <direction>Vertical</direction>
+  <!-- 'Vertical' or 'Horizontal' -->
+  <autoHide>no</autoHide>
+  <hideDelay>300</hideDelay>
+  <!-- in milliseconds (1000 = 1 second) -->
+  <showDelay>300</showDelay>
+  <!-- in milliseconds (1000 = 1 second) -->
+  <moveButton>Middle</moveButton>
+  <!-- 'Left', 'Middle', 'Right' -->
+</dock>
+
+<keyboard>
+  <chainQuitKey>C-g</chainQuitKey>
+
+  <!-- Keybindings for desktop switching -->
+  <keybind key="C-A-Left">
+    <action name="GoToDesktop"><to>left</to><wrap>no</wrap></action>
+  </keybind>
+  <keybind key="C-A-Right">
+    <action name="GoToDesktop"><to>right</to><wrap>no</wrap></action>
+  </keybind>
+  <keybind key="C-A-Up">
+    <action name="GoToDesktop"><to>up</to><wrap>no</wrap></action>
+  </keybind>
+  <keybind key="C-A-Down">
+    <action name="GoToDesktop"><to>down</to><wrap>no</wrap></action>
+  </keybind>
+  <keybind key="C-S-A-Left">
+    <action name="SendToDesktop"><to>left</to><wrap>no</wrap></action>
+  </keybind>
+  <keybind key="C-S-A-Right">
+    <action name="SendToDesktop"><to>right</to><wrap>no</wrap></action>
+  </keybind>
+  <keybind key="C-S-A-Up">
+    <action name="SendToDesktop"><to>up</to><wrap>no</wrap></action>
+  </keybind>
+  <keybind key="C-S-A-Down">
+    <action name="SendToDesktop"><to>down</to><wrap>no</wrap></action>
+  </keybind>
+
+  <!-- Keybindings for windows -->
+  <keybind key="A-F4">
+    <action name="Close"/>
+  </keybind>
+  <keybind key="A-Escape">
+    <action name="Lower"/>
+    <action name="FocusToBottom"/>
+    <action name="Unfocus"/>
+  </keybind>
+  <keybind key="A-space">
+    <action name="ShowMenu"><menu>client-menu</menu></action>
+  </keybind>
+
+  <!-- Keybindings for window switching -->
+  <keybind key="A-Tab">
+    <action name="NextWindow">
+      <finalactions>
+        <action name="Focus"/>
+        <action name="Raise"/>
+        <action name="Unshade"/>
+      </finalactions>
+      <allDesktops>yes</allDesktops>
+    </action>
+  </keybind>
+  <keybind key="A-S-Tab">
+    <action name="PreviousWindow">
+      <finalactions>
+        <action name="Focus"/>
+        <action name="Raise"/>
+        <action name="Unshade"/>
+      </finalactions>
+      <allDesktops>yes</allDesktops>
+    </action>
+  </keybind>
+
+  <!-- Keybindings for window switching with the arrow keys -->
+  <keybind key="A-S-Right">
+    <action name="DirectionalCycleWindows">
+      <direction>right</direction>
+    </action>
+  </keybind>
+  <keybind key="A-S-Left">
+    <action name="DirectionalCycleWindows">
+      <direction>left</direction>
+    </action>
+  </keybind>
+  <keybind key="A-S-Up">
+    <action name="DirectionalCycleWindows">
+      <direction>up</direction>
+    </action>
+  </keybind>
+  <keybind key="A-S-Down">
+    <action name="DirectionalCycleWindows">
+      <direction>down</direction>
+    </action>
+  </keybind>
+
+  <!-- Keybindings to toggle fullscreen -->
+  <keybind key="F11">
+    <action name="ToggleFullscreen"/>
+  </keybind>
+</keyboard>
+
+<mouse>
+  <!--
+      Lubuntu specific : Specific mouse settings
+        <dragThreshold>8</dragThreshold>
+        <doubleClickTime>200</doubleClickTime>
+  -->
+  <dragThreshold>8</dragThreshold>
+  <!-- number of pixels the mouse must move before a drag begins -->
+  <doubleClickTime>200</doubleClickTime>
+  <!-- in milliseconds (1000 = 1 second) -->
+  <screenEdgeWarpTime>400</screenEdgeWarpTime>
+  <!-- Time before changing desktops when the pointer touches the edge of the
+       screen while moving a window, in milliseconds (1000 = 1 second).
+       Set this to 0 to disable warping -->
+  <screenEdgeWarpMouse>false</screenEdgeWarpMouse>
+  <!-- Set this to TRUE to move the mouse pointer across the desktop when
+       switching due to hitting the edge of the screen -->
+
+  <context name="Frame">
+    <mousebind button="A-Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+    <mousebind button="A-Left" action="Click">
+      <action name="Unshade"/>
+    </mousebind>
+    <mousebind button="A-Left" action="Drag">
+      <action name="Move"/>
+    </mousebind>
+
+    <mousebind button="A-Right" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
+    </mousebind>
+    <mousebind button="A-Right" action="Drag">
+      <action name="Resize"/>
+    </mousebind>
+
+    <mousebind button="A-Middle" action="Press">
+      <action name="Lower"/>
+      <action name="FocusToBottom"/>
+      <action name="Unfocus"/>
+    </mousebind>
+
+    <mousebind button="A-Up" action="Click">
+      <action name="GoToDesktop"><to>previous</to></action>
+    </mousebind>
+    <mousebind button="A-Down" action="Click">
+      <action name="GoToDesktop"><to>next</to></action>
+    </mousebind>
+    <mousebind button="C-A-Up" action="Click">
+      <action name="GoToDesktop"><to>previous</to></action>
+    </mousebind>
+    <mousebind button="C-A-Down" action="Click">
+      <action name="GoToDesktop"><to>next</to></action>
+    </mousebind>
+    <mousebind button="A-S-Up" action="Click">
+      <action name="SendToDesktop"><to>previous</to></action>
+    </mousebind>
+    <mousebind button="A-S-Down" action="Click">
+      <action name="SendToDesktop"><to>next</to></action>
+    </mousebind>
+  </context>
+
+  <context name="Titlebar">
+    <mousebind button="Left" action="Drag">
+      <action name="Move"/>
+    </mousebind>
+    <mousebind button="Left" action="DoubleClick">
+      <action name="ToggleMaximize"/>
+    </mousebind>
+
+    <mousebind button="Up" action="Click">
+      <action name="if">
+        <shaded>no</shaded>
+        <then>
+          <action name="Shade"/>
+          <action name="FocusToBottom"/>
+          <action name="Unfocus"/>
+          <action name="Lower"/>
+        </then>
+      </action>
+    </mousebind>
+    <mousebind button="Down" action="Click">
+      <action name="if">
+        <shaded>yes</shaded>
+        <then>
+          <action name="Unshade"/>
+          <action name="Raise"/>
+        </then>
+      </action>
+    </mousebind>
+  </context>
+
+  <context name="Titlebar Top Right Bottom Left TLCorner TRCorner BRCorner BLCorner">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
+    </mousebind>
+
+    <mousebind button="Middle" action="Press">
+      <action name="Lower"/>
+      <action name="FocusToBottom"/>
+      <action name="Unfocus"/>
+    </mousebind>
+
+    <mousebind button="Right" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="ShowMenu"><menu>client-menu</menu></action>
+    </mousebind>
+  </context>
+
+  <context name="Top">
+    <mousebind button="Left" action="Drag">
+      <action name="Resize"><edge>top</edge></action>
+    </mousebind>
+  </context>
+
+  <context name="Left">
+    <mousebind button="Left" action="Drag">
+      <action name="Resize"><edge>left</edge></action>
+    </mousebind>
+  </context>
+
+  <context name="Right">
+    <mousebind button="Left" action="Drag">
+      <action name="Resize"><edge>right</edge></action>
+    </mousebind>
+  </context>
+
+  <context name="Bottom">
+    <mousebind button="Left" action="Drag">
+      <action name="Resize"><edge>bottom</edge></action>
+    </mousebind>
+
+    <mousebind button="Right" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="ShowMenu"><menu>client-menu</menu></action>
+    </mousebind>
+  </context>
+
+  <context name="TRCorner BRCorner TLCorner BLCorner">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
+    </mousebind>
+    <mousebind button="Left" action="Drag">
+      <action name="Resize"/>
+    </mousebind>
+  </context>
+
+  <context name="Client">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+    <mousebind button="Middle" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+    <mousebind button="Right" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+  </context>
+
+  <context name="Icon">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
+      <action name="ShowMenu"><menu>client-menu</menu></action>
+    </mousebind>
+    <mousebind button="Right" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="ShowMenu"><menu>client-menu</menu></action>
+    </mousebind>
+  </context>
+
+  <context name="AllDesktops">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
+    </mousebind>
+    <mousebind button="Left" action="Click">
+      <action name="ToggleOmnipresent"/>
+    </mousebind>
+  </context>
+
+  <context name="Shade">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+    <mousebind button="Left" action="Click">
+      <action name="ToggleShade"/>
+    </mousebind>
+  </context>
+
+  <context name="Iconify">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+    <mousebind button="Left" action="Click">
+      <action name="Iconify"/>
+    </mousebind>
+  </context>
+
+  <context name="Maximize">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
+    </mousebind>
+    <mousebind button="Middle" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
+    </mousebind>
+    <mousebind button="Right" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
+    </mousebind>
+    <mousebind button="Left" action="Click">
+      <action name="ToggleMaximize"/>
+    </mousebind>
+    <mousebind button="Middle" action="Click">
+      <action name="ToggleMaximize"><direction>vertical</direction></action>
+    </mousebind>
+    <mousebind button="Right" action="Click">
+      <action name="ToggleMaximize"><direction>horizontal</direction></action>
+    </mousebind>
+  </context>
+
+  <context name="Close">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
+    </mousebind>
+    <mousebind button="Left" action="Click">
+      <action name="Close"/>
+    </mousebind>
+  </context>
+
+  <context name="Desktop">
+    <mousebind button="Up" action="Click">
+      <action name="GoToDesktop"><to>previous</to></action>
+    </mousebind>
+    <mousebind button="Down" action="Click">
+      <action name="GoToDesktop"><to>next</to></action>
+    </mousebind>
+
+    <mousebind button="A-Up" action="Click">
+      <action name="GoToDesktop"><to>previous</to></action>
+    </mousebind>
+    <mousebind button="A-Down" action="Click">
+      <action name="GoToDesktop"><to>next</to></action>
+    </mousebind>
+    <mousebind button="C-A-Up" action="Click">
+      <action name="GoToDesktop"><to>previous</to></action>
+    </mousebind>
+    <mousebind button="C-A-Down" action="Click">
+      <action name="GoToDesktop"><to>next</to></action>
+    </mousebind>
+
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+    <mousebind button="Right" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+  </context>
+
+  <context name="Root">
+    <!-- Menus -->
+    <mousebind button="Middle" action="Press">
+      <action name="ShowMenu"><menu>client-list-combined-menu</menu></action>
+    </mousebind>
+    <mousebind button="Right" action="Press">
+      <action name="ShowMenu"><menu>root-menu</menu></action>
+    </mousebind>
+  </context>
+
+  <context name="MoveResize">
+    <mousebind button="Up" action="Click">
+      <action name="GoToDesktop"><to>previous</to></action>
+    </mousebind>
+    <mousebind button="Down" action="Click">
+      <action name="GoToDesktop"><to>next</to></action>
+    </mousebind>
+    <mousebind button="A-Up" action="Click">
+      <action name="GoToDesktop"><to>previous</to></action>
+    </mousebind>
+    <mousebind button="A-Down" action="Click">
+      <action name="GoToDesktop"><to>next</to></action>
+    </mousebind>
+  </context>
+</mouse>
+
+<menu>
+  <!-- You can specify more than one menu file in here and they are all loaded,
+     just don't make menu ids clash or, well, it'll be kind of pointless -->
+  <!-- Lubuntu specific : Default menu of Lubuntu -->
+  <file>/usr/share/lubuntu/openbox/menu.xml</file>
+  <!-- default menu file (or custom one in $HOME/.config/openbox/) -->
+  <file>menu.xml</file>
+
+  <hideDelay>200</hideDelay>
+  <!-- if a press-release lasts longer than this setting (in milliseconds), the
+     menu is hidden again -->
+  <middle>no</middle>
+  <!-- center submenus vertically about the parent entry -->
+  <submenuShowDelay>100</submenuShowDelay>
+  <!-- time to delay before showing a submenu after hovering over the parent
+     entry.
+     if this is a negative value, then the delay is infinite and the
+     submenu will not be shown until it is clicked on -->
+  <submenuHideDelay>400</submenuHideDelay>
+  <!-- time to delay before hiding a submenu when selecting another
+     entry in parent menu
+     if this is a negative value, then the delay is infinite and the
+     submenu will not be hidden until a different submenu is opened -->
+  <applicationIcons>yes</applicationIcons>
+  <!-- Lubuntu specific : Show applications icons if openbox is build with this support -->
+  <manageDesktops>yes</manageDesktops>
+  <!-- show the manage desktops section in the client-list-(combined-)menu -->
+  <showIcons>yes</showIcons>
+  <!-- controls if icons appear in the client-list-(combined-)menu -->
+</menu>
+
+<applications>
+<!--
+  # this is an example with comments through out. use these to make your
+  # own rules, but without the comments of course.
+  # you may use one or more of the name/class/role/title/type rules to specify
+  # windows to match
+
+  <application name="the window's _OB_APP_NAME property (see obxprop)"
+              class="the window's _OB_APP_CLASS property (see obxprop)"
+          groupname="the window's _OB_APP_GROUP_NAME property (see obxprop)"
+         groupclass="the window's _OB_APP_GROUP_CLASS property (see obxprop)"
+               role="the window's _OB_APP_ROLE property (see obxprop)"
+              title="the window's _OB_APP_TITLE property (see obxprop)"
+               type="the window's _OB_APP_TYPE property (see obxprob)..
+                      (if unspecified, then it is 'dialog' for child windows)">
+  # you may set only one of name/class/role/title/type, or you may use more
+  # than one together to restrict your matches.
+
+  # the name, class, role, and title use simple wildcard matching such as those
+  # used by a shell. you can use * to match any characters and ? to match
+  # any single character.
+
+  # the type is one of: normal, dialog, splash, utility, menu, toolbar, dock,
+  #    or desktop
+
+  # when multiple rules match a window, they will all be applied, in the
+  # order that they appear in this list
+
+
+    # each rule element can be left out or set to 'default' to specify to not
+    # change that attribute of the window
+
+    <decor>yes</decor>
+    # enable or disable window decorations
+
+    <shade>no</shade>
+    # make the window shaded when it appears, or not
+
+    <position force="no">
+      # the position is only used if both an x and y coordinate are provided
+      # (and not set to 'default')
+      # when force is "yes", then the window will be placed here even if it
+      # says you want it placed elsewhere.  this is to override buggy
+      # applications who refuse to behave
+      <x>center</x>
+      # a number like 50, or 'center' to center on screen. use a negative number
+      # to start from the right (or bottom for <y>), ie -50 is 50 pixels from
+      # the right edge (or bottom). use 'default' to specify using value
+      # provided by the application, or chosen by openbox, instead.
+      <y>200</y>
+      <monitor>1</monitor>
+      # specifies the monitor in a xinerama setup.
+      # 1 is the first head, or 'mouse' for wherever the mouse is
+    </position>
+
+    <size>
+      # the size to make the window.
+      <width>20</width>
+      # a number like 20, or 'default' to use the size given by the application.
+      # you can use fractions such as 1/2 or percentages such as 75% in which
+      # case the value is relative to the size of the monitor that the window
+      # appears on.
+      <height>30%</height>
+    </size>
+
+    <focus>yes</focus>
+    # if the window should try be given focus when it appears. if this is set
+    # to yes it doesn't guarantee the window will be given focus. some
+    # restrictions may apply, but Openbox will try to
+
+    <desktop>1</desktop>
+    # 1 is the first desktop, 'all' for all desktops
+
+    <layer>normal</layer>
+    # 'above', 'normal', or 'below'
+
+    <iconic>no</iconic>
+    # make the window iconified when it appears, or not
+
+    <skip_pager>no</skip_pager>
+    # asks to not be shown in pagers
+
+    <skip_taskbar>no</skip_taskbar>
+    # asks to not be shown in taskbars. window cycling actions will also
+    # skip past such windows
+
+    <fullscreen>yes</fullscreen>
+    # make the window in fullscreen mode when it appears
+
+    <maximized>true</maximized>
+    # 'Horizontal', 'Vertical' or boolean (yes/no)
+  </application>
+
+  # end of the example
+-->
+
+  <!-- Option to maximize all normal window when launched-->
+  <!--
+  <application type="normal">
+    <maximized>true</maximized>
+  </application>
+  -->
+  <!--
+        Lubuntu specific :
+        Focus all applications launched
+        Usefull when launching applications, like terminal from pcmanfm
+  -->
+  <application class="*">
+    <focus>yes</focus>
+  </application>
+
+</applications>
+
+</openbox_config>
--- a/scripts/change-system-language
+++ b/scripts/change-system-language
@ -1,10 +1,10 @@
 #!/bin/bash

-LANGUAGE_CODE=$1
-COUNTRY_CODE=$2
+LANGUAGE_CODE="$1"
+COUNTRY_CODE="$2"
 LOCALE="${LANGUAGE_CODE}_${COUNTRY_CODE}.UTF-8"
-LIBREOFFICE_CODE=$3
-ONLY_LXQT=$4
+LIBREOFFICE_CODE="$3"
+ONLY_LXQT="$4"

 # Special handling for language packs for Chinese
 if [[ "$LANGUAGE_CODE" == "zh" ]]; then
@ -18,13 +18,14 @@ else
 fi

 if [ -z "$ONLY_LXQT" ]; then
-    apt-get -y install language-pack-gnome-$LANG_PACK_SUFFIX language-pack-kde-$LANG_PACK_SUFFIX
+    apt-get -y install language-pack-gnome-"$LANG_PACK_SUFFIX" language-pack-kde-"$LANG_PACK_SUFFIX"
    # Install LibreOffice language pack only if LIBREOFFICE_CODE is provided
    # and it's not English without a specific variant
    if [[ "$LANGUAGE_CODE" != "en" ]] || [[ "$LANGUAGE_CODE" == "en" && ( "$COUNTRY_CODE" == "GB" || "$COUNTRY_CODE" == "ZA" ) ]]; then
-        apt-get -y install libreoffice-l10n-$LIBREOFFICE_CODE
+        apt-get -y install libreoffice-l10n-"$LIBREOFFICE_CODE"
    fi
 fi

-update-locale LANGUAGE=$LOCALE LANG=$LOCALE LC_ALL=$LOCALE
+locale-gen "$LOCALE"
+update-locale LANGUAGE="$LOCALE" LANG="$LOCALE" LC_ALL="$LOCALE"
 systemctl restart sddm
--- a/scripts/lubuntu-installer
+++ b/scripts/lubuntu-installer
@ -1,3 +0,0 @@
-#!/bin/bash
-
-sudo -E calamares -D6
--- a/scripts/start-lubuntu-live-env
+++ b/scripts/start-lubuntu-live-env
@ -2,16 +2,22 @@
 # Starts the Lubuntu Live Environment.

 # This is pretty overkill, but don't remove anything without testing
-export XDG_CONFIG_DIRS="/etc/xdg/xdg-Lubuntu:"$XDG_CONFIG_DIRS
+export XDG_CONFIG_DIRS="/etc/xdg/xdg-lubuntu-live-environment:/etc/xdg/xdg-Lubuntu:"$XDG_CONFIG_DIRS
 export XDG_DATA_DIRS="/usr/share/Lubuntu:"$XDG_DATA_DIRS
 export XDG_SESSION_CLASS="user"
 export XDG_SESSION_DESKTOP="Lubuntu"
 export DESKTOP_SESSION="Lubuntu"
-export QT_STYLE_OVERRIDE="Breeze"
+export QT_STYLE_OVERRIDE="kvantum"
 export QT_QPA_PLATFORMTHEME="lxqt"

 openbox &
-sudo -E lubuntu-installer-prompt # This is intentionally *not* backgrounded.
+picom &
+if [[ $(cat /proc/cmdline) =~ "oem-config/enable=true" ]]; then
+    sudo -E /usr/bin/calamares-launch-oem;
+else
+    lubuntu-installer-prompt;
+fi
 # If it exits...
+killall picom
 killall openbox
 startlxqt
--- a/src/backgroundscreen.cpp
+++ b/src/backgroundscreen.cpp
@ -3,25 +3,41 @@
 #include <QMessageBox>
 #include <QGuiApplication>
 #include <QScreen>
+#include <QPainter>

 BackgroundScreen::BackgroundScreen(QWidget *parent)
    : QWidget(parent) {
-    // Set the background image and scale it
-    QPixmap bg(":/background");
-    if (bg.isNull()) {
-        // the user will see the warning message that the InstallerPrompt object pops up, no need to bombard them with one message per screen
-        return;
-    }

-    QScreen *screen = QGuiApplication::primaryScreen();
-    QRect screenGeometry = screen->geometry();
-    bg = bg.scaled(screenGeometry.size(), Qt::IgnoreAspectRatio);
-
-    QPalette palette;
-    palette.setBrush(QPalette::Window, bg);
-    this->setPalette(palette);
 }

 BackgroundScreen::~BackgroundScreen()
 {
 }
+
+void BackgroundScreen::activateBackground()
+{
+    // Set the background image and scale it
+    QImage rawImage(":/background");
+    if (rawImage.isNull()) {
+        return;
+    }
+
+    qreal imgRatio = static_cast<qreal>(rawImage.width()) / rawImage.height();
+    qreal screenRatio = static_cast<qreal>(this->width()) / this->height();
+    QImage scaled;
+    if (imgRatio < screenRatio) {
+        scaled = rawImage.scaledToWidth(this->width(), Qt::SmoothTransformation);
+        int yGap = (scaled.height() - this->height()) / 2;
+        scaled = scaled.copy(0, yGap, scaled.width(), this->height());
+    } else {
+        scaled = rawImage.scaledToHeight(this->height(), Qt::SmoothTransformation);
+        int xGap = (scaled.width() - this->width()) / 2;
+        scaled = scaled.copy(xGap, 0, this->width(), scaled.height());
+    }
+    background = scaled;
+}
+
+void BackgroundScreen::paintEvent(QPaintEvent *event) {
+    QPainter painter(this);
+    painter.drawImage(0, 0, background);
+}
--- a/src/backgroundscreen.h
+++ b/src/backgroundscreen.h
@ -9,6 +9,11 @@ class BackgroundScreen : public QWidget {
 public:
    explicit BackgroundScreen(QWidget *parent = nullptr);
    virtual ~BackgroundScreen();
+    void activateBackground();
+
+private:
+    void paintEvent(QPaintEvent *event) override;
+    QImage background;
 };

 #endif // BACKGROUNDSCREEN_H
--- a/src/connectionprogressdialog.cpp
+++ b/src/connectionprogressdialog.cpp
@ -0,0 +1,26 @@
+#include "connectionprogressdialog.h"
+#include "ui_connectionprogressdialog.h"
+
+#include <QCloseEvent>
+
+ConnectionProgressDialog::ConnectionProgressDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::ConnectionProgressDialog)
+{
+    ui->setupUi(this);
+}
+
+ConnectionProgressDialog::~ConnectionProgressDialog()
+{
+    delete ui;
+}
+
+void ConnectionProgressDialog::setNetworkName(QString name)
+{
+    ui->label->setText(tr("Connecting to %1...").arg(name));
+}
+
+void ConnectionProgressDialog::closeEvent(QCloseEvent *event)
+{
+    event->ignore();
+}
--- a/src/connectionprogressdialog.h
+++ b/src/connectionprogressdialog.h
@ -0,0 +1,26 @@
+#ifndef CONNECTIONPROGRESSDIALOG_H
+#define CONNECTIONPROGRESSDIALOG_H
+
+#include <QDialog>
+
+namespace Ui {
+class ConnectionProgressDialog;
+}
+
+class ConnectionProgressDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit ConnectionProgressDialog(QWidget *parent = nullptr);
+    ~ConnectionProgressDialog();
+    void setNetworkName(QString name);
+
+protected slots:
+    void closeEvent(QCloseEvent *event) override;
+
+private:
+    Ui::ConnectionProgressDialog *ui;
+};
+
+#endif // CONNECTIONPROGRESSDIALOG_H
--- a/src/connectionprogressdialog.ui
+++ b/src/connectionprogressdialog.ui
@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ConnectionProgressDialog</class>
+ <widget class="QDialog" name="ConnectionProgressDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>263</width>
+    <height>72</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Lubuntu</string>
+  </property>
+  <property name="windowIcon">
+   <iconset theme="system-software-install"/>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Connecting...</string>
+     </property>
+     <property name="scaledContents">
+      <bool>false</bool>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QProgressBar" name="progressBar">
+     <property name="maximum">
+      <number>0</number>
+     </property>
+     <property name="value">
+      <number>-1</number>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
--- a/src/installerprompt.cpp
+++ b/src/installerprompt.cpp
@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2022-2023 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+ * Copyright (C) 2024      Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>
 * Authored by: Simon Quigley <tsimonq2@lubuntu.me>
 *              Aaron Rainbolt <arraybolt3@lubuntu.me>
 *
@ -13,8 +14,6 @@
 * GNU General Public License for more details.
 */

-#include <KBusyIndicatorWidget>
-#include <KLed>
 #include <NetworkManagerQt/ConnectionSettings>
 #include <NetworkManagerQt/Manager>
 #include <NetworkManagerQt/Device>
@ -27,10 +26,16 @@
 #include <NetworkManagerQt/Settings>
 #include <QProcess>
 #include <QScreen>
-#include <QMessageBox>
+#include <QTimer>
+#include <QFile>
 #include <QUuid>
+#include <QPainter>
 #include <QDBusPendingReply>
 #include "installerprompt.h"
+#include "wifipassworddialog.h"
+#include "languagechangedialog.h"
+#include "warningdialog.h"
+#include "connectionprogressdialog.h"
 #include "./ui_installerprompt.h"

 InstallerPrompt::InstallerPrompt(QWidget *parent)
@ -38,137 +43,302 @@ InstallerPrompt::InstallerPrompt(QWidget *parent)
    , ui(new Ui::InstallerPrompt) {
    ui->setupUi(this);

-    // Hide the Incorrect Password and loading text
-    ui->incorrectPassword->setVisible(false);
-    ui->changingLanguageLabel->setVisible(false);
-    ui->changingLanguageLoader->setVisible(false);
+    cpd = new ConnectionProgressDialog();

+    initLanguageComboBox();
+
+    connect(ui->tryLubuntu, &QPushButton::clicked, this, &InstallerPrompt::onTryClicked);
+    connect(ui->installLubuntu, &QPushButton::clicked, this, &InstallerPrompt::onInstallClicked);
+    connect(ui->languageComboBox, SIGNAL(activated(int)), this, SLOT(onLanguageSelected(int)));
+    connect(ui->networkComboBox, SIGNAL(activated(int)), this, SLOT(onNetworkSelected(int)));
+
+    auto nm = NetworkManager::notifier();
+    connect(nm, &NetworkManager::Notifier::deviceAdded, this, &InstallerPrompt::updateConnectionInfo);
+    connect(nm, &NetworkManager::Notifier::deviceRemoved, this, &InstallerPrompt::updateConnectionInfo);
+    connect(nm, &NetworkManager::Notifier::activeConnectionsChanged, this, &InstallerPrompt::updateConnectionInfo);
+    connect(nm, &NetworkManager::Notifier::wirelessEnabledChanged, this, &InstallerPrompt::updateConnectionInfo);
+    connect(nm, &NetworkManager::Notifier::activeConnectionAdded, this, &InstallerPrompt::updateConnectionInfo);
+    connect(nm, &NetworkManager::Notifier::connectivityChanged, this, &InstallerPrompt::updateConnectionInfo);
+    connect(nm, &NetworkManager::Notifier::primaryConnectionChanged, this, &InstallerPrompt::updateConnectionInfo);
+
+    QTimer *repeater = new QTimer();
+    connect(repeater, SIGNAL(timeout()), this, SLOT(updateConnectionInfo()));
+    repeater->start(15000);
+    
+    updateConnectionInfo();
+}
+
+InstallerPrompt::~InstallerPrompt()
+{
+
+}
+
+void InstallerPrompt::activateBackground()
+{
    // Set the background image and scale it
-    QPixmap bg(":/background");
-    if (bg.isNull()) {
-        QMessageBox::warning(this, tr("Error"), tr("Background image cannot be loaded."));
+    QImage rawImage(":/background");
+    if (rawImage.isNull()) {
+        WarningDialog::showWarning(tr("Background image cannot be loaded."));
        return;
    }

-    QScreen *screen = QGuiApplication::primaryScreen();
-    QRect screenGeometry = screen->geometry();
-    bg = bg.scaled(screenGeometry.size(), Qt::IgnoreAspectRatio);
-    
-    QPalette palette;
-    palette.setBrush(QPalette::Window, bg);
-    this->setPalette(palette);
-
-    // Initialize process for external app launch
-    process = new QProcess(this);
-
-    // Set up signal-slot connections for buttons
-    connect(ui->tryLubuntu, &QAbstractButton::clicked, this, &InstallerPrompt::tryLubuntu);
-    connect(ui->installLubuntu, &QAbstractButton::clicked, this, &InstallerPrompt::installLubuntu);
-    connect(ui->connectWiFiButton, &QAbstractButton::clicked, this, &InstallerPrompt::onConnectWifiClicked);
-    connect(ui->confirmButton, &QAbstractButton::clicked, this, &InstallerPrompt::onLanguageConfirm);
-
-    // Set up the language combo box with available languages
-    initLanguageComboBox();
-
-    // Connect the appropriate language slots
-    connect(ui->languageComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(onLanguageChanged(int)));
-
-    // Check initial network status and update UI
-    updateConnectionStatus();
-
-    // Find and store the Wi-Fi device
-    foreach (const NetworkManager::Device::Ptr &device, NetworkManager::networkInterfaces()) {
-        if (device->type() == NetworkManager::Device::Wifi) {
-            wifiDevice = device.objectCast<NetworkManager::WirelessDevice>();
-            connect(wifiDevice.data(), &NetworkManager::Device::stateChanged, this, &InstallerPrompt::handleWiFiConnectionChange);
-            break;
-        }
+    qreal imgRatio = static_cast<qreal>(rawImage.width()) / rawImage.height();
+    qreal screenRatio = static_cast<qreal>(this->width()) / this->height();
+    QImage scaled;
+    if (imgRatio < screenRatio) {
+        scaled = rawImage.scaledToWidth(this->width(), Qt::SmoothTransformation);
+        int yGap = (scaled.height() - this->height()) / 2;
+        scaled = scaled.copy(0, yGap, scaled.width(), this->height());
+    } else {
+        scaled = rawImage.scaledToHeight(this->height(), Qt::SmoothTransformation);
+        int xGap = (scaled.width() - this->width()) / 2;
+        scaled = scaled.copy(xGap, 0, this->width(), scaled.height());
    }
-
-    // Set up network manager signals for dynamic updates
-    auto nm = NetworkManager::notifier();
-    connect(nm, &NetworkManager::Notifier::deviceAdded, this, &InstallerPrompt::updateConnectionStatus);
-    connect(nm, &NetworkManager::Notifier::deviceRemoved, this, &InstallerPrompt::updateConnectionStatus);
-    connect(nm, &NetworkManager::Notifier::activeConnectionsChanged, this, &InstallerPrompt::updateConnectionStatus);
-    connect(nm, &NetworkManager::Notifier::wirelessEnabledChanged, this, &InstallerPrompt::updateConnectionStatus);
-    connect(nm, &NetworkManager::Notifier::activeConnectionAdded, this, &InstallerPrompt::updateConnectionStatus);
-    connect(nm, &NetworkManager::Notifier::connectivityChanged, this, &InstallerPrompt::updateConnectionStatus);
-    connect(nm, &NetworkManager::Notifier::primaryConnectionChanged, this, &InstallerPrompt::updateConnectionStatus);
+    background = scaled;
 }

-void InstallerPrompt::updateConnectionStatus() {
-    auto status = NetworkManager::status();
-    bool online = false;
-    QString statusText;
+void InstallerPrompt::onTryClicked()
+{
+    QApplication::quit();
+}

-    switch (status) {
-        case NetworkManager::Status::Disconnected:
-        case NetworkManager::ConnectedLinkLocal:
-        case NetworkManager::Asleep:
-            statusText = tr("Not Connected");
-            ui->connectionLED->setColor(Qt::red);
-            ui->connectionLED->setState(KLed::Off);
-            break;
-        case NetworkManager::Status::Connected:
-            online = true;
-            statusText = tr("Connected");
-            ui->connectionLED->setColor(Qt::green);
-            ui->connectionLED->setState(KLed::On);
-            break;
-        case NetworkManager::Status::Connecting:
-            statusText = tr("Connecting...");
-            ui->connectionLED->setColor(Qt::yellow);
-            ui->connectionLED->setState(KLed::On);
-            break;
-        case NetworkManager::Status::Disconnecting:
-            statusText = tr("Disconnecting...");
-            ui->connectionLED->setColor(Qt::yellow);
-            ui->connectionLED->setState(KLed::On);
-            break;
-        default:
-            qDebug() << "Unknown status:" << status;
-            statusText = tr("Unknown Status");
-            ui->connectionLED->setColor(Qt::gray);
-            ui->connectionLED->setState(KLed::Off);
-            break;
+void InstallerPrompt::onInstallClicked()
+{
+    ui->tryLubuntu->setEnabled(false);
+    ui->installLubuntu->setEnabled(false);
+    ui->tryLubuntu->setToolTip("");
+    ui->installLubuntu->setToolTip("");
+    ui->languageComboBox->setEnabled(false);
+    QProcess *calamares = new QProcess(this);
+    calamares->setProgram("/usr/bin/sudo");
+    calamares->setArguments(QStringList() << "-E" << "calamares" << "-D8");
+    calamares->start();
+
+    // If Calamares exits, it either crashed or the user cancelled the installation. Exit the installer prompt (and start LXQt).
+    connect(calamares, SIGNAL(finished(int)), this, SLOT(onTryClicked()));
+}
+
+void InstallerPrompt::onLanguageSelected(int index)
+{
+    QString selectedLanguage = ui->languageComboBox->itemText(index);
+    QString localeName = languageLocaleMap.value(selectedLanguage);
+    qDebug() << selectedLanguage << localeName;
+
+    // Split the locale name to get language and country code
+    QStringList localeParts = localeName.split('_');
+    QString languageCode = localeParts.value(0);
+    QString countryCode = localeParts.value(1);
+
+    // If there is no internet connection and we don't ship the langpack, tell them
+    QStringList allowedLanguages = {"zh-hans", "hi", "es", "fr", "ar", "en"};
+
+    bool only_lxqt = false;
+    if (!allowedLanguages.contains(languageCode) && NetworkManager::status() != NetworkManager::Status::Connected) {
+        only_lxqt = true;
    }

-    ui->connectionStatusLabel->setText(statusText);
- 
-    const auto devices = NetworkManager::networkInterfaces();
-    bool wifiEnabled = false;
+    // Some of the LibreOffice language packs need special-casing, do that here
+    QString libreOfficeLang;
+    if (localeParts[0] == "zh") {
+        libreOfficeLang = (countryCode == "CN" || countryCode == "SG" || countryCode == "MY") ? "zh-cn" : "zh-tw";
+    } else {
+        static const QMap<QString, QString> localeMap = {
+            {"en_GB", "en-gb"}, {"en_ZA", "en-za"}, {"pa_IN", "pa-in"}, {"pt_BR", "pt-br"}
+        };
+        libreOfficeLang = localeMap.value(localeParts.join('_'), languageCode);
+    }
+
+    // Construct the command to run the script with parameters
+    QProcess *process = new QProcess(this);
+    QStringList arguments;
+
+    process->setProgram("sudo");
+    arguments << "/usr/libexec/change-system-language" << languageCode << countryCode << libreOfficeLang;
+    if (only_lxqt) arguments << "1";
+    process->setArguments(arguments);
+
+    connect(process, &QProcess::errorOccurred, this, &InstallerPrompt::languageProcessError);
+    process->start();
+
+    LanguageChangeDialog lcd;
+    lcd.exec();
+}
+
+void InstallerPrompt::languageProcessError(QProcess::ProcessError error) {
+    qDebug() << "Process failed with error:" << error;
+}
+
+void InstallerPrompt::onNetworkSelected(int index)
+{
+    QString networkId = ui->networkComboBox->itemData(index).toString();
+    if (!networkId.isNull()) {
+        if (networkId.left(4) == "UNI_") { // this is an Ethernet device
+            QString deviceUni = networkId.right(networkId.length() - 4);
+            NetworkManager::WiredDevice wiredDevice(deviceUni);
+            QDBusPendingReply reply = wiredDevice.disconnectInterface();
+            reply.waitForFinished();
+
+            NetworkManager::Connection::List availableConnections = wiredDevice.availableConnections();
+            if (availableConnections.count() > 0) {
+                QString ethernetName = ui->networkComboBox->itemText(index).split(":")[0];
+                NetworkManager::activateConnection(availableConnections[0]->path(), wiredDevice.uni(), QString());
+                cpd->setNetworkName(ethernetName);
+            } else {
+                WarningDialog::showWarning(tr("Selected Ethernet device has no network!"));
+            }
+        } else { // this is a Wifi connection
+            wifiSsid = networkId.right(networkId.length() - 4);
+            bool isPasswordProtected = true;
+
+            for (const auto &network : wifiDevice->networks()) {
+                if (network->ssid() == wifiSsid) {
+                    NetworkManager::AccessPoint::Ptr ap = network->referenceAccessPoint();
+                    if (!ap->capabilities().testFlag(NetworkManager::AccessPoint::Privacy)) {
+                        isPasswordProtected = false;
+                    }
+                }
+            }
+
+            QDBusPendingReply reply = wifiDevice->disconnectInterface();
+            reply.waitForFinished();
+            NetworkManager::Connection::Ptr targetConnection;
+
+            foreach (const NetworkManager::Connection::Ptr &connection, NetworkManager::listConnections()) {
+                if (connection->settings()->connectionType() == NetworkManager::ConnectionSettings::Wireless) {
+                    auto wirelessSetting = connection->settings()->setting(NetworkManager::Setting::Wireless).dynamicCast<NetworkManager::WirelessSetting>();
+                    if (wirelessSetting && wirelessSetting->ssid() == wifiSsid) {
+                        targetConnection = connection;
+                    }
+                }
+            }
+
+            if (targetConnection) {
+                NetworkManager::activateConnection(targetConnection->path(), wifiDevice->uni(), QString());
+                cpd->setNetworkName(wifiSsid);
+            } else {
+                NMVariantMapMap wifiSettings;
+                if (!wifiDevice) {
+                    qWarning() << "WiFi device not found. Unable to set interface name.";
+                    return;
+                }
+                NetworkManager::ConnectionSettings::Ptr newConnectionSettings(new NetworkManager::ConnectionSettings(NetworkManager::ConnectionSettings::Wireless));
+                newConnectionSettings->setId(wifiSsid);
+                newConnectionSettings->setUuid(NetworkManager::ConnectionSettings::createNewUuid());
+                newConnectionSettings->setInterfaceName(wifiDevice->interfaceName());
+                QVariantMap wirelessSetting;
+                wirelessSetting.insert("ssid", wifiSsid.toUtf8());
+                wifiSettings.insert("802-11-wireless", wirelessSetting);
+                const auto settingsMap = newConnectionSettings->toMap();
+                for (const auto &key : settingsMap.keys()) {
+                    QVariant value = settingsMap.value(key);
+                    wifiSettings.insert(key, value.toMap());
+                }
+
+                if (isPasswordProtected) {
+                    WifiPasswordDialog wpd(wifiSsid);
+                    wpd.exec();
+                    QString password = wpd.getPassword();
+                    if (password.isEmpty()) {
+                        return;
+                    }
+                    QVariantMap wirelessSecurity;
+                    wirelessSecurity["key-mgmt"] = "wpa-psk";
+                    wirelessSecurity["psk"] = password;
+                    wifiSettings["802-11-wireless-security"] = wirelessSecurity;
+                }
+
+                QDBusPendingReply<QDBusObjectPath> reply = NetworkManager::addConnection(wifiSettings);
+                reply.waitForFinished();
+                if (reply.isError()) {
+                    WarningDialog::showWarning(tr("Failed to add WiFi connection."));
+                    return;
+                }
+
+                QDBusObjectPath path = reply.value();
+                NetworkManager::activateConnection(path.path(), wifiDevice->uni(), QString());
+                cpd->setNetworkName(wifiSsid);
+            }
+        }
+    }
+}
+
+void InstallerPrompt::updateConnectionInfo()
+{
+    ui->networkComboBox->clear();
+    int ethDevices = 0;
+    int connectedDevice = 0;
+    bool hitConnectedNetwork = false;
    if (NetworkManager::isNetworkingEnabled()) {
-      for (const auto &device : devices) {
-          if (device->type() == NetworkManager::Device::Wifi && NetworkManager::isWirelessEnabled()) wifiEnabled = true;
-      }
+        for (const auto &device : NetworkManager::networkInterfaces()) {
+            if (device->type() == NetworkManager::Device::Ethernet) {
+                ethDevices++;
+                bool isDeviceConnected = device->state() == NetworkManager::Device::Activated;
+                if (isDeviceConnected) {
+                    hitConnectedNetwork = true;
+                }
+                QString isConnected = isDeviceConnected ? tr("Connected") : tr("Disconnected");
+                if (!hitConnectedNetwork) {
+                    connectedDevice++;
+                }
+                ui->networkComboBox->addItem(tr("Ethernet %1: %2").arg(ethDevices).arg(isConnected), QString("UNI_") + device->uni());
+            } else if (device->type() == NetworkManager::Device::Wifi && NetworkManager::isWirelessEnabled() && !hitWifiDevice) {
+                hitWifiDevice = true;
+                wifiDevice = device.staticCast<NetworkManager::WirelessDevice>();
+                connect(wifiDevice.data(), &NetworkManager::Device::stateChanged, this, &InstallerPrompt::handleWiFiConnectionChange);
+            }
+        }
+        if (hitWifiDevice) {
+            NetworkManager::ActiveConnection::Ptr activeConnection = wifiDevice->activeConnection();
+            NetworkManager::Connection::Ptr underlyingActiveConnection;
+            if (activeConnection != nullptr) {
+                underlyingActiveConnection = activeConnection->connection();
+            }
+            for (const auto &network : wifiDevice->networks()) {
+                QString ssid = network->ssid();
+                bool isNetworkConnected = false;
+                if (activeConnection != nullptr && activeConnection->state() == NetworkManager::ActiveConnection::Activated) {
+                    NetworkManager::WirelessSetting::Ptr underlyingWirelessSetting = underlyingActiveConnection->settings()->setting(NetworkManager::Setting::Wireless).staticCast<NetworkManager::WirelessSetting>();
+                    if (network->ssid() == QString(underlyingWirelessSetting->ssid())) {
+                        isNetworkConnected = true;
+                        hitConnectedNetwork = true;
+                    }
+                }
+                QString isConnected = isNetworkConnected ? tr("Connected") : tr("Disconnected");
+                if (!hitConnectedNetwork) {
+                    connectedDevice++;
+                }
+                ui->networkComboBox->addItem(tr("WiFi %1: %2").arg(ssid).arg(isConnected), QString("SSID") + ssid);
+            }
+        }
+    }
+    if (hitConnectedNetwork) {
+        ui->networkComboBox->setCurrentIndex(connectedDevice);
    }

-    bool connectable = !online && wifiEnabled;
-    if (connectable) refreshNetworkList();
-
-    ui->connectWiFiButton->setVisible(connectable);
-    ui->WiFiLabel->setVisible(connectable);
-    ui->networkComboBox->setVisible(connectable);
-    ui->WiFiInfoLabel->setVisible(connectable);
-    ui->WiFiSpacer->changeSize(connectable ? 40 : 0, connectable ? 20 : 0, QSizePolicy::Fixed, QSizePolicy::Fixed);
+    if (!firstUpdateConnectionInfoCall) {
+        if (NetworkManager::status() == NetworkManager::Connecting) {
+            cpd->exec();
+        } else {
+            cpd->done(0);
+        }
+    } else {
+        firstUpdateConnectionInfoCall = false;
+    }
 }

 void InstallerPrompt::handleWiFiConnectionChange(NetworkManager::Device::State newstate, NetworkManager::Device::State oldstate, NetworkManager::Device::StateChangeReason reason)
 {
-    QMutexLocker locker(&wifiChangeMutex);
    if (reason == NetworkManager::Device::NoSecretsReason && !wifiWrongHandling) {
        wifiWrongHandling = true;
-        qDebug() << wifiSSID;
-        
+
        foreach (const NetworkManager::Connection::Ptr &connection, NetworkManager::listConnections()) {
            if (connection->settings()->connectionType() == NetworkManager::ConnectionSettings::Wireless) {
                auto wirelessSetting = connection->settings()->setting(NetworkManager::Setting::Wireless).dynamicCast<NetworkManager::WirelessSetting>();
-                if (wirelessSetting && wirelessSetting->ssid() == wifiSSID) {
-                    qDebug() << "Wiping connection with wrong password: " << wifiSSID;
-                    // Show the Incorrect Password text
-                    ui->incorrectPassword->setVisible(true);
+                if (wirelessSetting && wirelessSetting->ssid() == wifiSsid) {
+                    qDebug() << "Wiping connection with wrong password: " << wifiSsid;
                    QDBusPendingReply removeReply = connection->remove();
                    removeReply.waitForFinished();
+                    WarningDialog::showWarning(tr("WiFi password was incorrect."));
                }
            }
        }
@ -176,231 +346,6 @@ void InstallerPrompt::handleWiFiConnectionChange(NetworkManager::Device::State n
    }
 }

-NetworkManager::Connection::Ptr InstallerPrompt::findConnectionBySsid(const QString &ssid) {
-    foreach (const NetworkManager::Connection::Ptr &connection, NetworkManager::listConnections()) {
-        if (connection->settings()->connectionType() == NetworkManager::ConnectionSettings::Wireless) {
-            auto wirelessSetting = connection->settings()->setting(NetworkManager::Setting::Wireless).dynamicCast<NetworkManager::WirelessSetting>();
-            if (wirelessSetting && wirelessSetting->ssid() == ssid) {
-                return connection;
-            }
-        }
-    }
-    return NetworkManager::Connection::Ptr(); // Return null pointer if not found
-}
-
-QString InstallerPrompt::promptForWifiPassword(const QString &ssid, bool isWrongPassword) {
-    QDialog passwordDialog(this);
-    passwordDialog.setModal(true);
-    passwordDialog.setWindowTitle(tr("Wi-Fi Password Required"));
-    passwordDialog.setWindowIcon(QIcon::fromTheme("network-wireless"));
-    passwordDialog.setStyleSheet("QLabel { color: black; } ");
-    passwordDialog.setMinimumWidth(250);
-    passwordDialog.setMinimumHeight(120);
-    passwordDialog.setMaximumWidth(5000);
-    passwordDialog.setMaximumHeight(500);
-
-    QVBoxLayout layout;
-    QLabel passwordLabel(tr("Enter password for \"%1\":").arg(ssid), &passwordDialog);
-    QLineEdit passwordLineEdit(&passwordDialog);
-    QPushButton passwordButton(tr("Connect"), &passwordDialog);
-
-    passwordLineEdit.setEchoMode(QLineEdit::Password);
-    layout.addWidget(&passwordLabel);
-    layout.addWidget(&passwordLineEdit);
-    layout.addWidget(&passwordButton);
-
-    passwordDialog.setLayout(&layout);
-
-    // Connect with a lambda function for inline validation
-    connect(&passwordLineEdit, &QLineEdit::textChanged, this, [&passwordLineEdit](const QString &text) {
-        int minLength = 8;
-        int maxLength = 64;
-        bool isValid = text.length() >= minLength && text.length() <= maxLength;
-        passwordLineEdit.setStyleSheet(isValid ? "" : "border: 1px solid red;");
-    });
-
-    connect(&passwordButton, &QPushButton::clicked, &passwordDialog, &QDialog::accept);
-
-    if (passwordDialog.exec() == QDialog::Accepted) {
-        return passwordLineEdit.text();
-    }
-
-    return QString();
-}
-
-void InstallerPrompt::handleWifiConnection(const QString &ssid, bool recoverFromWrongPassword) {
-    ui->incorrectPassword->setVisible(false);
-    ui->networkComboBox->setEnabled(false);
-    wifiSSID = ssid;
-    qDebug() << "Attempting to find connection for SSID:" << ssid;
-
-    // Check for existing connection
-    NetworkManager::Connection::Ptr connection = findConnectionBySsid(ssid);
-    if (connection && !recoverFromWrongPassword) {
-        qDebug() << "Using existing connection for:" << ssid;
-        NetworkManager::activateConnection(connection->path(), wifiDevice->uni(), QString());
-        ui->networkComboBox->setEnabled(true);
-        return;
-    }
-
-    // Prompt for Wi-Fi password
-    QString password = promptForWifiPassword(ssid);
-    if (password.isEmpty()) {
-        ui->networkComboBox->setEnabled(true);
-        return;
-    }
-
-    // Create new Wi-Fi connection
-    NMVariantMapMap settings = createSettingsBySSID(ssid);
-    if (settings.isEmpty()) {
-        QMessageBox::warning(this, tr("Error"), tr("Failed to create Wi-Fi settings."));
-        ui->networkComboBox->setEnabled(true);
-        return;
-    }
-
-    // Update the wireless security settings
-    QVariantMap wirelessSecurity;
-    wirelessSecurity["key-mgmt"] = "wpa-psk";
-    wirelessSecurity["psk"] = password;
-    settings["802-11-wireless-security"] = wirelessSecurity;
-
-    // Add the new connection
-    QDBusPendingReply<QDBusObjectPath> reply = NetworkManager::addConnection(settings);
-    reply.waitForFinished();
-    if (reply.isError()) {
-        QMessageBox::warning(this, tr("Error"), tr("Failed to add Wi-Fi connection."));
-        ui->networkComboBox->setEnabled(true);
-        return;
-    }
-
-    // Activate the new connection
-    QDBusObjectPath path = reply.value();
-    NetworkManager::activateConnection(path.path(), wifiDevice->uni(), QString());
-    ui->networkComboBox->setEnabled(true);
-}
-
-NMVariantMapMap InstallerPrompt::createSettingsBySSID(const QString &ssid) {
-    NMVariantMapMap convertedSettings;
-
-    if (!wifiDevice) {
-        qWarning() << "Wi-Fi device not found. Unable to set interface name.";
-        return convertedSettings;
-    }
-
-    NetworkManager::ConnectionSettings::Ptr newConnectionSettings(new NetworkManager::ConnectionSettings(NetworkManager::ConnectionSettings::Wireless));
-    newConnectionSettings->setId(ssid);
-    newConnectionSettings->setUuid(NetworkManager::ConnectionSettings::createNewUuid());
-    newConnectionSettings->setInterfaceName(wifiDevice->interfaceName());
-
-    // Configure wireless settings
-    QVariantMap wirelessSetting;
-    wirelessSetting.insert("ssid", ssid.toUtf8());
-    convertedSettings.insert("802-11-wireless", wirelessSetting);
-
-    // Convert other settings
-    const auto settingsMap = newConnectionSettings->toMap();
-    for (const auto &key : settingsMap.keys()) {
-        QVariant value = settingsMap.value(key);
-        convertedSettings.insert(key, value.toMap());
-    }
-
-    return convertedSettings;
-}
-
-void InstallerPrompt::onConnectWifiClicked() {
-    QString selectedSSID = ui->networkComboBox->currentText();
-    handleWifiConnection(selectedSSID);
-}
-
-void InstallerPrompt::showWifiOptions() {
-    bool foundWifiDevice = false;
-    for (const NetworkManager::Device::Ptr &device : NetworkManager::networkInterfaces()) {
-        if (device->type() == NetworkManager::Device::Wifi) {
-            foundWifiDevice = true;
-            auto wifiDevice = device.staticCast<NetworkManager::WirelessDevice>();
-            ui->networkComboBox->clear();  // Use the combo box from the UI file, clear existing items
-            for (const NetworkManager::WirelessNetwork::Ptr &network : wifiDevice->networks()) {
-                ui->networkComboBox->addItem(network->ssid());  // Add Wi-Fi networks to the combo box
-            }
-            break;  // Handle the first Wi-Fi device
-        }
-    }
-
-    if (!foundWifiDevice) {
-        QMessageBox::information(this, tr("WiFi Not Available"), tr("No WiFi devices were found on this system."));
-    }
-}
-
-void InstallerPrompt::refreshNetworkList() {
-    NetworkManager::WirelessDevice::Ptr wirelessDevice;
-
-    // Iterate over network interfaces to find a wireless device
-    const auto devices = NetworkManager::networkInterfaces();
-    for (const auto &device : devices) {
-        if (device->type() == NetworkManager::Device::Wifi) {
-            wirelessDevice = device.staticCast<NetworkManager::WirelessDevice>();
-            break; // Break after finding the first wireless device
-        }
-    }
-
-    if (!wirelessDevice) {
-        // No wireless device found, handle appropriately
-        ui->networkComboBox->setVisible(false);
-        ui->connectWiFiButton->setVisible(false);
-        return;
-    }
-
-    QMap<QString, NetworkManager::WirelessNetwork::Ptr> tempWifiNetworkMap;
-    QStringList ssidList;
-
-    const auto networks = wirelessDevice->networks();
-    for (const auto &network : networks) {
-        QString ssid = network->ssid();
-        tempWifiNetworkMap[ssid] = network;
-        ssidList.append(ssid);
-    }
-
-    // Update the main map and combo box only after the new list is ready
-    ui->networkComboBox->clear();
-    ui->networkComboBox->addItems(ssidList);
-
-    // Adjust visibility
-    ui->networkComboBox->setVisible(!networks.isEmpty());
-    ui->connectWiFiButton->setVisible(!networks.isEmpty());
-}
-
-QString InstallerPrompt::getDisplayNameForLocale(const QLocale &locale) {
-    auto sanitize = [](QString s) -> QString {
-        s.replace("St.", "Saint", Qt::CaseInsensitive);
-        s.replace("&", "and", Qt::CaseInsensitive);
-        return s;
-    };
-
-    QLocale currentAppLocale = QLocale::system();
-    QString nativeName = locale.nativeLanguageName();
-    QString nativeCountryName = sanitize(locale.nativeCountryName());
-    QString englishLanguageName = currentAppLocale.languageToString(locale.language());
-    QString englishCountryName = sanitize(currentAppLocale.countryToString(locale.country()));
-
-    if (nativeName.isEmpty() || nativeCountryName.isEmpty()) {
-        return QString();
-    }
-
-    // Rename "American English" to "English"
-    if (locale.language() == QLocale::English) {
-        nativeName = "English";
-        englishLanguageName = "English";
-    }
-
-    QString displayName = nativeName + " (" + nativeCountryName + ")";
-    if (nativeName.compare(englishLanguageName, Qt::CaseInsensitive) != 0 &&
-        nativeCountryName.compare(englishCountryName, Qt::CaseInsensitive) != 0) {
-        displayName += " - " + englishLanguageName + " (" + englishCountryName + ")";
-    }
-
-    return displayName;
-}
-
 void InstallerPrompt::initLanguageComboBox() {
    languageLocaleMap.clear();
    QStringList languages = getAvailableLanguages();
@ -425,9 +370,34 @@ void InstallerPrompt::initLanguageComboBox() {

 QStringList InstallerPrompt::getAvailableLanguages() {
    QMap<QString, QString> language_map; // Default sorting by QString is case-sensitive
+    QStringList supported_languages;
+
+    QFile supported_locale_file("/usr/share/i18n/SUPPORTED");
+    char lineBuf[2048];
+    if (supported_locale_file.open(QFile::ReadOnly)) {
+        while (!supported_locale_file.atEnd()) {
+            supported_locale_file.readLine(lineBuf, 2048);
+            QString line(lineBuf);
+            if (!line.contains("UTF-8")) continue;
+            QStringList lineParts = line.split('.');
+            if (lineParts.count() == 1) {
+                lineParts = line.split(' ');
+                if (lineParts.count() == 1) {
+                    WarningDialog::showWarning(tr("Something has gone very wrong trying to parse the list of supported languages!"));
+                }
+            }
+            supported_languages.append(lineParts[0]);
+        }
+        supported_locale_file.close();
+    }

    QList<QLocale> all_locales = QLocale::matchingLocales(QLocale::AnyLanguage, QLocale::AnyScript, QLocale::AnyCountry);
    for (const QLocale &locale : all_locales) {
+        QString check_locale_name = locale.name();
+        if (check_locale_name.contains(".UTF-8")) {
+            check_locale_name = check_locale_name.left(check_locale_name.length() - 6);
+        }
+        if (!supported_languages.contains(check_locale_name)) continue;
        QString display_name = getDisplayNameForLocale(locale);
        if (display_name.isEmpty()) continue;

@ -449,93 +419,39 @@ QStringList InstallerPrompt::getAvailableLanguages() {
    return sorted_languages;
 }

-void InstallerPrompt::onLanguageChanged(int index) {
-    selectedLanguage = ui->languageComboBox->itemText(index);
-}
+QString InstallerPrompt::getDisplayNameForLocale(const QLocale &locale) {
+    auto sanitize = [](QString s) -> QString {
+        s.replace("St.", "Saint", Qt::CaseInsensitive);
+        s.replace("&", "and", Qt::CaseInsensitive);
+        return s;
+    };

-void InstallerPrompt::onLanguageConfirm() {
-    ui->changingLanguageLabel->setVisible(true);
-    ui->changingLanguageLoader->setVisible(true);
-    ui->languageComboBox->setEnabled(false);
-    ui->tryLubuntu->setEnabled(false);
-    ui->installLubuntu->setEnabled(false);
+    QLocale currentAppLocale = QLocale::system();
+    QString nativeName = locale.nativeLanguageName();
+    QString nativeCountryName = sanitize(locale.nativeTerritoryName());
+    QString englishLanguageName = currentAppLocale.languageToString(locale.language());
+    QString englishCountryName = sanitize(currentAppLocale.territoryToString(locale.territory()));

-    localeName = languageLocaleMap.value(selectedLanguage);
-    qDebug() << selectedLanguage << localeName;
-
-    // Split the locale name to get language and country code
-    QStringList localeParts = localeName.split('_');
-    QString languageCode = localeParts.value(0);
-    QString countryCode = localeParts.value(1);
-
-    // If there is no internet connection and we don't ship the langpack, tell them
-    QStringList allowedLanguages = {"zh-hans", "hi", "es", "fr", "ar", "en"};
-    bool only_lxqt = false;
-    if (!allowedLanguages.contains(languageCode) && NetworkManager::status() != NetworkManager::Status::Connected) {
-        ui->changingLanguageLabel->setText(tr("Unable to download full language support, changing anyway..."));
-        only_lxqt = true;
-    } else {
-        ui->changingLanguageLabel->setText(tr("Changing language..."));
+    if (nativeName.isEmpty() || nativeCountryName.isEmpty()) {
+        return QString();
    }

-    // Some of the LibreOffice language packs need special-casing, do that here
-    QString libreOfficeLang;
-    if (localeParts[0] == "zh") {
-        libreOfficeLang = (countryCode == "CN" || countryCode == "SG" || countryCode == "MY") ? "zh-cn" : "zh-tw";
-    } else {
-        static const QMap<QString, QString> localeMap = {
-            {"en_GB", "en-gb"}, {"en_ZA", "en-za"}, {"pa_IN", "pa-in"}, {"pt_BR", "pt-br"}
-        };
-        libreOfficeLang = localeMap.value(localeParts.join('_'), languageCode);
+    // Rename "American English" to "English"
+    if (locale.language() == QLocale::English) {
+        nativeName = "English";
+        englishLanguageName = "English";
    }

-    // Construct the command to run the script with parameters
-    QProcess *process = new QProcess(this);
-    QStringList arguments;
+    QString displayName = nativeName + " (" + nativeCountryName + ")";
+    if (nativeName.compare(englishLanguageName, Qt::CaseInsensitive) != 0 &&
+        nativeCountryName.compare(englishCountryName, Qt::CaseInsensitive) != 0) {
+        displayName += " - " + englishLanguageName + " (" + englishCountryName + ")";
+    }

-    process->setProgram("/usr/libexec/change-system-language");
-    arguments << languageCode << countryCode << libreOfficeLang;
-    if (only_lxqt) arguments << "1";
-    process->setArguments(arguments);
-
-    connect(process, static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this, &InstallerPrompt::languageProcessFinished);
-    connect(process, &QProcess::errorOccurred, this, &InstallerPrompt::languageProcessError);
-    process->start();
+    return displayName;
 }

-void InstallerPrompt::languageProcessFinished(int exitCode, QProcess::ExitStatus exitStatus) {
-    qDebug() << "Process finished. Exit code:" << exitCode << "Exit status:" << exitStatus;
-    ui->changingLanguageLabel->setVisible(false);
-    ui->changingLanguageLoader->setVisible(false);
-    ui->languageComboBox->setEnabled(true);
-    ui->tryLubuntu->setEnabled(true);
-    ui->installLubuntu->setEnabled(true);
-}
-
-void InstallerPrompt::languageProcessError(QProcess::ProcessError error) {
-    qDebug() << "Process failed with error:" << error;
-}
-
-void InstallerPrompt::tryLubuntu()
-{
-    QApplication::quit();
-}
-
-void InstallerPrompt::installLubuntu()
-{
-    ui->tryLubuntu->setVisible(false);
-    ui->installLubuntu->setVisible(false);
-    ui->confirmButton->setVisible(false);
-    ui->languageComboBox->setEnabled(false);
-    QProcess *calamares = new QProcess(this);
-    QStringList args;
-    calamares->start("/usr/libexec/lubuntu-installer", args);
-
-    // If Calamares exits, it either crashed or the user cancelled the installation. Exit the installer prompt (and start LXQt).
-    connect(calamares, SIGNAL(finished(int)), this, SLOT(tryLubuntu()));
-}
-
-InstallerPrompt::~InstallerPrompt()
-{
-    delete ui;
+void InstallerPrompt::paintEvent(QPaintEvent *event) {
+    QPainter painter(this);
+    painter.drawImage(0, 0, background);
 }
--- a/src/installerprompt.h
+++ b/src/installerprompt.h
@ -10,10 +10,14 @@
 #include <QMutex>
 #include <QLineEdit>
 #include <QProcess>
+#include <QImage>
 #include <NetworkManagerQt/Device>
 #include <NetworkManagerQt/WirelessDevice>
+#include <NetworkManagerQt/WiredDevice>
 #include <NetworkManagerQt/WirelessNetwork>

+class ConnectionProgressDialog;
+
 namespace Ui { class InstallerPrompt; }

 class InstallerPrompt : public QMainWindow {
@ -22,40 +26,32 @@ class InstallerPrompt : public QMainWindow {
 public:
    explicit InstallerPrompt(QWidget *parent = nullptr);
    ~InstallerPrompt() override;
+    void activateBackground();

 private slots:
-    void refreshNetworkList();
-    void onLanguageChanged(int index);
-    void onLanguageConfirm();
-    void onConnectWifiClicked();
-    void updateConnectionStatus();
+    void onTryClicked();
+    void onInstallClicked();
+    void onLanguageSelected(int index);
+    void onNetworkSelected(int index);
+    void updateConnectionInfo();
    void handleWiFiConnectionChange(NetworkManager::Device::State newstate, NetworkManager::Device::State oldstate, NetworkManager::Device::StateChangeReason reason);
-    void tryLubuntu();
-    void installLubuntu();
-    void languageProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);
    void languageProcessError(QProcess::ProcessError error);

 private:
    Ui::InstallerPrompt *ui;
-    QProcess *process;
+    ConnectionProgressDialog *cpd;
    NetworkManager::WirelessDevice::Ptr wifiDevice;
-    QString wifiSSID;
-    QMutex wifiChangeMutex;
-    NetworkManager::Connection::Ptr findConnectionBySsid(const QString &ssid);
+    bool hitWifiDevice = false;
+    QString wifiSsid;
    bool wifiWrongHandling = false;
-    QLineEdit *passwordLineEdit;
    QMap<QString, QString> languageLocaleMap;
-    QString selectedLanguage = "English (United States)";
-    QString localeName = "en_US";
-    QString getDisplayNameForLocale(const QLocale &locale);
+    bool firstUpdateConnectionInfoCall = true;
+    void paintEvent(QPaintEvent *event) override;

-    void handleWifiConnection(const QString &ssid, bool recoverFromWrongPassword = false);
-    QString promptForWifiPassword(const QString &ssid, bool isWrongPassword = false);
-    void connectToWifi(const QString &ssid, const QString &password, bool recoverFromWrongPassword = false);
    void initLanguageComboBox();
    QStringList getAvailableLanguages();
-    void showWifiOptions();
-    NMVariantMapMap createSettingsBySSID(const QString &ssid);
+    QString getDisplayNameForLocale(const QLocale &locale);
+    QImage background;
 };

 #endif // INSTALLERPROMPT_H
--- a/src/installerprompt.ui
+++ b/src/installerprompt.ui
--- a/src/languagechangedialog.cpp
+++ b/src/languagechangedialog.cpp
@ -0,0 +1,21 @@
+#include "languagechangedialog.h"
+#include "ui_languagechangedialog.h"
+
+#include <QCloseEvent>
+
+LanguageChangeDialog::LanguageChangeDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::LanguageChangeDialog)
+{
+    ui->setupUi(this);
+}
+
+LanguageChangeDialog::~LanguageChangeDialog()
+{
+    delete ui;
+}
+
+void LanguageChangeDialog::closeEvent(QCloseEvent *event)
+{
+    event->ignore();
+}
--- a/src/languagechangedialog.h
+++ b/src/languagechangedialog.h
@ -0,0 +1,25 @@
+#ifndef LANGUAGECHANGEDIALOG_H
+#define LANGUAGECHANGEDIALOG_H
+
+#include <QDialog>
+
+namespace Ui {
+class LanguageChangeDialog;
+}
+
+class LanguageChangeDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit LanguageChangeDialog(QWidget *parent = nullptr);
+    ~LanguageChangeDialog();
+
+protected slots:
+    void closeEvent(QCloseEvent *event) override;
+
+private:
+    Ui::LanguageChangeDialog *ui;
+};
+
+#endif // LANGUAGECHANGEDIALOG_H
--- a/src/languagechangedialog.ui
+++ b/src/languagechangedialog.ui
@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>LanguageChangeDialog</class>
+ <widget class="QDialog" name="LanguageChangeDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>373</width>
+    <height>66</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Lubuntu</string>
+  </property>
+  <property name="windowIcon">
+   <iconset theme="system-software-install"/>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Changing language...</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QProgressBar" name="progressBar">
+     <property name="maximum">
+      <number>0</number>
+     </property>
+     <property name="value">
+      <number>-1</number>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
--- a/src/main.cpp
+++ b/src/main.cpp
@ -40,13 +40,17 @@ int main(int argc, char *argv[])
    for (QScreen *screen : QApplication::screens()) {
        if (screen == QApplication::primaryScreen()) {
            w = new InstallerPrompt();
-	    w->setGeometry(screen->geometry());
+            w->setGeometry(screen->geometry());
+            w->activateBackground();
            w->showFullScreen();
+            w->repaint();
            continue;
        }
        BackgroundScreen *backscreen = new BackgroundScreen();
        backscreen->setGeometry(screen->geometry());
+        backscreen->activateBackground();
        backscreen->showFullScreen();
+        backscreen->repaint();
        bss.append(backscreen);
    }

--- a/src/resource.qrc
+++ b/src/resource.qrc
@ -1,8 +1,10 @@
 <RCC>
    <qresource prefix="/">
-        <file alias="logo">../img/lubuntu-logo.png</file>
        <file alias="background">../img/background.png</file>
        <file alias="installer">../img/installer.png</file>
        <file alias="symbol">../img/symbol.png</file>
+        <file alias="logo">../img/lubuntu-logo.png</file>
+        <file alias="arrow-down">../img/arrow-down.svg</file>
+        <file alias="warning-icon">../img/dialog-warning.svg</file>
    </qresource>
 </RCC>
--- a/src/translations/lubuntu-installer-prompt_ar.ts
+++ b/src/translations/lubuntu-installer-prompt_ar.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_arn.ts
+++ b/src/translations/lubuntu-installer-prompt_arn.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_ast.ts
+++ b/src/translations/lubuntu-installer-prompt_ast.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_bg.ts
+++ b/src/translations/lubuntu-installer-prompt_bg.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_ca.ts
+++ b/src/translations/lubuntu-installer-prompt_ca.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_cs.ts
+++ b/src/translations/lubuntu-installer-prompt_cs.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_cy.ts
+++ b/src/translations/lubuntu-installer-prompt_cy.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_da.ts
+++ b/src/translations/lubuntu-installer-prompt_da.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_de.ts
+++ b/src/translations/lubuntu-installer-prompt_de.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_el.ts
+++ b/src/translations/lubuntu-installer-prompt_el.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_en_GB.ts
+++ b/src/translations/lubuntu-installer-prompt_en_GB.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_eo.ts
+++ b/src/translations/lubuntu-installer-prompt_eo.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_es.ts
+++ b/src/translations/lubuntu-installer-prompt_es.ts
@ -1,146 +1,134 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="es">
-  <context>
+<context>
    <name>InstallerPrompt</name>
    <message>
-      <location filename="../installerprompt.ui" line="20"/>
-      <source>Try or Install Lubuntu</source>
-      <translation>Probar o instalar Lubuntu</translation>
+        <location filename="../installerprompt.ui" line="20"/>
+        <source>Try or Install Lubuntu</source>
+        <translation type="unfinished"></translation>
    </message>
    <message>
-      <location filename="../installerprompt.ui" line="237"/>
-      <source>Select Your Language:</source>
-      <translation>Elige tu idioma:</translation>
+        <location filename="../installerprompt.ui" line="202"/>
+        <source>Select Your Language:</source>
+        <translation type="unfinished"></translation>
    </message>
    <message>
-      <location filename="../installerprompt.ui" line="263"/>
-      <source>✅ Confirm</source>
-      <translation>✅ Confirmar</translation>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
+        <translation type="unfinished"></translation>
    </message>
    <message>
-      <location filename="../installerprompt.ui" line="280"/>
-      <source>You entered an incorrect password. Please try again.</source>
-      <translation>Ha ingresado una contraseña incorrecta. Intente de nuevo.</translation>
+        <location filename="../installerprompt.ui" line="371"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
    </message>
    <message>
-      <location filename="../installerprompt.ui" line="320"/>
-      <source>Select a Wi-Fi Network:</source>
-      <translation>Seleccione una red Wi-Fi:</translation>
+        <location filename="../installerprompt.ui" line="389"/>
+        <source>  Try Lubuntu</source>
+        <translation type="unfinished"></translation>
    </message>
    <message>
-      <location filename="../installerprompt.cpp" line="205"/>
-      <source>Connect</source>
-      <translation>Conectar</translation>
+        <location filename="../installerprompt.ui" line="438"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
    </message>
    <message>
-      <location filename="../installerprompt.ui" line="380"/>
-      <source>(For advanced network configuration, select "Try Lubuntu")</source>
-      <translation>(Para la configuración de red avanzada, seleccione "Probar Lubuntu")</translation>
+        <location filename="../installerprompt.ui" line="453"/>
+        <source>  Install Lubuntu</source>
+        <translation type="unfinished"></translation>
    </message>
    <message>
-      <location filename="../installerprompt.ui" line="419"/>
-      <source>✅ Connect</source>
-      <translation>✅ Conectar</translation>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
    </message>
    <message>
-      <location filename="../installerprompt.ui" line="433"/>
-      <location filename="../installerprompt.cpp" line="475"/>
-      <source>Changing language...</source>
-      <translation>Cambiando idioma...</translation>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <source>Background image cannot be loaded.</source>
+        <translation type="unfinished"></translation>
    </message>
    <message>
-      <location filename="../installerprompt.ui" line="525"/>
-      <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=" font-size:12pt;"&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation>&lt;html&gt; &lt;head/&gt; &lt;body&gt; &lt;p&gt; &lt;span style = "font-size: 12pt;"&gt; Pruebe Lubuntu sin instalarlo en su sistema. Le permite usar programas, navegar por la web e incluso instalar aplicaciones temporalmente sin modificar su sistema. Los cambios realizados en el entorno en vivo se perderán cuando la computadora se apague. &lt;/span&gt; &lt;/p&gt; &lt;/body&gt; &lt;/html&gt;</translation>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
+        <translation type="unfinished"></translation>
    </message>
    <message>
-      <location filename="../installerprompt.ui" line="539"/>
-      <source>  Try Lubuntu</source>
-      <translation>  Probar Lubuntu</translation>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
+        <translation type="unfinished"></translation>
    </message>
    <message>
-      <location filename="../installerprompt.ui" line="589"/>
-      <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=" font-size:12pt;"&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation>&lt;html&gt; &lt;head/&gt; &lt;body&gt; &lt;p&gt; &lt;span style = "font-size: 12pt;"&gt; Instale Lubuntu en su sistema. Puede instalar Lubuntu por sí mismo, o junto con un sistema operativo existente. &lt;/span&gt; &lt;/p&gt; &lt;/body&gt; &lt;/html&gt;</translation>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
+        <translation type="unfinished"></translation>
    </message>
    <message>
-      <location filename="../installerprompt.ui" line="600"/>
-      <source>  Install Lubuntu</source>
-      <translation>  Instalar Lubuntu</translation>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"></translation>
    </message>
    <message>
-      <location filename="../installerprompt.cpp" line="49"/>
-      <location filename="../installerprompt.cpp" line="256"/>
-      <location filename="../installerprompt.cpp" line="271"/>
-      <source>Error</source>
-      <translation>Error</translation>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
+        <translation type="unfinished"></translation>
    </message>
    <message>
-      <location filename="../installerprompt.cpp" line="49"/>
-      <source>Background image cannot be loaded.</source>
-      <translation>La imagen de fondo no se puede cargar.</translation>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
+        <translation type="unfinished"></translation>
    </message>
    <message>
-      <location filename="../installerprompt.cpp" line="108"/>
-      <source>Not Connected</source>
-      <translation>No Conectado</translation>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
    </message>
    <message>
-      <location filename="../installerprompt.cpp" line="194"/>
-      <source>Wi-Fi Password Required</source>
-      <translation>Se requiere contraseña de Wi-Fi</translation>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
    </message>
    <message>
-      <location filename="../installerprompt.cpp" line="203"/>
-      <source>Enter password for "%1":</source>
-      <translation>Ingrese la contraseña para "%1":</translation>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
    </message>
    <message>
-      <location filename="../installerprompt.cpp" line="256"/>
-      <source>Failed to create Wi-Fi settings.</source>
-      <translation>No se pudo crear la configuración de Wi-Fi.</translation>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
    </message>
    <message>
-      <location filename="../installerprompt.cpp" line="271"/>
-      <source>Failed to add Wi-Fi connection.</source>
-      <translation>No se pudo agregar la conexión Wi-Fi.</translation>
+        <location filename="../wifipassworddialog.ui" line="102"/>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
    </message>
    <message>
-      <location filename="../installerprompt.cpp" line="472"/>
-      <source>Unable to download full language support, changing anyway...</source>
-      <translation>No se puede descargar el soporte completo de idiomas, cambiando de todos modos...</translation>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
+        <translation type="unfinished"></translation>
    </message>
-    <message>
-      <location filename="../installerprompt.ui" line="727"/>
-      <location filename="../installerprompt.cpp" line="114"/>
-      <source>Connected</source>
-      <translation>Conectado</translation>
-    </message>
-    <message>
-      <location filename="../installerprompt.cpp" line="119"/>
-      <source>Connecting...</source>
-      <translation>Conectando...</translation>
-    </message>
-    <message>
-      <location filename="../installerprompt.cpp" line="124"/>
-      <source>Disconnecting...</source>
-      <translation>Desconectando...</translation>
-    </message>
-    <message>
-      <location filename="../installerprompt.cpp" line="130"/>
-      <source>Unknown Status</source>
-      <translation>Estado Desconocido</translation>
-    </message>
-    <message>
-      <location filename="../installerprompt.cpp" line="330"/>
-      <source>WiFi Not Available</source>
-      <translation>Wifi No Disponible</translation>
-    </message>
-    <message>
-      <location filename="../installerprompt.cpp" line="330"/>
-      <source>No WiFi devices were found on this system.</source>
-      <translation>No se encontraron dispositivos WiFi en este sistema.</translation>
-    </message>
-  </context>
+</context>
 </TS>
--- a/src/translations/lubuntu-installer-prompt_es_VE.ts
+++ b/src/translations/lubuntu-installer-prompt_es_VE.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_et.ts
+++ b/src/translations/lubuntu-installer-prompt_et.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_eu.ts
+++ b/src/translations/lubuntu-installer-prompt_eu.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_fa.ts
+++ b/src/translations/lubuntu-installer-prompt_fa.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_fi.ts
+++ b/src/translations/lubuntu-installer-prompt_fi.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_fr.ts
+++ b/src/translations/lubuntu-installer-prompt_fr.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_gl.ts
+++ b/src/translations/lubuntu-installer-prompt_gl.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_he.ts
+++ b/src/translations/lubuntu-installer-prompt_he.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_hi.ts
+++ b/src/translations/lubuntu-installer-prompt_hi.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_hr.ts
+++ b/src/translations/lubuntu-installer-prompt_hr.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_hu.ts
+++ b/src/translations/lubuntu-installer-prompt_hu.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_id.ts
+++ b/src/translations/lubuntu-installer-prompt_id.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_id_ID.ts
+++ b/src/translations/lubuntu-installer-prompt_id_ID.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_it.ts
+++ b/src/translations/lubuntu-installer-prompt_it.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_ja.ts
+++ b/src/translations/lubuntu-installer-prompt_ja.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_kk.ts
+++ b/src/translations/lubuntu-installer-prompt_kk.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_ko.ts
+++ b/src/translations/lubuntu-installer-prompt_ko.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_lt.ts
+++ b/src/translations/lubuntu-installer-prompt_lt.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_lv.ts
+++ b/src/translations/lubuntu-installer-prompt_lv.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_nb_NO.ts
+++ b/src/translations/lubuntu-installer-prompt_nb_NO.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_nl.ts
+++ b/src/translations/lubuntu-installer-prompt_nl.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_oc.ts
+++ b/src/translations/lubuntu-installer-prompt_oc.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_pl.ts
+++ b/src/translations/lubuntu-installer-prompt_pl.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_pt.ts
+++ b/src/translations/lubuntu-installer-prompt_pt.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_pt_BR.ts
+++ b/src/translations/lubuntu-installer-prompt_pt_BR.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_ro_RO.ts
+++ b/src/translations/lubuntu-installer-prompt_ro_RO.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_ru.ts
+++ b/src/translations/lubuntu-installer-prompt_ru.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_si.ts
+++ b/src/translations/lubuntu-installer-prompt_si.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_sk_SK.ts
+++ b/src/translations/lubuntu-installer-prompt_sk_SK.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_sl.ts
+++ b/src/translations/lubuntu-installer-prompt_sl.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_sr.ts
+++ b/src/translations/lubuntu-installer-prompt_sr.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_th.ts
+++ b/src/translations/lubuntu-installer-prompt_th.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_tr.ts
+++ b/src/translations/lubuntu-installer-prompt_tr.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_uk.ts
+++ b/src/translations/lubuntu-installer-prompt_uk.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_vi.ts
+++ b/src/translations/lubuntu-installer-prompt_vi.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_zh_CN.ts
+++ b/src/translations/lubuntu-installer-prompt_zh_CN.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
-        <source>Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/translations/lubuntu-installer-prompt_zh_TW.ts
+++ b/src/translations/lubuntu-installer-prompt_zh_TW.ts
@ -9,137 +9,125 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="237"/>
+        <location filename="../installerprompt.ui" line="202"/>
        <source>Select Your Language:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="263"/>
-        <source>✅ Confirm</source>
+        <location filename="../installerprompt.ui" line="281"/>
+        <source>Internet Connection:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="280"/>
-        <source>You entered an incorrect password. Please try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="320"/>
-        <source>Select a Wi-Fi Network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="380"/>
-        <source>(For advanced network configuration, select &quot;Try Lubuntu&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="419"/>
-        <source>✅ Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="433"/>
-        <location filename="../installerprompt.cpp" line="475"/>
-        <source>Changing language...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.ui" line="525"/>
+        <location filename="../installerprompt.ui" line="371"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="539"/>
+        <location filename="../installerprompt.ui" line="389"/>
        <source>  Try Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="589"/>
+        <location filename="../installerprompt.ui" line="438"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="600"/>
+        <location filename="../installerprompt.ui" line="453"/>
        <source>  Install Lubuntu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.ui" line="727"/>
-        <location filename="../installerprompt.cpp" line="114"/>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <location filename="../installerprompt.cpp" line="271"/>
+        <location filename="../installerprompt.cpp" line="68"/>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <location filename="../installerprompt.cpp" line="345"/>
        <source>Error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="49"/>
+        <location filename="../installerprompt.cpp" line="68"/>
        <source>Background image cannot be loaded.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="108"/>
-        <source>Not Connected</source>
+        <location filename="../installerprompt.cpp" line="175"/>
+        <source>Selected Ethernet device has no network!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="119"/>
-        <source>Connecting...</source>
+        <location filename="../installerprompt.cpp" line="226"/>
+        <source>Failed to add WiFi connection.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="124"/>
-        <source>Disconnecting...</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Connected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="130"/>
-        <source>Unknown Status</source>
+        <location filename="../installerprompt.cpp" line="251"/>
+        <location filename="../installerprompt.cpp" line="275"/>
+        <source>Disconnected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="194"/>
-        <source>Wi-Fi Password Required</source>
+        <location filename="../installerprompt.cpp" line="255"/>
+        <source>Ethernet %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="203"/>
-        <source>Enter password for &quot;%1&quot;:</source>
+        <location filename="../installerprompt.cpp" line="279"/>
+        <source>WiFi %1: %2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="205"/>
+        <location filename="../installerprompt.cpp" line="300"/>
+        <source>WiFi password was incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../installerprompt.cpp" line="345"/>
+        <source>Something has gone very wrong trying to parse the list of supported languages!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LanguageChangeDialog</name>
+    <message>
+        <location filename="../languagechangedialog.ui" line="14"/>
+        <source>Lubuntu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../languagechangedialog.ui" line="24"/>
+        <source>Changing language...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WifiPasswordDialog</name>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="14"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="72"/>
+        <source>wifilabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wifipassworddialog.ui" line="102"/>
        <source>Connect</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../installerprompt.cpp" line="256"/>
-        <source>Failed to create Wi-Fi settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="271"/>
-        <source>Failed to add Wi-Fi connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>WiFi Not Available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="330"/>
-        <source>No WiFi devices were found on this system.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../installerprompt.cpp" line="472"/>
-        <source>Unable to download full language support, changing anyway...</source>
+        <location filename="../wifipassworddialog.cpp" line="9"/>
+        <source>Enter password for %1:</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/src/warningdialog.cpp
+++ b/src/warningdialog.cpp
@ -0,0 +1,27 @@
+#include "warningdialog.h"
+#include "ui_warningdialog.h"
+
+WarningDialog::WarningDialog(QString warningText, QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::WarningDialog)
+{
+    ui->setupUi(this);
+    ui->warningLabel->setText(warningText);
+    connect (ui->okButton, &QPushButton::clicked, this, &WarningDialog::onOkClicked);
+}
+
+WarningDialog::~WarningDialog()
+{
+    delete ui;
+}
+
+void WarningDialog::showWarning(QString warningText)
+{
+    WarningDialog warn(warningText);
+    warn.exec();
+}
+
+void WarningDialog::onOkClicked()
+{
+    this->done(0);
+}
--- a/src/warningdialog.h
+++ b/src/warningdialog.h
@ -0,0 +1,26 @@
+#ifndef WARNINGDIALOG_H
+#define WARNINGDIALOG_H
+
+#include <QDialog>
+
+namespace Ui {
+class WarningDialog;
+}
+
+class WarningDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit WarningDialog(QString warningText, QWidget *parent = nullptr);
+    ~WarningDialog();
+    static void showWarning(QString warningText);
+
+private slots:
+    void onOkClicked();
+
+private:
+    Ui::WarningDialog *ui;
+};
+
+#endif // WARNINGDIALOG_H
--- a/src/warningdialog.ui
+++ b/src/warningdialog.ui
@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>WarningDialog</class>
+ <widget class="QDialog" name="WarningDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>141</width>
+    <height>107</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Lubuntu</string>
+  </property>
+  <property name="windowIcon">
+   <iconset theme="system-software-install"/>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="pixmap">
+        <pixmap resource="resource.qrc">:/warning-icon</pixmap>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="warningLabel">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;placeholder&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="wordWrap">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="okButton">
+       <property name="text">
+        <string>OK</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="resource.qrc"/>
+ </resources>
+ <connections/>
+</ui>
--- a/src/wifipassworddialog.cpp
+++ b/src/wifipassworddialog.cpp
@ -0,0 +1,35 @@
+#include "wifipassworddialog.h"
+#include "ui_wifipassworddialog.h"
+
+#include <QCloseEvent>
+
+WifiPasswordDialog::WifiPasswordDialog(QString ssid, QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::WifiPasswordDialog)
+{
+    ui->setupUi(this);
+
+    ui->wifiLabel->setText(tr("Enter password for %1:").arg(ssid));
+    connect(ui->connectButton, &QPushButton::clicked, this, &WifiPasswordDialog::onConnectClicked);
+}
+
+WifiPasswordDialog::~WifiPasswordDialog()
+{
+    delete ui;
+}
+
+void WifiPasswordDialog::onConnectClicked()
+{
+    password = ui->passwordBox->text();
+    this->done(0);
+}
+
+QString WifiPasswordDialog::getPassword()
+{
+    return password;
+}
+
+void WifiPasswordDialog::closeEvent(QCloseEvent *event)
+{
+    event->ignore();
+}
--- a/src/wifipassworddialog.h
+++ b/src/wifipassworddialog.h
@ -0,0 +1,30 @@
+#ifndef WIFIPASSWORDDIALOG_H
+#define WIFIPASSWORDDIALOG_H
+
+#include <QDialog>
+
+namespace Ui {
+class WifiPasswordDialog;
+}
+
+class WifiPasswordDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit WifiPasswordDialog(QString ssid, QWidget *parent = nullptr);
+    ~WifiPasswordDialog();
+    QString getPassword();
+
+protected slots:
+    void closeEvent(QCloseEvent *event) override;
+
+private slots:
+    void onConnectClicked();
+
+private:
+    Ui::WifiPasswordDialog *ui;
+    QString password;
+};
+
+#endif // WIFIPASSWORDDIALOG_H
--- a/src/wifipassworddialog.ui
+++ b/src/wifipassworddialog.ui
@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>WifiPasswordDialog</class>
+ <widget class="QDialog" name="WifiPasswordDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>312</width>
+    <height>103</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Lubuntu</string>
+  </property>
+  <property name="windowIcon">
+   <iconset theme="system-software-install"/>
+  </property>
+  <property name="styleSheet">
+   <string notr="true"/>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="wifiLabel">
+     <property name="styleSheet">
+      <string notr="true">color: rgb(0, 0, 0);</string>
+     </property>
+     <property name="text">
+      <string>wifilabel</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="passwordBox">
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPushButton" name="connectButton">
+     <property name="text">
+      <string>Connect</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
Author	SHA1	Message	Date
Walter Lapchynski	be65593381	update panel config to current default	2025-03-23 01:19:06 +00:00
Walter Lapchynski	baa264ea66	remove accidentially added desktop switch	2025-03-07 18:32:18 +00:00
Walter Lapchynski	78162a478c	update panel for the current default config	2025-03-06 01:02:30 +00:00
Aaron Rainbolt	46faa85594	Update background for Plucky	2025-03-05 00:13:08 -06:00
Aaron Rainbolt	6cb084ebf9	Sync with archive	2025-03-04 23:57:24 -06:00
Aaron Rainbolt	a1755c8c0a	Update to use Qt 6	2024-10-14 13:06:21 -05:00
Simon Quigley	d8654e743a	Launch Calamares in OEM mode when "oem-config/enable=true" is passed as a boot parameter (LP: #2063291 ).	2024-04-26 17:03:44 -05:00
Walter Lapchynski	de09a2a3e5	Limited desktops to 1 and removed switcher from panel	2024-04-11 20:46:08 +00:00
Aaron Rainbolt	284862cd31	no, I'd really like the prompt to ALWAYS load please :)	2024-03-24 20:44:16 -05:00
Aaron Rainbolt	077e01afd6	Don't allow closing modal dialogs	2024-03-11 18:18:28 -05:00
Aaron Rainbolt	0174e9622b	Sync state with kubuntu-installer-prompt, add open WiFi support	2024-03-08 17:54:13 -06:00
Aaron Rainbolt	352376a8d9	Fix transparency and rounded corners	2024-02-27 15:31:30 -06:00
Aaron Rainbolt	e5c2f1e484	UI overhaul, switch to native packaging, fix network-related bugs	2024-02-27 15:31:04 -06:00
Aaron Rainbolt	056867affb	Near-total rewrite to enhance UI/UX	2024-02-18 15:10:24 -06:00
roberalz	c184b42387	updated Galician translation	2024-01-26 22:38:58 +00:00
roberalz	c627f5d340	updated Basque translation	2024-01-18 22:45:38 +00:00