diff --git a/.editorconfig b/.editorconfig
index c2caaa6ee7c5ef2a2bc06c3ce892dc251c33e278..39ceb5074d81e393251423969167a3d4af21717b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -25,11 +25,6 @@ indent_size = 2
 indent_style = tab
 indent_size = 4
 
-# LESS-Files
-[*.less]
-indent_style = tab
-indent_size = 4
-
 # SCSS-Files
 [*.scss]
 indent_style = space
diff --git a/Build/Resources/Public/Sass/form.scss b/Build/Resources/Public/Sass/form.scss
index bfa0daaf904199d5ff47c31b4686388712a5a796..4ea112f4bc8862abb4576380ce351b5b51edf3a8 100644
--- a/Build/Resources/Public/Sass/form.scss
+++ b/Build/Resources/Public/Sass/form.scss
@@ -4,7 +4,7 @@
 // Variables
 //
 
-// /Build/Resources/Public/Less/_variables.less
+// /Build/Resources/Public/Sass/variables/_main.scss
 $gray-dark: rgb(90, 90, 90);
 $gray: rgb(115, 115, 115);
 $brand-primary: #0078e6;
@@ -20,21 +20,21 @@ $btn-default-bg: #eee;
 $btn-default-border: #bbb;
 $line-height-base: 1.5;
 
-// $toDo remove these variables after including this file in backend.less
-// Bootstrap: variables.less
+// $toDo remove these variables after including this file in backend.scss
+// Bootstrap: variables.scss
 $panel-default-text: $gray-dark;
 
-// /Build/Resources/Public/Less/cropper/variables.less
+// /Build/Resources/Public/Sass/cropper/_variables.scss
 $screen-lg: 1200px; // Large screen / wide desktop
 
-// /Build/Resources/Public/Less/Component/module.less
+// /Build/Resources/Public/Sass/Component/_module.scss
 $module-docheader-height: 65px;
 $module-docheader-border: #c3c3c3;
 
-// /Build/Resources/Public/Less/TYPO3/_module_web_page.less
+// /Build/Resources/Public/Sass/typo3/_module_web_page.scss
 $page-ce-header-hover-bg: #d0d0d0;
 
-// /Build/Resources/Public/Less/TYPO3/_element_tree.less
+// /Build/Resources/Public/Sass/typo3/_element_tree.scss
 $navigation-bg: #f5f5f5;
 
 // Form Variables
diff --git a/Build/Resources/Public/Sass/typo3/_element_spinner.scss b/Build/Resources/Public/Sass/typo3/_element_spinner.scss
index daed0fc5504b07e153b8b6d888e14006a2571da6..6bcde3141a159d8c4f5402bf5f421e269254371e 100644
--- a/Build/Resources/Public/Sass/typo3/_element_spinner.scss
+++ b/Build/Resources/Public/Sass/typo3/_element_spinner.scss
@@ -2,7 +2,7 @@
 // Animated spinner icon
 //
 
-// definition is taken from forms.less of Bootstrap
+// definition is taken from _forms.scss of Bootstrap
 span.checkbox-spinner {
     position: absolute;
     margin-left: -20px;
diff --git a/typo3/sysext/form/Configuration/Yaml/FormEditorSetup.yaml b/typo3/sysext/form/Configuration/Yaml/FormEditorSetup.yaml
index 142d4204552131e4c1bb3daa4839215da55f1e1f..f88d85a20d2690a529a965d1c84edc173d325a1f 100644
--- a/typo3/sysext/form/Configuration/Yaml/FormEditorSetup.yaml
+++ b/typo3/sysext/form/Configuration/Yaml/FormEditorSetup.yaml
@@ -41,7 +41,6 @@ TYPO3:
             maximumUndoSteps: 10
 
             stylesheets:
-              # @toDo: move form.less to the TYPO3 Build folder
               200: 'EXT:form/Resources/Public/Css/form.css'
 
             formEditorFluidConfiguration:
@@ -1159,4 +1158,4 @@ TYPO3:
                 identifier: 'attachUploads'
                 templateName: 'Inspector-CheckboxEditor'
                 label: 'formEditor.elements.Form.finisher.EmailToSender.editor.attachUploads.label'
-                propertyPath: 'options.attachUploads'
\ No newline at end of file
+                propertyPath: 'options.attachUploads'