Encapsulation theme done

Encapsulation theme done