Various changes including the addition of theming.