Various style updates including context tracking