SOS-1606 name space

Adding Name Spaces to Theme