merge in new css based templates