diff --git a/42sh/Session.vim b/42sh/Session.vim
index a37e6dd1..37c4e79b 100644
--- a/42sh/Session.vim
+++ b/42sh/Session.vim
@@ -176,11 +176,11 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 19 - ((18 * winheight(0) + 20) / 40)
+let s:l = 29 - ((27 * winheight(0) + 20) / 40)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-19
+29
 normal! 029|
 wincmd w
 argglobal
@@ -194,13 +194,14 @@ setlocal fml=1
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 28 - ((11 * winheight(0) + 20) / 40)
+let s:l = 36 - ((19 * winheight(0) + 20) / 40)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-28
-normal! 08|
+36
+normal! 028|
 wincmd w
+2wincmd w
 exe 'vert 1resize ' . ((&columns * 89 + 89) / 178)
 exe 'vert 2resize ' . ((&columns * 88 + 89) / 178)
 tabedit src/token/token_init.c
diff --git a/42sh/src/token/ft_tokenize.c b/42sh/src/token/ft_tokenize.c
index 0783ff29..701540ee 100644
--- a/42sh/src/token/ft_tokenize.c
+++ b/42sh/src/token/ft_tokenize.c
@@ -23,7 +23,7 @@ int		ft_tokenize(t_list **alst, char *str)
 		token  = (*alst)->content;
 	if (!*str)
 		return (0);
-	else if ((token->type & TOKEN_OPERATOR) && !quoted)
+	else if ((token->type >= TK_OP_MIN) && !quoted)
 	{
 		if (can_be_used_in_op)
 			token_append(token, *str);
@@ -35,7 +35,6 @@ int		ft_tokenize(t_list **alst, char *str)
 		(*alst)->next = ft_lstnew(token_init(), sizeof(t_token));
 		(*alst) = (*alst)->next;
 		token = (*alst)->content;
-		token->type = TOKEN_UNKNOWN;
 	}
 	else if (*str == '\n' && !quoted)
 		ft_tokenize(&(*alst)->next, str + 1);
@@ -50,7 +49,7 @@ int		ft_tokenize(t_list **alst, char *str)
 		ft_tokenize(alst, str);
 	}
 	(*alst)->next = ft_lstnew(token_init(), sizeof(t_token));
-	token->type = TOKEN_WORD;
+	token->type = TK_WORD;
 	token_append(token, *str);
 	ft_tokenize(&(*alst)->next, str + 1);
 }
diff --git a/42sh/src/token/includes/token.h b/42sh/src/token/includes/token.h
index 7fbfe6c5..820e897b 100644
--- a/42sh/src/token/includes/token.h
+++ b/42sh/src/token/includes/token.h
@@ -13,16 +13,20 @@
 #ifndef TOKEN_H
 # define TOKEN_H
 
-# define TK_WORD		0x001
-# define TK_NEWLINE		0x002
-# define TK_IOHERE		0b00000100
-# define TK_DLESS		0b00001000
-# define TK_DGREAT		0b00010000
-# define TK_LESS		0b00100000
-# define TK_GREAT		0b00100000
-# define TK_LESSAND		0b00100000
-# define TK_GREATAND	0b01000000
-# define TK_OPERATOR	0b01111100
+# define TK_WORD		0x0001
+# define TK_NEWLINE		0x0002
+# define TK_IOHERE		0x0004
+
+# define TK_LESS		0x0010
+# define TK_GREAT		0x0020
+# define TK_DLESS		0x0048
+# define TK_DGREAT		0x0080
+# define TK_LESSAND		0x0100
+# define TK_GREATAND	0x0200
+# define TK_SCOLON		0x0400
+# define TK_PIPE		0x0800
+
+# define TK_OP_MIN		TK_LESS
 
 typedef struct s_token	t_token;