diff --git a/.editorconfig b/.editorconfig
index a31ef8e75..1fdc58bc6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,6 +8,3 @@ charset = utf-8
 [*.{cpp,h,c,py,sh}]
 indent_style = space
 indent_size = 4
-
-[{Makefile,*.mk}]
-indent_size = tab
diff --git a/.vscode/example/tasks.json b/.vscode/example/tasks.json
index c0b9e8867..681544c32 100644
--- a/.vscode/example/tasks.json
+++ b/.vscode/example/tasks.json
@@ -75,48 +75,42 @@
             "type": "shell",
             "command": "./fbt updater_all"
         },
-        {
-            "label": "[Debug] Flash (USB, w/o resources)",
-            "group": "build",
-            "type": "shell",
-            "command": "./fbt FORCE=1 flash_usb"
-        },
         {
             "label": "[Release] Flash (USB, w/o resources)",
             "group": "build",
             "type": "shell",
             "command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash_usb"
         },
+        {
+            "label": "[Debug] Flash (USB, w/o resources)",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt FORCE=1 flash_usb"
+        },
         {
             "label": "[Debug:unit_tests] Flash (USB)",
             "group": "build",
             "type": "shell",
             "command": "./fbt FIRMWARE_APP_SET=unit_tests FORCE=1 flash_usb_full"
         },
-        {
-            "label": "[Debug] Flash (USB, with resources)",
-            "group": "build",
-            "type": "shell",
-            "command": "./fbt FORCE=1 flash_usb_full"
-        },
         {
             "label": "[Release] Flash (USB, with resources)",
             "group": "build",
             "type": "shell",
             "command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash_usb_full"
         },
+        {
+            "label": "[Debug] Flash (USB, with resources)",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt FORCE=1 flash_usb_full"
+        },
         {
             "label": "[Debug] Create PVS-Studio report",
             "group": "build",
             "type": "shell",
             "command": "./fbt firmware_pvs"
         },
-        {
-            "label": "[Debug] Build FAPs",
-            "group": "build",
-            "type": "shell",
-            "command": "./fbt fap_dist"
-        },
         {
             "label": "[Release] Build FAPs",
             "group": "build",
@@ -124,10 +118,10 @@
             "command": "./fbt COMPACT=1 DEBUG=0 fap_dist"
         },
         {
-            "label": "[Debug] Build App",
+            "label": "[Debug] Build FAPs",
             "group": "build",
             "type": "shell",
-            "command": "./fbt build APPSRC=${relativeFileDirname}"
+            "command": "./fbt fap_dist"
         },
         {
             "label": "[Release] Build App",
@@ -136,10 +130,10 @@
             "command": "./fbt COMPACT=1 DEBUG=0 build APPSRC=${relativeFileDirname}"
         },
         {
-            "label": "[Debug] Launch App on Flipper",
+            "label": "[Debug] Build App",
             "group": "build",
             "type": "shell",
-            "command": "./fbt launch APPSRC=${relativeFileDirname}"
+            "command": "./fbt build APPSRC=${relativeFileDirname}"
         },
         {
             "label": "[Release] Launch App on Flipper",
@@ -147,6 +141,12 @@
             "type": "shell",
             "command": "./fbt COMPACT=1 DEBUG=0 launch APPSRC=${relativeFileDirname}"
         },
+        {
+            "label": "[Debug] Launch App on Flipper",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt launch APPSRC=${relativeFileDirname}"
+        },
         {
             "label": "[Debug] Launch App on Flipper with Serial Console",
             "dependsOrder": "sequence",
@@ -156,18 +156,18 @@
                 "Serial Console"
             ]
         },
-        {
-            "label": "[Debug] Build and upload all FAPs to Flipper over USB",
-            "group": "build",
-            "type": "shell",
-            "command": "./fbt fap_deploy"
-        },
         {
             "label": "[Release] Build and upload all FAPs to Flipper over USB",
             "group": "build",
             "type": "shell",
             "command": "./fbt COMPACT=1 DEBUG=0 fap_deploy"
         },
+        {
+            "label": "[Debug] Build and upload all FAPs to Flipper over USB",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt fap_deploy"
+        },
         {
             // Press Ctrl+] to quit
             "label": "Serial Console",
@@ -192,4 +192,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6db5c0e8..c97aa5dcd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -98,9 +98,10 @@
   - OFW: Coalesce some allocations, smaller memory footprint (by @CookiePLMonster)
   - OFW: Put Input state data on the stack of the service (by @CookiePLMonster)
 - OFW: BLE: Update to copro light stack v1.20.0 (by @hedger)
--FBT:
+- FBT:
   - OFW: Toolchain v38, clangd as default language server (by @hedger)
   - OFW: Code formatting update (by @hedger)
+  - OFW: Reordered VS-Code Tasks to follow the [Release] > [Debug] schema (by @janwiesemann)
 - UL: Documentation: Cleanup and format markdown better (by @derskythe)
 - OFW: Code Cleanup: Unused includes, useless checks, unused variables, etc... (by @skotopes)
 
@@ -138,11 +139,13 @@
 - OFW: Loader: Fix crash on locked via cli loader (by @DrZlo13)
 - OFW: Archive: Fix memory leak in favorites add/remove (by @skotopes)
 - OFW: iButton/RFID: Fix Add Manually results being discarded (by @Astrrra)
+- OFW: Power: Fix typo in "charge me" screen (by @liamhays)
 - OFW: Accessor: Disable expansion service on start (by @skotopes)
 - OFW: Updater: Slightly smaller image (by @hedger)
 - OFW: Debug: Backup openocd work area, fix crash after fresh debugger connect and continue (by @skotopes)
 - OFW: Cleanup of various warnings from clangd (by @hedger)
 - OFW: ReadMe: update outdated bits and pieces (by @skotopes)
+- OFW: Fix .editorconfig (by @leon0399)
 
 ### Removed:
 - Furi:
diff --git a/applications/services/power/power_service/views/power_off.c b/applications/services/power/power_service/views/power_off.c
index 4da374b31..dbc233dde 100644
--- a/applications/services/power/power_service/views/power_off.c
+++ b/applications/services/power/power_service/views/power_off.c
@@ -33,7 +33,7 @@ static void power_off_draw_callback(Canvas* canvas, void* _model) {
         elements_button_center(canvas, "OK");
         elements_button_right(canvas, "Hide");
     } else {
-        snprintf(buff, sizeof(buff), "Charge me!\nDont't forget!");
+        snprintf(buff, sizeof(buff), "Charge me!\nDon't forget!");
         elements_multiline_text_aligned(canvas, 70, 23, AlignLeft, AlignTop, buff);
 
         canvas_draw_str_aligned(canvas, 64, 60, AlignCenter, AlignBottom, "Hold a second...");