diff --git a/chroot_scripts/10-software_installation.sh b/chroot_scripts/10-software_installation.sh
index 9650ad3..51bb14a 100755
--- a/chroot_scripts/10-software_installation.sh
+++ b/chroot_scripts/10-software_installation.sh
@@ -46,7 +46,6 @@ apt-get -qq -o Dpkg::Use-Pty=false -y install \
     gparted \
     gsmartcontrol \
     gvfs-backends \
-    gxkb \
     hdparm \
     i2c-tools \
     iproute2 \
@@ -92,6 +91,7 @@ apt-get -qq -o Dpkg::Use-Pty=false -y install \
     wpagui \
     xfce4 \
     xfce4-terminal \
+    xfce4-xkb-plugin \
     xfce4-whiskermenu-plugin \
     xinit \
     xorg \
diff --git a/chroot_scripts/30-locale.sh b/chroot_scripts/30-locale.sh
index 51c0a23..7420c1c 100755
--- a/chroot_scripts/30-locale.sh
+++ b/chroot_scripts/30-locale.sh
@@ -40,20 +40,20 @@ XKBOPTIONS=""
 BACKSPACE="guess"
 EOF
 # Keyboard layout switcher:
-sudo -u $MISO_USERNAME mkdir -p /home/$MISO_USERNAME/.config/autostart
-sudo -u $MISO_USERNAME tee /home/$MISO_USERNAME/.config/autostart/fbxkb.desktop <<EOF >/dev/null
-[Desktop Entry]
-Encoding=UTF-8
-Version=0.9.4
-Type=Application
-Name=gxkb
-Comment=Keyboard layout switcher
-Exec=gxkb
-OnlyShowIn=XFCE;
-StartupNotify=false
-Terminal=false
-Hidden=false
-EOF
+#sudo -u $MISO_USERNAME mkdir -p /home/$MISO_USERNAME/.config/autostart
+#sudo -u $MISO_USERNAME tee /home/$MISO_USERNAME/.config/autostart/gxkb.desktop <<EOF >/dev/null
+#[Desktop Entry]
+#Encoding=UTF-8
+#Version=0.9.4
+#Type=Application
+#Name=gxkb
+#Comment=Keyboard layout switcher
+#Exec=gxkb
+#OnlyShowIn=XFCE;
+#StartupNotify=false
+#Terminal=false
+#Hidden=false
+#EOF
 # 00-keyboard.conf can be managed by localectl. In fact, this is one of such files produced by localectl.
 # May not be needed in Debian 11:
 #mkdir -p /etc/X11/xorg.conf.d
diff --git a/chroot_scripts/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/chroot_scripts/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
index 877276c..2893ddb 100644
--- a/chroot_scripts/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ b/chroot_scripts/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -27,6 +27,7 @@
         <value type="int" value="22"/>
         <value type="int" value="16"/>
         <value type="int" value="25"/>
+        <value type="int" value="1"/>
         <value type="int" value="26"/>
       </property>
     </property>
@@ -75,9 +76,6 @@
       <property name="known-legacy-items" type="array">
         <value type="string" value="ethernet network connection “wired connection 1” active"/>
       </property>
-      <property name="known-items" type="array">
-        <value type="string" value="example-simple-client"/>
-      </property>
       <property name="icon-size" type="int" value="0"/>
       <property name="single-row" type="bool" value="true"/>
       <property name="hide-new-items" type="bool" value="false"/>
@@ -88,5 +86,12 @@
       </property>
     </property>
     <property name="plugin-26" type="string" value="clock"/>
+    <property name="plugin-1" type="string" value="xkb">
+      <property name="display-name" type="uint" value="1"/>
+      <property name="display-scale" type="uint" value="50"/>
+      <property name="show-notifications" type="bool" value="false"/>
+      <property name="display-tooltip-icon" type="bool" value="true"/>
+      <property name="group-policy" type="uint" value="0"/>
+    </property>
   </property>
 </channel>
\ No newline at end of file