Synchronize theme settings lines and color-shades.

Re-order the settings lines for GTK2 and 3 so the colors appear in the
same order to make maintenance easier.

Match up the GTK2/3 colors exactly.

Foreground selected text is left as the current white-shade.