[NOTICKET] Major update, re-stylign and upgrade using maintiva demo setup

initial commit