Preparing for cherry picks from emacs24
Cleaned up themes, added a few more

Conflicts:
	.gitmodules
Disable menu bar by default