Major style updates, new CM and AG content