Theme import from weo front (4.0) plus include tweaks from leo build