(Bug 4733) Mobility layout

Tidies up layout.s2 and themes.s2 per Ninetyd's review comments.
Safe colours for all page elements.