diff --git a/syntaxes/autoit-language-configuration.json b/syntaxes/autoit-language-configuration.json
index 417fb55..76231ca 100644
--- a/syntaxes/autoit-language-configuration.json
+++ b/syntaxes/autoit-language-configuration.json
@@ -26,9 +26,10 @@
     { "open": "'", "close": "'", "notIn": ["string", "comment"] }
   ],
   "folding": {
+    "offSide": true,
     "markers": {
-      "start": "^\\s*\\s*(#?[Rr]egion\\b)|([Ff]unc\\b)",
-      "end": "^\\s*\\s*(#?[Ee]nd[Rr]egion\\b)|([Ee]nd[Ff]unc)"
+      "start": "^\\s*\\s*(#?[Rr]egion\\b)|([Ff]unc\\b)|([iI]f\\b)|([sS]witch\\b)|([fF]or\\b)|([wW]hile\\b)|([wW]ith\\b)",
+      "end": "^\\s*\\s*(#?[Ee]nd[Rr]egion\\b)|([Ee]nd[Ff]unc)|([eE]nd[iI]f)|([eE]nd[sS]witch)|([nN]ext)|([wW][eE]nd)|([eE]nd[wW]ith)"
     }
   },
   "wordPattern": "(-?\\d*\\.\\d\\w*)|([^\\`\\~\\!\\#\\%\\^\\&\\*\\(\\)\\-\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:\\'\\\"\\,\\.\\<\\>\\/\\?\\s]+)"