Add window classes back
Rename classes
Add CML support for Window tag