diff --git a/Makefile b/Makefile
index 21cf3e2..ecb72d1 100644
--- a/Makefile
+++ b/Makefile
@@ -5,16 +5,19 @@ SYSCONFDIR ?= /etc
 BINDIR     ?= $(PREFIX)/bin
 DATADIR    ?= $(PREFIX)/share
 LIBEXECDIR ?= $(PREFIX)/libexec
+BACKGROUND ?= $(DATADIR)/backgrounds/default.png
 
 .PHONY: build clean install check requires
 .DEFAULT: build
 
-GENERATED := $(patsubst %.in,%,$(wildcard sway/*.in sway/*/*.in ))
-VARIABLES := PREFIX SYSCONFDIR DATADIR LIBEXECDIR
+TEMPLATES := sway/*.in sway/*/*.in swaylock/*.in sddm/03-sway-fedora/theme.conf.in
+GENERATED := $(patsubst %.in,%,$(wildcard $(TEMPLATES)))
+VARIABLES := PREFIX SYSCONFDIR DATADIR LIBEXECDIR BACKGROUND
 
-sway/%: sway/%.in
-	sed "$(foreach var,$(VARIABLES),s^@$(var)@^$($(var))^i;)" $^ > $@
-	sed '$(foreach var,$(VARIABLES),s^$$$(var)\b^$($(var))^i;)' $^ > $@
+%: %.in
+	sed -e "$(foreach var,$(VARIABLES),s^@$(var)@^$($(var))^i;)"   \
+	    -e '$(foreach var,$(VARIABLES),s^$$$(var)\b^$($(var))^i;)' \
+	    $^ > $@
 
 build: $(GENERATED)
 
diff --git a/sddm/03-sway-fedora/Main.qml b/sddm/03-sway-fedora/Main.qml
index 06406ca..64e0231 100644
--- a/sddm/03-sway-fedora/Main.qml
+++ b/sddm/03-sway-fedora/Main.qml
@@ -41,17 +41,16 @@ Rectangle {
     Connections {
         target: sddm
 
-        onLoginSucceeded: {
+        function onLoginSucceeded() {
             errorMessage.color = "steelblue"
             errorMessage.text = textConstants.loginSucceeded
         }
-
-        onLoginFailed: {
+        function onLoginFailed() {
             password.text = ""
             errorMessage.color = "red"
             errorMessage.text = textConstants.loginFailed
         }
-        onInformationMessage: {
+        function onInformationMessage(message) {
             errorMessage.color = "red"
             errorMessage.text = message
         }
@@ -127,7 +126,7 @@ Rectangle {
 
                         KeyNavigation.backtab: rebootButton; KeyNavigation.tab: password
 
-                        Keys.onPressed: {
+                        Keys.onPressed: function (event) {
                             if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
                                 sddm.login(name.text, password.text, sessionIndex)
                                 event.accepted = true
@@ -154,7 +153,7 @@ Rectangle {
 
                         KeyNavigation.backtab: name; KeyNavigation.tab: session
 
-                        Keys.onPressed: {
+                        Keys.onPressed: function (event) {
                             if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
                                 sddm.login(name.text, password.text, sessionIndex)
                                 event.accepted = true
@@ -165,12 +164,12 @@ Rectangle {
 
                 Row {
                     spacing: 4
-                    width: parent.width
+                    width: parent.width / 2
                     z: 100
 
                     Column {
                         z: 100
-                        width: parent.width
+                        width: parent.width * (layoutBox.visible ? 1.3 : 2)
                         spacing : 4
                         anchors.bottom: parent.bottom
 
@@ -193,7 +192,35 @@ Rectangle {
                             model: sessionModel
                             index: sessionModel.lastIndex
 
-                            KeyNavigation.backtab: password; KeyNavigation.tab: loginButton
+                            KeyNavigation.backtab: password; KeyNavigation.tab: layoutBox
+                        }
+                    }
+
+                    Column {
+                        z: 101
+                        width: parent.width * 0.7
+                        spacing : 4
+                        anchors.bottom: parent.bottom
+
+                        visible: keyboard.enabled && keyboard.layouts.length > 0
+
+                        Text {
+                            id: lblLayout
+                            width: parent.width
+                            text: textConstants.layout
+                            wrapMode: TextEdit.WordWrap
+                            font.bold: true
+                            font.pixelSize: 12
+                        }
+
+                        LayoutBox {
+                            id: layoutBox
+                            width: parent.width; height: 30
+                            font.pixelSize: 14
+
+                            arrowIcon: Qt.resolvedUrl("angle-down.png")
+
+                            KeyNavigation.backtab: session; KeyNavigation.tab: loginButton
                         }
                     }
                 }
@@ -221,7 +248,7 @@ Rectangle {
 
                         onClicked: sddm.login(name.text, password.text, sessionIndex)
 
-                        KeyNavigation.backtab: session; KeyNavigation.tab: shutdownButton
+                        KeyNavigation.backtab: layoutBox; KeyNavigation.tab: shutdownButton
                     }
 
                     Button {
diff --git a/sddm/03-sway-fedora/metadata.desktop b/sddm/03-sway-fedora/metadata.desktop
index aadbafe..c9d5cf6 100644
--- a/sddm/03-sway-fedora/metadata.desktop
+++ b/sddm/03-sway-fedora/metadata.desktop
@@ -14,3 +14,4 @@ TranslationsDirectory=translations
 Email=sway@lists.fedoraproject.org
 Theme-Id=03-sway-fedora
 Theme-API=2.0
+QtVersion=6
diff --git a/sddm/03-sway-fedora/theme.conf b/sddm/03-sway-fedora/theme.conf
deleted file mode 100644
index 80ad085..0000000
--- a/sddm/03-sway-fedora/theme.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[General]
-background=/usr/share/backgrounds/default.png
diff --git a/sddm/03-sway-fedora/theme.conf.in b/sddm/03-sway-fedora/theme.conf.in
new file mode 100644
index 0000000..757799e
--- /dev/null
+++ b/sddm/03-sway-fedora/theme.conf.in
@@ -0,0 +1,2 @@
+[General]
+background=@BACKGROUND@
diff --git a/sway-config-fedora.spec.rpkg b/sway-config-fedora.spec.rpkg
index b2e28ff..35f5ce8 100644
--- a/sway-config-fedora.spec.rpkg
+++ b/sway-config-fedora.spec.rpkg
@@ -2,6 +2,7 @@
 %bcond  initialsetup %[0%{?fedora} >= 40 || 0%{?rhel} >= 10]
 %bcond  sddm 1
 %global sway_ver 1.8
+%global bg_format %[ 0%{?fedora} >= 42 ? "jxl" : "png" ]
 
 Name:           {{{ git_name }}}
 Version:        {{{ git_version }}}
@@ -41,9 +42,12 @@ Recommends: rofi-wayland
 Recommends: xdg-user-dirs
 Requires: /usr/bin/pgrep
 Requires: /usr/bin/pkill
+Requires: brightnessctl >= 0.5.1-11
 Requires: desktop-backgrounds-compat
 Requires: grimshot
-Requires: light
+%if "%{bg_format}" == "jxl"
+Requires: jxl-pixbuf-loader
+%endif
 Requires: lxqt-policykit
 Requires: playerctl
 Requires: pulseaudio-utils
@@ -80,6 +84,9 @@ Provides:       sddm-greeter-displayserver
 Conflicts:      sddm-greeter-displayserver
 
 Requires:       desktop-backgrounds-compat
+%if "%{bg_format}" == "jxl"
+Requires:       kf6-kimageformats
+%endif
 Requires:       sddm >= 0.20.0
 Requires:       sway >= %{sway_ver}
 
@@ -94,11 +101,16 @@ to use Sway for the greeter display server.
 
 
 %build
-%make_build
+%make_build \
+    PREFIX='%{_prefix}' \
+    BACKGROUND='%{_datadir}/backgrounds/default.%{bg_format}'
 
 
 %install
-%make_install PREFIX='%{_prefix}' WITH_INITIALSETUP='%[%{with initialsetup}?"yes":"no"]' WITH_SDDM='%[%{with sddm}?"yes":"no"]'
+%make_install \
+    PREFIX='%{_prefix}' \
+    WITH_INITIALSETUP='%[%{with initialsetup}?"yes":"no"]' \
+    WITH_SDDM='%[%{with sddm}?"yes":"no"]'
 
 
 %files
diff --git a/sway/config.d/60-bindings-brightness.conf b/sway/config.d/60-bindings-brightness.conf
index 0e53ec2..5c1e808 100644
--- a/sway/config.d/60-bindings-brightness.conf
+++ b/sway/config.d/60-bindings-brightness.conf
@@ -1,18 +1,18 @@
-# Key bindings for brightness control using `light`.
+# Key bindings for brightness control using `brightnessctl`.
 # Displays a notification with the current value if /usr/bin/notify-send is available
 #
 # Brightness increase/decrease step can be customized by setting the `$brightness_step`
 # variable to a numeric value before including the file.
 #
-# Requires:     light
+# Requires:     brightnessctl >= 0.5.1-11
 # Recommends:   libnotify
 
 set $brightness_notification_cmd  command -v notify-send >/dev/null && \
-        VALUE=$(light) && VALUE=${VALUE%%.*} && \
+        VALUE=$(brightnessctl --percentage get) && \
         notify-send -e -h string:x-canonical-private-synchronous:brightness \
             -h "int:value:$VALUE" -t 800 "Brightness: ${VALUE}%"
 
 bindsym XF86MonBrightnessDown exec \
-        'STEP="$brightness_step" && light -U ${STEP:-5} && $brightness_notification_cmd'
+        'STEP="$brightness_step" && brightnessctl -q set ${STEP:-5}%- && $brightness_notification_cmd'
 bindsym XF86MonBrightnessUp exec \
-        'STEP="$brightness_step" && light -A ${STEP:-5} && $brightness_notification_cmd'
+        'STEP="$brightness_step" && brightnessctl -q set +${STEP:-5}% && $brightness_notification_cmd'
diff --git a/sway/config.in b/sway/config.in
index 6e57ce5..53b8844 100644
--- a/sway/config.in
+++ b/sway/config.in
@@ -30,8 +30,8 @@ set $menu $rofi_cmd -show combi -combi-modes drun#run -modes combi
 ### Output configuration
 #
 # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
-# Requires: desktop-backgrounds-compat, swaybg
-output * bg /usr/share/backgrounds/default.png fill
+# Requires: desktop-backgrounds-compat, swaybg, jxl-pixbuf-loader
+output * bg @BACKGROUND@ fill
 #
 # Example configuration:
 #
diff --git a/sway/config.live.d/99-system-keyboard-config.conf b/sway/config.live.d/99-system-keyboard-config.conf
new file mode 100644
index 0000000..c2c65eb
--- /dev/null
+++ b/sway/config.live.d/99-system-keyboard-config.conf
@@ -0,0 +1,9 @@
+# Apply system-wide XKB configuration stored in systemd-localed.
+#
+# The configuration can be viewed with `localectl` and modified
+# with `localectl set-x11-keymap`.
+#
+# In the live installer environment, Anaconda relies on the localed
+# D-Bus API to update the keyboard configuration.
+
+exec /usr/libexec/sway-systemd/locale1-xkb-config
diff --git a/swaylock/config b/swaylock/config.in
similarity index 84%
rename from swaylock/config
rename to swaylock/config.in
index ec2afc7..607bcf2 100644
--- a/swaylock/config
+++ b/swaylock/config.in
@@ -3,5 +3,5 @@
 #
 # Image path supports environment variables and shell expansions,
 # e.g. image=$HOME/Pictures/default.png
-image=/usr/share/backgrounds/default.png
+image=@BACKGROUND@
 scaling=fill