Misc changes.
Desktop theme is close but no responsive yet.