Some changes to margins. New themes and work on the theme switcher.