+ Add additional non-GUI guards to WANT_GNOME.
+ Invert LITE logic to bring it to the top to make easier to see the

configuration and improve readability.

+ Indent embedded logic to make easier to read.