diff --git a/.gitmodules b/.gitmodules
index 5316d17..5fd2589 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/umber"]
 	path = src/umber
-	url = ssh://yanatchk@ftp.rvba.fr/homez.28/yanatchk/git/umber.git
+	url = ../umber.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5303539..86bd6bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,17 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
 		message(FATAL_ERROR "Don't build in SOURCE directory !")
 endif()
 
+GET_PROPERTY(_MINUIT_LIB GLOBAL PROPERTY MINUIT_LIB)
+
+if( NOT DEFINED _MINUIT_LIB)
+	SET_PROPERTY(GLOBAL PROPERTY MINUIT_LIB "not set")
+	set(_MINUIT_LIB "not set")
+endif() 
+
+
+if( NOT ${_MINUIT_LIB} STREQUAL "set")
+	SET_PROPERTY(GLOBAL PROPERTY MINUIT_LIB "set")
+
 ###############		 PROJECT #############################
 
 project(Minuit)
@@ -186,6 +197,8 @@ if(OPT_FREETYPE)
 	target_link_libraries(minuit ${FREETYPE_LIBRARIES})
 endif()
 
+endif()
+
 
 
 
diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt
index 225c89d..fd759aa 100644
--- a/src/base/CMakeLists.txt
+++ b/src/base/CMakeLists.txt
@@ -23,8 +23,6 @@ set(SRC
 	sock.c
 	sys.h
 	sys.c
-	str.h
-	str.c
 	vec.h
 	vec.c
 	vol.c
diff --git a/src/base/str.c b/src/base/str.c
deleted file mode 100644
index 173d50c..0000000
--- a/src/base/str.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/* 
- * Copyright (c) 2012 Milovann Yanatchkov 
- *
- * This file is part of Minuit, a free software
- * licensed under the GNU General Public License v2
- * see /LICENSE for more information
- *
- */
-
-#include "base.h"
-
-void s_increment( char *str, int max_length)
-{
-	if(str)
-	{
-		int i;
-		int last_char = 0;
-		int digit_length = 0;
-
-		/* get last letter */
-		for( i = 0; i < max_length; i++)
-		{
-			if( str[i] == '\0')
-			{
-				last_char = i;
-				break;
-			}
-		}
-
-		/* get digit length */
-		for( i = last_char-1; i > 0 ; i--)
-		{
-			if( !isdigit(str[i]))
-			{
-				break;
-			}
-
-			digit_length++;
-		}
-
-		/* increment */
-		if( digit_length > 0)
-		{
-			/* find number */
-			int word_length = last_char;
-			int digit_position = word_length - digit_length;
-			int n = atoi(str+digit_position);
-			snprintf(str+digit_position,max_length-digit_position,"%d", ++n);
-		}
-		else
-		/* new digit */
-		{
-			str[last_char] = '0';
-		}
-	}
-}
-
-void s_cp( char *dst, const char *src, int size)
-{
-	strncpy( dst, src, size);
-}
-
-void s_cat( char *dst, const char *src, int size)
-{
-	strncat( dst, src, size);
-}
-
-void s_show( const char *str)
-{
-	printf("%s\n", str);
-}
-
-void s_raw_cp(char *src,char *dst) 
-{
-	while(*src!='\0')
-	{
-		*dst=*src;
-		src++;
-		dst++;
-	}
-}
-
-char *s_allocate(const char *data)
-{
-	char *string=(char *)mem_malloc(sizeof(char)*(strlen(data)+1));
-	strcpy(string,data);
-	return string;
-}
-
-int s_append(char *dest,char *src,int pos)
-{
-	if(src)
-	{
-		while(*src!='\0')
-		{
-			dest[pos]=*src;
-			pos++;
-			src++;
-		}
-	}
-	// set end
-	else
-	{
-		dest[pos]='\0';
-		pos++;
-	}
-	return pos;
-}
-
-void s_remove_newline( char *target, char *src, int size)
-{
-	int s = 0;
-	bzero( target, size);
-	while( *src != '\n' && s <= size)
-	{
-		*target = *src;
-		target++;
-		src++;
-		s++;
-	}
-}
-
-void s_truncate_after(char letter,char *target,char *src)
-{
-	while(*src!=letter)
-	{
-		src++;
-	}
-
-	src++;
-
-	while(*src!='\0')
-	{
-		*target=*src;
-		src++;
-		target++;
-	}
-
-	*target='\0';
-}
-
-void s_convert_newline_endline(char *target,char *src)
-{
-	while(*src!='\n')
-	{
-		*target=*src;
-		target++;
-		src++;
-	}
-
-	*target='\0';
-}
-
-void s_convert_endline_newline( char *target, char *src)
-{
-	while( *src!='\0')
-	{
-		*target = *src;
-		target++;
-		src++;
-	}
-
-	*target ='\n';
-}
-
-void s_store(char *target,char source,int pos)
-{
-	target[pos] = source;
-}
-
-
diff --git a/src/base/str.h b/src/base/str.h
deleted file mode 100644
index b181206..0000000
--- a/src/base/str.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* 
- * Copyright (c) 2012 Milovann Yanatchkov 
- *
- * This file is part of Minuit, a free software
- * licensed under the GNU General Public License v2
- * see /LICENSE for more information
- *
- */
-
-#ifndef __STR_H
-#define __STR_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void 	s_cp( char *dst, const char *src, int size);
-void 	s_cat( char *dst, const char *src, int size);
-void 	s_show( const char *str);
-
-void 	s_raw_cp( char *src, char *dst);
-char *	s_allocate( const char *data);
-void 	s_truncate_after( char letter, char *target, char *src);
-void 	s_convert_newline_endline( char *target, char *src);
-void 	s_convert_endline_newline( char *target, char *src);
-void 	s_remove_newline( char *target, char *src, int size);
-void 	s_write_time( char *string);
-int 	s_append( char *dest, char *src, int pos);
-void 	s_store( char *target, char source, int pos);
-void	s_increment( char *str, int max_length);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/ops/op_texture.c b/src/ops/op_texture.c
index d169755..5846529 100644
--- a/src/ops/op_texture.c
+++ b/src/ops/op_texture.c
@@ -83,13 +83,13 @@ t_node *op_texture_add(const char *path)
 
 	if(*ext)
 	{
-		if(is(ext,"jpg"))
+		if(iseq(ext,"jpg"))
 		{
 			#ifdef HAVE_JPG
 			op_texture_jpg_add(file);
 			#endif
 		}
-		else if(is(ext,"png"))
+		else if(iseq(ext,"png"))
 		{
 			#ifdef HAVE_PNG
 			op_texture_png_add(file);
diff --git a/src/umber b/src/umber
index ee33f1d..40f2084 160000
--- a/src/umber
+++ b/src/umber
@@ -1 +1 @@
-Subproject commit ee33f1d65b71e8ff379353576faba712ca7e5fa0
+Subproject commit 40f20847d7184bd7b814ad89f230ec3cd0f1d35b