diff --git a/include/color.hpp b/include/color.hpp
index 6d5e83a..4f5fc11 100644
--- a/include/color.hpp
+++ b/include/color.hpp
@@ -3,21 +3,16 @@
 
 #include <iostream>
 
-#define BOLD            "\033[0;02m"
-#define ITALIC          "\033[0;03m"
-#define UNDERLINE       "\033[0;04m"
-#define BLINK           "\033[0;05m"
-#define STRIKE          "\033[0;09m"
-
-#define BOLD_ITALIC     "\033[1;03m"
-#define BOLD_UNDERLINE  "\033[1;04m"
-#define BOLD_BLINK      "\033[1;05m"
-#define BOLD_STRIKE     "\033[1;09m"
+#define BOLD            "\033[01m"
+#define ITALIC          "\033[03m"
+#define UNDERLINE       "\033[04m"
+#define BLINK           "\033[05m"
+#define STRIKE          "\033[09m"
 
 #define COLOR_RESET     "\033[0;0m"
 
 //! Number of predefined colors
-#define COLOR_COUNT 19
+#define COLOR_COUNT 24
 
 /*! @file color.hpp
 *  @brief Color management
@@ -57,7 +52,13 @@ namespace ztd
       b_yellow=15,
       b_blue=16,
       b_magenta=17,
-      b_cyan=18
+      b_cyan=18,
+      //format
+      bold=19,
+      italic=20,
+      underline=21,
+      blink=22,
+      strike=23
     };
 
     //! String color names
diff --git a/src/color.cpp b/src/color.cpp
index 5852684..26252c8 100644
--- a/src/color.cpp
+++ b/src/color.cpp
@@ -21,20 +21,26 @@ const char* ztd::color::color_name_index[COLOR_COUNT] = {
   "b_blue",
   "b_magenta",
   "b_cyan"
+  //format
+  "bold",
+  "italic",
+  "underline",
+  "blink",
+  "strike"
 };
 
 const char* ztd::color::color_index[COLOR_COUNT] = {
   COLOR_RESET, //none
-  "\033[0;37m", //white
-  "\033[0;02m", //gray
-  "\033[0;30m", //black
-  "\033[0;31m", //red
-  "\033[0;32m", //green
-  "\033[0;33m", //orange
-  "\033[0;34m", //blue
-  "\033[0;35m", //magenta
-  "\033[0;36m", //cyan
-  // BOLD
+  "\033[37m", //white
+  "\033[90m", //gray
+  "\033[30m", //black
+  "\033[31m", //red
+  "\033[32m", //green
+  "\033[33m", //orange
+  "\033[34m", //blue
+  "\033[35m", //magenta
+  "\033[36m", //cyan
+  // bold
   "\033[1;37m", //bold white
   "\033[1;02m", //bold light gray
   "\033[1;30m", //bold gray
@@ -43,7 +49,13 @@ const char* ztd::color::color_index[COLOR_COUNT] = {
   "\033[1;33m", //bold yellow
   "\033[1;34m", //bold blue
   "\033[1;35m", //bold magenta
-  "\033[1;36m" //bold cyan
+  "\033[1;36m", //bold cyan
+  // format
+  BOLD,
+  ITALIC,
+  UNDERLINE,
+  BLINK,
+  STRIKE
 };
 
 const char* ztd::color::getColorCode(const unsigned int index)