diff --git a/editions/sway b/editions/sway
index 064ff8f2750ea61a42ea9171fc60f7c65e864ea4..48ea950648b2f16bc3d9c5db63f126fb54458a55 100644
--- a/editions/sway
+++ b/editions/sway
@@ -35,7 +35,6 @@ avahi
 firewalld
 networkmanager
 networkmanager-openvpn
-network-manager-applet
 dhclient
 manjaro-hotfixes
 manjaro-settings-samba
@@ -69,6 +68,7 @@ kvantum-theme-matchama
 lxappearance
 gtk3-nocsd
 gtk4
+glfw-wayland
 matcha-gtk-theme
 manjaro-arm-wallpapers
 papirus-maia-icon-theme
diff --git a/overlays/sway/etc/skel/.config/wofi/style.css b/overlays/sway/etc/skel/.config/wofi/style.css
index 3b7e859e552a3a8f649006684ef4891bec9ea1d0..b215edd75567ab4510257c14f5fa70b9b0aec7a1 100644
--- a/overlays/sway/etc/skel/.config/wofi/style.css
+++ b/overlays/sway/etc/skel/.config/wofi/style.css
@@ -1,9 +1,14 @@
 /* import css definitions for current theme */
 @import url("./theme.css");
 
+#outer-box {
+  border: 1px solid @accent_color;
+}
+
 #input {
   border: none;
   border-radius: 0px;
+  margin: 10px;
 }
 
 #text {
@@ -13,5 +18,5 @@
 window {
   border: 2px solid @accent_color;
   color: @text_color;
-  border-radius: 5px;
+  border-radius: none;
 }
diff --git a/overlays/sway/etc/skel/.config/wofi/swhelp.css b/overlays/sway/etc/skel/.config/wofi/swhelp.css
new file mode 100644
index 0000000000000000000000000000000000000000..e3600a0960a4203c74deddd938891ac6fada98b7
--- /dev/null
+++ b/overlays/sway/etc/skel/.config/wofi/swhelp.css
@@ -0,0 +1,22 @@
+/* import css definitions for current theme */
+@import url("./theme.css");
+
+#outer-box {
+  border: 1px solid @accent_color;
+}
+
+#input {
+  border: none;
+  border-radius: 0px;
+  visibility: hidden;
+}
+
+#text {
+  margin-left: 1em;
+}
+
+window {
+  border: 2px solid @accent_color;
+  color: @text_color;
+  border-radius: 5px;
+}
diff --git a/overlays/sway/etc/skel/.local/bin/swhelp.sh b/overlays/sway/etc/skel/.local/bin/swhelp.sh
index fe50edd6482384ff7dbd095c593cd1bc8888ea90..10a04eba6f77379b8b02b842d4b09b458883c007 100755
--- a/overlays/sway/etc/skel/.local/bin/swhelp.sh
+++ b/overlays/sway/etc/skel/.local/bin/swhelp.sh
@@ -10,7 +10,7 @@ FIRST_RUN=$HOME/.firstrun
 if [ -f $PIDFILE ]; then exit 1; fi
 
 spawn_help_overlay() {
-cat <<EOF | wofi --show dmenu "$@"
+cat <<EOF | wofi --show dmenu --style $HOME/.config/wofi/swhelp.css "$@"
   <b>Manjaro ARM Sway Edition</b>
   Default Modifier: <b>Alt</b>
   New Terminal: <b>\$mod</b> + <b>Enter</b>
diff --git a/overlays/sway/etc/sway/config.d/99-autostart-applications b/overlays/sway/etc/sway/config.d/99-autostart-applications
index 7d994757a8dfa94786103b17e046f085e74d0bf4..bca9dd89c1915a5d2e4baf0b10e05fd204149256 100644
--- a/overlays/sway/etc/sway/config.d/99-autostart-applications
+++ b/overlays/sway/etc/sway/config.d/99-autostart-applications
@@ -7,6 +7,7 @@ exec --no-startup-id mako
 exec --no-startup-id mntray
 exec --no-startup-id $help --autostart
 
-# optional: tray applications
-# exec --no-startup-id nm-applet --indicator
-# exec --no-startup-id blueman-applet
+# disable appindicator for bluetooth
+exec_always {
+  gsettings set org.blueman.general plugin-list "['\!AppIndicator']"
+}