diff -Naur beaver0_3_0_1-old/src/Makefile beaver0_3_0_1/src/Makefile
--- beaver0_3_0_1-old/src/Makefile	2008-06-27 06:33:36.000000000 +0300
+++ beaver0_3_0_1/src/Makefile	2008-07-05 01:22:02.075030068 +0300
@@ -11,20 +11,28 @@
 RM      = rm -f
 CP      = cp
 
-DESTDIR = /usr/local
+ifndef CFLAGS
+	CFLAGS = -O3
+endif
+
+ifndef PREFIX
+	PREFIX = /usr/local
+endif
+
+DESTDIR =
 IPATH   = 
 LPATH   = 
-OPTI    = -Wall -O3 -funroll-loops -fomit-frame-pointer #-DDEBUG_FCN
+OPTI    = -Wall ${CFLAGS} -funroll-loops -fomit-frame-pointer #-DDEBUG_FCN
 DBUG    = #-ggdb -pg -fbounds-check
 WARN	= #-W -Wall #-pedantic -ansi
 
 ### Unix version ###
-CFLAGS  = ${OPTI} ${DBUG} ${WARN} ${IPATH} `pkg-config gtk+-2.0 --cflags`
+BUILDFLAGS  = ${OPTI} ${DBUG} ${WARN} ${IPATH} `pkg-config gtk+-2.0 --cflags`
 LDFLAGS = ${OPTI} ${DBUG} ${WARN} ${LPATH} `pkg-config gtk+-2.0 --libs`
 NAME    = beaver
 
 ### Windows version ###
-#CFLAGS  = ${OPTI} ${DBUG} ${WARN} ${IPATH}\
+#BUILDFLAGS  = ${OPTI} ${DBUG} ${WARN} ${IPATH}\
 #	   -fnative-struct -mwindows
 #LDFLAGS = ${OPTI} ${DBUG} ${WARN} ${LPATH}\
 #	   -lgdk-1.3 -lgtk-1.3 -lgmodule-1.3 -lglib-1.3 -lm
@@ -46,47 +54,40 @@
 	@${STRIP}
 
 .c.o	:
-	${CC} ${CFLAGS} -c $< -o $@
+	${CC} ${BUILDFLAGS} -DICONDIR=\""${PREFIX}/share/beaver/pixmaps"\" -c $< -o $@
 
 ${OBJ}	: ${INC}
 
 install :
-	install -d $(DESTDIR)/share/beaver/bin
-	install beaver $(DESTDIR)/share/beaver/bin
-	$(CP) $(DESTDIR)/share/beaver/bin/beaver $(DESTDIR)/share/beaver/bin/beaver.orig
-	echo "#!/bin/bash" > $(DESTDIR)/share/beaver/bin/beaver
-	echo "cd $(DESTDIR)/share/beaver/bin/" >> $(DESTDIR)/share/beaver/bin/beaver
-	echo "./beaver.orig" >> $(DESTDIR)/share/beaver/bin/beaver
-	ln -sf $(DESTDIR)/share/beaver/bin/beaver $(DESTDIR)/bin/beaver
-	install -d $(DESTDIR)/share/beaver/bl
-	$(CP) ../bl/*.bl $(DESTDIR)/share/beaver/bl
-	install -d $(DESTDIR)/share/beaver/pixmaps
-	$(CP) ../pixmaps/beaver.png $(DESTDIR)/share/beaver/pixmaps
-	$(CP) ../pixmaps/about.xpm $(DESTDIR)/share/beaver/pixmaps
-	chmod 644 $(DESTDIR)/share/beaver/pixmaps/beaver.png
-	chmod 644 $(DESTDIR)/share/beaver/pixmaps/about.xpm
-	install -d $(DESTDIR)/share/applications
-	$(CP) ../beaver.desktop $(DESTDIR)/share/applications/beaver.desktop
-	chmod 644 $(DESTDIR)/share/applications/beaver.desktop
-	sed -i $(DESTDIR)/share/applications/beaver.desktop -e "s/Icon=/Icon=`echo $(DESTDIR) | sed -e 's/\//\\\\\//g'`\/share\/beaver\/pixmaps\//g" 
+	install -d $(DESTDIR)/$(PREFIX)/bin
+	install beaver $(DESTDIR)/$(PREFIX)/bin
+	install -d $(DESTDIR)/$(PREFIX)/share/beaver/bl
+	$(CP) ../bl/*.bl $(DESTDIR)/$(PREFIX)/share/beaver/bl
+	install -d $(DESTDIR)/$(PREFIX)/share/beaver/pixmaps
+	$(CP) ../pixmaps/beaver.png $(DESTDIR)/$(PREFIX)/share/beaver/pixmaps
+	$(CP) ../pixmaps/about.xpm $(DESTDIR)/$(PREFIX)/share/beaver/pixmaps
+	chmod 644 $(DESTDIR)/$(PREFIX)/share/beaver/pixmaps/beaver.png
+	chmod 644 $(DESTDIR)/$(PREFIX)/share/beaver/pixmaps/about.xpm
+	install -d $(DESTDIR)/$(PREFIX)/share/applications
+	$(CP) ../beaver.desktop $(DESTDIR)/$(PREFIX)/share/applications/beaver.desktop
+	chmod 644 $(DESTDIR)/$(PREFIX)/share/applications/beaver.desktop
+	#sed -i $(DESTDIR)/$(PREFIX)/share/applications/beaver.desktop -e "s/Icon=/Icon=`echo $(DESTDIR)/$(PREFIX) | sed -e 's/\//\\\\\//g'`\/share\/beaver\/pixmaps\//g" 
 	gzip -c9 ../beaver.1x > ../beaver.1x.gz
-	install -d $(DESTDIR)/man/man1
-	$(CP) ../beaver.1x.gz $(DESTDIR)/man/man1
-	chmod 644 $(DESTDIR)/man/man1/beaver.1x.gz
+	install -d $(DESTDIR)/$(PREFIX)/man/man1
+	$(CP) ../beaver.1x.gz $(DESTDIR)/$(PREFIX)/man/man1
+	chmod 644 $(DESTDIR)/$(PREFIX)/man/man1/beaver.1x.gz
 	@echo
 	@echo "Files installed :"
 	@echo "-----------------"
 	@echo
-	@echo "$(DESTDIR)/bin/beaver"
-	@echo "$(DESTDIR)/bin/beaver.orig"
-	@echo "$(DESTDIR)/share/beaver/bin/beaver"
-	@echo "$(DESTDIR)/share/beaver/bl/example1.bl"
-	@echo "$(DESTDIR)/share/beaver/bl/example2.bl"
-	@echo "$(DESTDIR)/share/beaver/bl/glib.bl"
-	@echo "$(DESTDIR)/share/beaver/pixmaps/beaver.png"
-	@echo "$(DESTDIR)/share/beaver/pixmaps/about.xpm"
-	@echo "$(DESTDIR)/share/applications/beaver.desktop"
-	@echo "$(DESTDIR)/man/man1/beaver.1x.gz"
+	@echo "$(DESTDIR)/$(PREFIX)/bin/beaver"
+	@echo "$(DESTDIR)/$(PREFIX)/share/beaver/bl/example1.bl"
+	@echo "$(DESTDIR)/$(PREFIX)/share/beaver/bl/example2.bl"
+	@echo "$(DESTDIR)/$(PREFIX)/share/beaver/bl/glib.bl"
+	@echo "$(DESTDIR)/$(PREFIX)/share/beaver/pixmaps/beaver.png"
+	@echo "$(DESTDIR)/$(PREFIX)/share/beaver/pixmaps/beaver-about.xpm"
+	@echo "$(DESTDIR)/$(PREFIX)/share/applications/beaver.desktop"
+	@echo "$(DESTDIR)/$(PREFIX)/man/man1/beaver.1x.gz"
 	@echo
 	@echo ",----------------------------------."
 	@echo "| Beaver succesfully installed ^_^ |"
diff -Naur beaver0_3_0_1-old/src/interface.c beaver0_3_0_1/src/interface.c
--- beaver0_3_0_1-old/src/interface.c	2008-06-27 06:33:36.000000000 +0300
+++ beaver0_3_0_1/src/interface.c	2008-07-05 01:08:59.962030439 +0300
@@ -1166,7 +1166,7 @@
   gtk_set_locale();  
   gtk_init (&argc, &argv);
   Settings = init_settings ();
-  gtk_window_set_default_icon_from_file("../pixmaps/beaver.png", NULL); // set beaver icon for all windows in Beaver
+  gtk_window_set_default_icon_from_file(ICONDIR "/beaver.png", NULL); // set beaver icon for all windows in Beaver
   MainWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_policy (GTK_WINDOW(MainWindow), TRUE, TRUE, FALSE);
   gtk_window_set_default_size (GTK_WINDOW (MainWindow), MAIN_WINDOW_WIDTH, MAIN_WINDOW_HEIGHT);
@@ -1265,7 +1265,7 @@
 {
 	const char *AUTHORS[] = {"Damien Terrier", "Marc Bevand", "Emmanuel Turquin", "Michael Terry", "Leslie Polzer", "Trevor Brown", "Double 12", "Tobias Heinzen", NULL};
 	const char *ARTISTS[] = {"Tigert (logo)", "Remy Turquin (website logo)", NULL};
-	GdkPixbuf *logo = gdk_pixbuf_new_from_file ("../pixmaps/about.xpm", NULL);
+	GdkPixbuf *logo = gdk_pixbuf_new_from_file (ICONDIR "/about.xpm", NULL);
     GtkWidget *AboutWindow = g_object_new (GTK_TYPE_ABOUT_DIALOG,
                                      "name", APP_NAME, 
                                      "version", VERSION_NUMBER,