WIP - Added -c, fixed some more bugs, NEARING COMPLETION -- only -P and GTK2 compatibility missing