Added vnViewPortWatch service to refactor theme