User preferences added + Makefile specific settings