diff --git a/d07/ex00/Makefile b/d07/ex00/Makefile
index ca18bd1..9f3a92d 100644
--- a/d07/ex00/Makefile
+++ b/d07/ex00/Makefile
@@ -31,8 +31,9 @@ INCLUDES  = -I$(D_HEADERS)
 D_SRCS    = .
 SRCS      = main.cpp
 
-D_HEADERS = headers
-HEADERS   = Templates.hpp
+D_HEADERS = .
+HEADERS   = colors.h \
+			Templates.hpp
 
 D_OBJS    = builds
 OBJS      = $(SRCS:%.$(EXT)=$(D_OBJS)/%.o)
diff --git a/d07/ex00/headers/Templates.hpp b/d07/ex00/Templates.hpp
similarity index 100%
rename from d07/ex00/headers/Templates.hpp
rename to d07/ex00/Templates.hpp
diff --git a/d07/ex00/colors.h b/d07/ex00/colors.h
new file mode 100644
index 0000000..0374e42
--- /dev/null
+++ b/d07/ex00/colors.h
@@ -0,0 +1,25 @@
+#ifndef COLORS_H
+# define COLORS_H
+
+# define GRAY "\e[0;30m"
+# define RED "\e[0;31m"
+# define GREEN "\e[0;32m"
+# define YELLOW "\e[0;33m"
+# define BLUE "\e[0;34m"
+# define PURPLE "\e[0;35m"
+# define CYAN "\e[0;36m"
+# define WHITE "\e[0;37m"
+
+# define B_GRAY "\e[1;30m"
+# define B_RED "\e[1;31m"
+# define B_GREEN "\e[1;32m"
+# define B_YELLOW "\e[1;33m"
+# define B_BLUE "\e[1;34m"
+# define B_PURPLE "\e[1;35m"
+# define B_CYAN "\e[1;36m"
+# define B_WHITE "\e[1;37m"
+
+# define RESET "\e[0m"
+
+#endif
+
diff --git a/d07/ex00/main.cpp b/d07/ex00/main.cpp
index 434f440..5e9683f 100644
--- a/d07/ex00/main.cpp
+++ b/d07/ex00/main.cpp
@@ -1,23 +1,51 @@
 #include <iostream>
 #include <string>
+#include "colors.h"
 #include "Templates.hpp"
 
+#define N_TEST "3"
+
 int	main() {
-	int a = 2;
-	int b = 3;
+	int	i = 0;
 
-	::swap( a, b );
-	std::cout << "a = " << a << ", b = " << b << std::endl;
-	std::cout << "min( a, b ) = " << ::min( a, b ) << std::endl;
-	std::cout << "max( a, b ) = " << ::max( a, b ) << std::endl;
+	std::cout << B_YELLOW "\n[" << ++i << "/" N_TEST "] "
+	<< "tests int :" RESET "\n";
+	{
+		int a = 2;
+		int b = 3;
+	
+		std::cout << "a = " << a << ", b = " << b << "\nswap :\n";
+		::swap( a, b );
+		std::cout << "a = " << a << ", b = " << b << "\n";
+		std::cout << "min( a, b ) = " << ::min( a, b ) << "\n";
+		std::cout << "max( a, b ) = " << ::max( a, b ) << "\n";
+	}
 
-	std::string c = "chaine1";
-	std::string d = "chaine2";
+	std::cout << B_YELLOW "\n[" << ++i << "/" N_TEST "] "
+	<< "tests string :" RESET "\n";
+	{
+		std::string a = "chaine1";
+		std::string b = "chaine2";
+	
+		std::cout << "a = " << a << ", b = " << b << "\nswap :\n";
+		::swap(a, b);
+		std::cout << "a = " << a << ", b = " << b << "\n";
+		std::cout << "min( a, b ) = " << ::min( a, b ) << "\n";
+		std::cout << "max( a, b ) = " << ::max( a, b ) << "\n";
+	}
 
-	::swap(c, d);
-	std::cout << "c = " << c << ", d = " << d << std::endl;
-	std::cout << "min( c, d ) = " << ::min( c, d ) << std::endl;
-	std::cout << "max( c, d ) = " << ::max( c, d ) << std::endl;
+	std::cout << B_YELLOW "\n[" << ++i << "/" N_TEST "] "
+	<< "tests floats :" RESET "\n";
+	{
+		float a = 2.42f;
+		float b = 32.7f;
+	
+		std::cout << "a = " << a << ", b = " << b << "\nswap :\n";
+		::swap( a, b );
+		std::cout << "a = " << a << ", b = " << b << "\n";
+		std::cout << "min( a, b ) = " << ::min( a, b ) << "\n";
+		std::cout << "max( a, b ) = " << ::max( a, b ) << "\n";
+	}
 
 	return 0;
 }
diff --git a/d07/ex00/templates b/d07/ex00/templates
index 04b4266..eada0c6 100755
Binary files a/d07/ex00/templates and b/d07/ex00/templates differ