UIQ3 update, some makefile unification, rm old configs, stuff