Renamed namespace from client to mas

Fixed also style in theme files.