diff --git a/Minishell.mk b/Minishell.mk
index d580d15e..c367dace 100644
--- a/Minishell.mk
+++ b/Minishell.mk
@@ -6,7 +6,7 @@
 #    By: maiboyer <maiboyer@student.42.fr>          +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/04/28 17:28:30 by maiboyer          #+#    #+#              #
-#    Updated: 2024/04/28 19:52:08 by maiboyer         ###   ########.fr        #
+#    Updated: 2024/04/28 20:01:05 by maiboyer         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -57,7 +57,7 @@ END = \033[0m
 .PHONY: all bonus
 
 all:
-	@$(MAKE) -C ./stdme/ LIB_NAME="$(shell realpath ./stdme)/" "BUILD_DIR=$(shell realpath ./$(OBJDIRNAME))" libme.a
+	@$(MAKE) -C ./stdme/ LIB_NAME="$(shell realpath ./stdme)/" "BUILD_DIR=$(shell realpath ./$(OBJDIRNAME))" CC=$(CC) libme.a
 	@$(MAKE) -C ./parser/ LIB_NAME="$(shell realpath ./parser)/" "BUILD_DIR=$(shell realpath ./$(OBJDIRNAME))" libgmr.a
 	@$(MAKE) -f./Minishell.mk $(NAME)
 
diff --git a/parser/Makefile b/parser/Makefile
index c47524d6..ea7b3e3a 100644
--- a/parser/Makefile
+++ b/parser/Makefile
@@ -6,7 +6,7 @@
 #    By: maiboyer <maiboyer@student.42.fr>          +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2023/11/03 13:20:01 by maiboyer          #+#    #+#              #
-#    Updated: 2024/04/28 19:05:13 by maiboyer         ###   ########.fr        #
+#    Updated: 2024/04/28 20:00:24 by maiboyer         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -17,7 +17,7 @@ BONUS_FLAGS		=
 NAME			=	libgmr.a
 LIB_NAME		?=
 TARGET			=	$(BUILD_DIR)/$(NAME)
-CC				=	clang
+CC				=	cc
 CFLAGS			=	-Wall -Wextra -Werror -g3 -MMD -I./includes
 
 include ./Filelist.mk
diff --git a/shcat_c/.clang-format b/shcat_c/.clang-format
deleted file mode 100644
index 6b13f20e..00000000
--- a/shcat_c/.clang-format
+++ /dev/null
@@ -1,9 +0,0 @@
-BasedOnStyle: Microsoft
-IndentWidth: 4
-ColumnLimit: 80
-UseTab: Always
-SortIncludes: CaseInsensitive
-IndentPPDirectives: AfterHash
-PPIndentWidth: 1
-AllowShortIfStatementsOnASingleLine: false
-AlignConsecutiveDeclarations: true
diff --git a/shcat_c/.clangd b/shcat_c/.clangd
deleted file mode 100644
index 1aebcb0c..00000000
--- a/shcat_c/.clangd
+++ /dev/null
@@ -1,5 +0,0 @@
-CompileFlags: # Tweak the parse settings
-  Add: 
-    - "-I/usr/include"
-    - "-I/home/maiboyer/Documents/ring-2/shcat/shcat_c/includes"
-
diff --git a/stdme/Makefile b/stdme/Makefile
index 5ffa0295..59663f44 100644
--- a/stdme/Makefile
+++ b/stdme/Makefile
@@ -6,7 +6,7 @@
 #    By: maiboyer <maiboyer@student.42.fr>          +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2023/11/03 13:20:01 by maiboyer          #+#    #+#              #
-#    Updated: 2024/04/28 19:33:09 by maiboyer         ###   ########.fr        #
+#    Updated: 2024/04/28 20:00:43 by maiboyer         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -20,7 +20,7 @@ GENERIC_INCLUDE	=	output/include
 NAME			=	libme.a
 LIB_NAME		?=	
 TARGET			=	$(BUILD_DIR)/$(NAME)
-CC				=	clang
+CC				?=	clang
 CFLAGS			=	-Wno-unused-command-line-argument -Wall -Werror -Wextra -g3 -L$(BUILD_DIR) -MMD
 BONUS_FILES		=	
 LIBS_NAME		=