diff --git a/wayland/config/eww/modules/bar/vpn.yuck b/wayland/config/eww/modules/bar/vpn.yuck
index 892e652..3aa71aa 100644
--- a/wayland/config/eww/modules/bar/vpn.yuck
+++ b/wayland/config/eww/modules/bar/vpn.yuck
@@ -5,8 +5,8 @@
     :revealvar reveal_vpn
     :revealvar-name "reveal_vpn"
     (button :onclick 'notify-send "TODO"'
-            :class "revealer-preview ${(jq(network_manager.vpn_connections, '[ .[] | select(.active=="yes") ] | length') > 0 ? 'active' : 'inactive')}"
-      "${(jq(network_manager.vpn_connections, '[ .[] | select(.active=="yes") ] | length') > 0 ? '' : '')}")
+            :class "revealer-preview ${(jq(network_manager.vpn_connections, '[ .[] | select(.active) ] | length') > 0 ? 'active' : 'inactive')}"
+      "${(jq(network_manager.vpn_connections, '[ .[] | select(.active) ] | length') > 0 ? '' : '')}")
     (vpn_children :array "${jq(network_manager.vpn_connections,'.|sort_by(.name)')}")))
 
 (defwidget vpn_children [array]
@@ -15,8 +15,8 @@
               :space-evenly false
               :halign "center"
     (for vpn in array
-      (button :onclick "nmcli connection ${( vpn.active == 'yes' ? 'down' : 'up' )} ${vpn.name}"
-              :class {( vpn.active == "yes" ? 'active' : 'inactive' )}
+      (button :onclick "nmcli connection ${( vpn.active ? 'down' : 'up' )} ${vpn.name}"
+              :class {( vpn.active ? 'active' : 'inactive' )}
               :tooltip "${vpn.name}"
         "${( vpn.name =~ '^[Hh]ome.*' ? 
             ( vpn.name =~ '.*[Ff]ull.*' ? '' : '') : 
diff --git a/wayland/config/eww/variables/bar/network-manager.yuck b/wayland/config/eww/variables/bar/network-manager.yuck
index fb6377f..d5e1975 100644
--- a/wayland/config/eww/variables/bar/network-manager.yuck
+++ b/wayland/config/eww/variables/bar/network-manager.yuck
@@ -1,3 +1,3 @@
 (deflisten network_manager
   :initial '{ "network_devices": [], "vpn_connections": [] }'
-  "nmcli-info-rs")
+  "nmirs")