diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 4374555..81e7c57 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -5,7 +5,7 @@
             "label": "Build Release",
             "type": "shell",
             "promptOnClose": true,
-            "command": "make -j4",
+            "command": "make -j8",
             "presentation": {
                 "reveal": "always",
                 "panel": "shared"
@@ -27,7 +27,7 @@
             }
         },
         {
-            "label": "Clean",
+            "label": "Clean only the project files",
             "type": "shell",
             "promptOnClose": true,
             "command": "make clean",
@@ -35,17 +35,18 @@
                 "reveal": "always",
                 "panel": "shared"
             },
-            "problemMatcher": {
-                "owner": "cpp",
-                "pattern": {
-                    "regexp": "^(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)$",
-                    "file": 1,
-                    "line": 2,
-                    "column": 3,
-                    "severity": 4,
-                    "message": 5
-                }
-            }
+            "problemMatcher": []
+        },
+        {
+            "label": "Clean everything",
+            "type": "shell",
+            "promptOnClose": true,
+            "command": "make mrproper",
+            "presentation": {
+                "reveal": "always",
+                "panel": "shared"
+            },
+            "problemMatcher": []
         }
     ]
 }
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 93bb9d8..abb4adb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,28 @@
-.PHONY: all build clean
+.PHONY: all build clean mrproper
+
+SOURCE_DIR		:=	source
+OUT_DIR			:=	out
+COMMON_DIR		:=	common
 
 all: build
-	rm -rf out
-	mkdir -p out/atmosphere/contents/690000000000000D/flags
-	mkdir -p out/config/sys-con
-	mkdir -p out/switch/
-	touch out/atmosphere/contents/690000000000000D/flags/boot2.flag
-	cp source/Sysmodule/sys-con.nsp out/atmosphere/contents/690000000000000D/exefs.nsp
-	cp source/AppletCompanion/sys-con.nro out/switch/sys-con.nro
-	cp -r common/. out/
-	@echo [DONE] sys-con compiled successfully. All files have been placed in out/
+	rm -rf $(OUT_DIR)
+	mkdir -p $(OUT_DIR)/atmosphere/contents/690000000000000D/flags
+	mkdir -p $(OUT_DIR)/config/sys-con
+	mkdir -p $(OUT_DIR)/switch/
+	touch $(OUT_DIR)/atmosphere/contents/690000000000000D/flags/boot2.flag
+	cp $(SOURCE_DIR)/Sysmodule/sys-con.nsp $(OUT_DIR)/atmosphere/contents/690000000000000D/exefs.nsp
+	cp $(SOURCE_DIR)/AppletCompanion/sys-con.nro $(OUT_DIR)/switch/sys-con.nro
+	cp -r $(COMMON_DIR)/. $(OUT_DIR)/
+	@echo [DONE] sys-con compiled successfully. All files have been placed in $(OUT_DIR)/
 
 build:
-	$(MAKE) -C source/
+	$(MAKE) -C $(SOURCE_DIR)
 
 clean:
-	$(MAKE) -C source/ clean
-	rm -rf out
\ No newline at end of file
+	$(MAKE) -C $(SOURCE_DIR) clean
+	rm -rf $(OUT_DIR)
+	
+mrproper:
+	$(MAKE) -C $(SOURCE_DIR) mrproper
+	rm -rf $(OUT_DIR)
+	
\ No newline at end of file
diff --git a/source/Makefile b/source/Makefile
index 987ba56..812881d 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -1,5 +1,5 @@
 COMPONENTS := libstratosphere AppletCompanion Sysmodule
-TOPTARGETS := all clean
+TOPTARGETS := all clean mrproper
 
 .PHONY: $(TOPTARGETS) $(COMPONENTS)
 
@@ -17,4 +17,6 @@ Sysmodule: libstratosphere
 clean:
 	$(MAKE) -C AppletCompanion clean
 	$(MAKE) -C Sysmodule clean
+	
+mrproper: clean
 	$(MAKE) -C libstratosphere clean
\ No newline at end of file