moved proxy to top and removed theme overrides