Fixes for CAC theme