diff --git a/programs/sway/default.nix b/programs/sway/default.nix
index 538791c..ce01cf6 100644
--- a/programs/sway/default.nix
+++ b/programs/sway/default.nix
@@ -98,32 +98,26 @@
       ];
       window = {
         border = 1;
-        commands = [
-          {
-            criteria = {app_id = "org.kde.polkit-kde-authentication-agent-1";};
-            command = "floating enable";
-          }
-          {
-            criteria = {app_id = "Pinentry";};
-            command = "floating enable";
-          }
-          {
-            criteria = {app_id = "pavucontrol";};
-            command = "floating enable";
-          }
-          {
-            criteria = {app_id = ".blueman-manager-wrapped";};
-            command = "floating enable";
-          }
-          {
-            criteria = {app_id = "nm-connection-editor";};
-            command = "floating enable";
-          }
-          {
-            criteria = {class = "steam";};
-            command = "layout tabbed";
-          }
-        ];
+        commands =
+          (map (criteria: {
+              inherit criteria;
+              command = "floating enable";
+            }) [
+              {app_id = "org.kde.polkit-kde-authentication-agent-1";}
+              {app_id = "Pinentry";}
+              {app_id = "pavucontrol";}
+              {app_id = "\.blueman-manager-wrapped";}
+              {app_id = "nm-connection-editor";}
+              {class = "matplotlib";}
+              {class = ".*\.py";}
+              {class = "Idl";}
+            ])
+          ++ [
+            {
+              criteria = {class = "steam";};
+              command = "layout tabbed";
+            }
+          ];
       };
       floating.border = 1;
       keybindings = with config; let