fixing makefile
improving theme and makefile