diff --git a/content/Configuring/Workspace-Rules.md b/content/Configuring/Workspace-Rules.md
index f05418a0..4e033951 100644
--- a/content/Configuring/Workspace-Rules.md
+++ b/content/Configuring/Workspace-Rules.md
@@ -51,7 +51,7 @@ workspace = WORKSPACE, RULES
 
 ```ini
 workspace = name:myworkspace, gapsin:0, gapsout:0
-workspace = 3, rounding:false, bordersize:0
+workspace = 3, rounding:false, border_size:0
 workspace = w[tg1-4], shadow:false
 ```
 
@@ -62,10 +62,10 @@ To replicate "smart gaps" / "no gaps when only" from other WMs/Compositors, use
 ```ini
 workspace = w[tv1], gapsout:0, gapsin:0
 workspace = f[1], gapsout:0, gapsin:0
-windowrule = bordersize 0, floating:0, onworkspace:w[tv1]
-windowrule = rounding 0, floating:0, onworkspace:w[tv1]
-windowrule = bordersize 0, floating:0, onworkspace:f[1]
-windowrule = rounding 0, floating:0, onworkspace:f[1]
+windowrule = border_size 0, match:float 0, match:workspace w[tv1]
+windowrule = rounding 0, match:float 0, match:workspacew[tv1]
+windowrule = border_size 0, match:float 0, match:workspacef[1]
+windowrule = rounding 0, match:float 0, match:workspacef[1]
 ```
 
 #### Smart gaps (ignoring special workspaces)
@@ -75,10 +75,10 @@ You can combine workspace selectors for more fine-grained control, for example,
 ```ini
 workspace = w[tv1]s[false], gapsout:0, gapsin:0
 workspace = f[1]s[false], gapsout:0, gapsin:0
-windowrule = bordersize 0, floating:0, onworkspace:w[tv1]s[false]
-windowrule = rounding 0, floating:0, onworkspace:w[tv1]s[false]
-windowrule = bordersize 0, floating:0, onworkspace:f[1]s[false]
-windowrule = rounding 0, floating:0, onworkspace:f[1]s[false]
+windowrule = border_size 0, match:float 0, match:workspace w[tv1]s[false]
+windowrule = rounding 0, match:float 0, match:workspace w[tv1]s[false]
+windowrule = border_size 0, match:float 0, match:workspace f[1]s[false]
+windowrule = rounding 0, match:float 0, match:workspace f[1]s[false]
 ```
 
 ## Rules
@@ -89,7 +89,7 @@ windowrule = rounding 0, floating:0, onworkspace:f[1]s[false]
 | default:[b] | Whether this workspace should be the default workspace for the given monitor | bool |
 | gapsin:[x] | Set the gaps between windows (equivalent to [General->gaps_in](../Variables#general)) | int |
 | gapsout:[x] | Set the gaps between windows and monitor edges (equivalent to [General->gaps_out](../Variables#general)) | int |
-| bordersize:[x] | Set the border size around windows (equivalent to [General->border_size](../Variables#general)) | int |
+| border_size:[x] | Set the border size around windows (equivalent to [General->border_size](../Variables#general)) | int |
 | border:[b] | Whether to draw borders or not | bool |
 | shadow:[b] | Whether to draw shadows or not | bool |
 | rounding:[b] | Whether to draw rounded windows or not | bool |
@@ -103,7 +103,7 @@ windowrule = rounding 0, floating:0, onworkspace:f[1]s[false]
 ```ini
 workspace = 3, rounding:false, decorate:false
 workspace = name:coding, rounding:false, decorate:false, gapsin:0, gapsout:0, border:false, monitor:DP-1
-workspace = 8,bordersize:8
+workspace = 8,border_size:8
 workspace = name:Hello, monitor:DP-1, default:true
 workspace = name:gaming, monitor:desc:Chimei Innolux Corporation 0x150C, default:true
 workspace = 5, on-created-empty:[float] firefox