Update theme manager and related tracking