merged themeing changes into django site