diff --git a/data/editor/basic_freeze.rules b/data/editor/basic_freeze.rules
index 88fb7a6fc..98fc94c98 100644
--- a/data/editor/basic_freeze.rules
+++ b/data/editor/basic_freeze.rules
@@ -1,7 +1,7 @@
 [Freeze soft corners]
 
 Index 0
-Pos 0 0 NOTINDEX 3 OR 4 OR 19 OR 20 OR 52 OR 35 OR 36
+Pos 0 0 NOTINDEX 3 OR 4 OR 19 OR 20 OR 52 OR 35 OR 36 OR 56 OR 57 OR 72 OR 73 OR 89
 
 NewRun
 
@@ -201,7 +201,7 @@ Pos -1 0 EMPTY
 [Freeze round corners]
 
 Index 0
-Pos 0 0 NOTINDEX 3 OR 4 OR 19 OR 20 OR 52 OR 35 OR 36
+Pos 0 0 NOTINDEX 3 OR 4 OR 19 OR 20 OR 52 OR 35 OR 36 OR 56 OR 57 OR 72 OR 73 OR 89
 
 NewRun
 
@@ -395,3 +395,203 @@ Pos 1 1 EMPTY
 Pos 0 1 EMPTY
 Pos -1 1 EMPTY
 Pos -1 0 EMPTY
+
+
+
+[Freeze diagonal corners]
+
+Index 0
+Pos 0 0 NOTINDEX 3 OR 4 OR 19 OR 20 OR 52 OR 35 OR 36 OR 56 OR 57 OR 72 OR 73 OR 89
+
+NewRun
+
+Index 4
+
+Index 54
+Pos 0 0 EMPTY
+Pos 0 -1 FULL
+Pos 1 0 EMPTY
+Pos 0 1 EMPTY
+Pos -1 0 FULL
+Pos 0 -1 NOTINDEX -1
+Pos -1 0 NOTINDEX -1
+
+Index 54 ROTATE
+Pos 0 0 EMPTY
+Pos 0 -1 FULL
+Pos 1 0 FULL
+Pos 0 1 EMPTY
+Pos -1 0 EMPTY
+Pos 0 -1 NOTINDEX -1
+Pos 1 0 NOTINDEX -1
+
+Index 54 XFLIP YFLIP
+Pos 0 0 EMPTY
+Pos 0 -1 EMPTY
+Pos 1 0 FULL
+Pos 0 1 FULL
+Pos -1 0 EMPTY
+Pos 1 0 NOTINDEX -1
+Pos 0 1 NOTINDEX -1
+
+Index 54 ROTATE XFLIP YFLIP
+Pos 0 0 EMPTY
+Pos 0 -1 EMPTY
+Pos 1 0 EMPTY
+Pos 0 1 FULL
+Pos -1 0 FULL
+Pos 0 1 NOTINDEX -1
+Pos -1 0 NOTINDEX -1
+
+Index 55
+Pos 0 0 EMPTY
+Pos 0 -1 FULL
+Pos 1 0 FULL
+Pos 0 1 EMPTY
+Pos -1 0 FULL
+
+Index 55 ROTATE
+Pos 0 0 EMPTY
+Pos 0 -1 FULL
+Pos 1 0 FULL
+Pos 0 1 FULL
+Pos -1 0 EMPTY
+
+Index 55 XFLIP YFLIP
+Pos 0 0 EMPTY
+Pos 0 -1 EMPTY
+Pos 1 0 FULL
+Pos 0 1 FULL
+Pos -1 0 FULL
+
+Index 55 ROTATE XFLIP YFLIP
+Pos 0 0 EMPTY
+Pos 0 -1 FULL
+Pos 1 0 EMPTY
+Pos 0 1 FULL
+Pos -1 0 FULL
+
+Index 87
+Pos 0 0 EMPTY
+Pos 0 -1 FULL
+Pos 1 0 FULL
+Pos 0 1 FULL
+Pos -1 0 FULL
+
+Index 56
+Pos 0 -1 EMPTY
+Pos 1 0 EMPTY
+Pos 1 -1 EMPTY
+
+Index 56 ROTATE
+Pos 0 1 EMPTY
+Pos 1 0 EMPTY
+Pos 1 1 EMPTY
+
+Index 56 XFLIP YFLIP
+Pos 0 1 EMPTY
+Pos -1 0 EMPTY
+Pos -1 1 EMPTY
+
+Index 56 ROTATE XFLIP YFLIP
+Pos 0 -1 EMPTY
+Pos -1 0 EMPTY
+Pos -1 -1 EMPTY
+
+Index 57
+Pos -1 0 EMPTY
+Pos -1 -1 EMPTY
+Pos 0 -1 EMPTY
+Pos 1 -1 EMPTY
+Pos 1 0 EMPTY
+
+Index 57 ROTATE
+Pos 0 -1 EMPTY
+Pos 1 -1 EMPTY
+Pos 1 0 EMPTY
+Pos 1 1 EMPTY
+Pos 0 1 EMPTY
+
+Index 57 XFLIP YFLIP
+Pos 1 0 EMPTY
+Pos 1 1 EMPTY
+Pos 0 1 EMPTY
+Pos -1 1 EMPTY
+Pos -1 0 EMPTY
+
+Index 57 ROTATE XFLIP YFLIP
+Pos 0 -1 EMPTY
+Pos -1 -1 EMPTY
+Pos -1 0 EMPTY
+Pos -1 1 EMPTY
+Pos 0 1 EMPTY
+
+Index 72
+Pos 1 -1 FULL
+Pos -1 1 FULL
+Pos 1 0 EMPTY
+Pos 1 1 EMPTY
+Pos 0 1 EMPTY
+Pos 0 -1 EMPTY
+Pos -1 -1 EMPTY
+Pos -1 0 EMPTY
+
+Index 72 ROTATE
+Pos -1 -1 FULL
+Pos 1 1 FULL
+Pos 0 -1 EMPTY
+Pos 1 -1 EMPTY
+Pos 1 0 EMPTY
+Pos -1 0 EMPTY
+Pos -1 1 EMPTY
+Pos 0 1 EMPTY
+
+Index 73
+Pos -1 1 FULL
+Pos -1 -1 EMPTY
+Pos 0 -1 EMPTY
+Pos 1 -1 EMPTY
+Pos 1 0 EMPTY
+Pos 1 1 EMPTY
+Pos 0 1 EMPTY
+Pos -1 0 EMPTY
+
+Index 73 ROTATE
+Pos -1 -1 FULL
+Pos 0 -1 EMPTY
+Pos 1 -1 EMPTY
+Pos 1 0 EMPTY
+Pos 1 1 EMPTY
+Pos 0 1 EMPTY
+Pos -1 1 EMPTY
+Pos -1 0 EMPTY
+
+Index 73 XFLIP YFLIP
+Pos 1 -1 FULL
+Pos -1 -1 EMPTY
+Pos 0 -1 EMPTY
+Pos 1 0 EMPTY
+Pos 1 1 EMPTY
+Pos 0 1 EMPTY
+Pos -1 1 EMPTY
+Pos -1 0 EMPTY
+
+Index 73 ROTATE XFLIP YFLIP
+Pos 1 1 FULL
+Pos -1 -1 EMPTY
+Pos 0 -1 EMPTY
+Pos 1 -1 EMPTY
+Pos 1 0 EMPTY
+Pos 0 1 EMPTY
+Pos -1 1 EMPTY
+Pos -1 0 EMPTY
+
+Index 89
+Pos -1 -1 EMPTY
+Pos 0 -1 EMPTY
+Pos 1 -1 EMPTY
+Pos 1 0 EMPTY
+Pos 1 1 EMPTY
+Pos 0 1 EMPTY
+Pos -1 1 EMPTY
+Pos -1 0 EMPTY