Fix whitespaces
Cleanup, Fix menuitem prelight coloring (issue #1)